* lisp/net/html2text.el: Move to obsolete/.

3 files changed, 6 insertions, 1 deletions

diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index b0cfbc9d3c0..069d6b3389b 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -405,7 +405,7 @@ variable will cause @samp{text/html} parts to be treated as attachments.
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
 This selects the function used to render @acronym{HTML}.  The predefined
-renderers are selected by the symbols @code{gnus-article-html},
+renderers are selected by the symbols @code{shr}, @code{gnus-w3m},
 @code{w3m}@footnote{See @uref{http://emacs-w3m.namazu.org/} for more
 information about emacs-w3m}, @code{links}, @code{lynx},
 @code{w3m-standalone} or @code{html2text}.  If @code{nil} use an
diff --git a/etc/NEWS b/etc/NEWS
index 78d374840aa..e43733eebaf 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -471,6 +471,8 @@ properties as intact as possible.
 
 * Changes in Specialized Modes and Packages in Emacs 26.1
 
+*** html2text is now marked obsolete.
+
 *** smerge-refine-regions can refine regions in separate buffers
 
 *** Info menu and index completion uses substring completion by default.
diff --git a/lisp/net/html2text.el b/lisp/obsolete/html2text.el
index 87c71dc504a..27560a70c63 100644
--- a/lisp/net/html2text.el
+++ b/lisp/obsolete/html2text.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
 
 ;; Author: Joakim Hove <hove@phys.ntnu.no>
+;; Obsolete-since: 26.1
 
 ;; This file is part of GNU Emacs.
 
@@ -29,6 +30,8 @@
 ;;
 ;; The main function is `html2text'.
 
+;; This package was obsoleted by shr.el.
+
 ;;; Code:
 
 ;;