Introduce `apropos-user-option' and update `apropos-variable'. (Bug#13276)

2 files changed, 12 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 601949af88e..1b5bdc8fb53 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07  Bastien Guerry  <bzg@gnu.org>
+
+        * help.texi (Apropos): Document `apropos-user-option' and update
+        the doc for `apropos-variable'.
+
 2013-01-05  Glenn Morris  <rgm@gnu.org>
 
         * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 0a0a3865d2d..75b250d0f40 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -295,11 +295,16 @@ search for noninteractive functions too.
 Search for functions and variables.  Both interactive functions
 (commands) and noninteractive functions can be found by this.
 
-@item M-x apropos-variable
-@findex apropos-variable
+@item M-x apropos-user-option
+@findex apropos-user-option
 Search for user-customizable variables.  With a prefix argument,
 search for non-customizable variables too.
 
+@item M-x apropos-variable
+@findex apropos-variable
+Search for variables.  With a prefix argument, search for
+customizable variables only.
+
 @item M-x apropos-value
 @findex apropos-value
 Search for variables whose values match the specified pattern.  With a