tweaks: be more precise about what --disable-extra does

Also, harmonize some configure-option descriptions,
add a slash after a subdir, and fix a typo.

configure.ac

@@ -63,7 +63,7 @@ AC_CHECK_HEADERS(libintl.h limits.h pwd.h termios.h sys/param.h)
 dnl Checks for options.
 
 AC_ARG_ENABLE(browser,
-AS_HELP_STRING([--disable-browser], [Disable built-in file browser]))
+AS_HELP_STRING([--disable-browser], [Disable the built-in file browser]))
 if test "x$enable_browser" = xno; then
     AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
 fi
@@ -85,7 +85,7 @@ else
 fi
 
 AC_ARG_ENABLE(comment,
-AS_HELP_STRING([--disable-comment], [Disable comment/uncomment functions]))
+AS_HELP_STRING([--disable-comment], [Disable the comment/uncomment function]))
 if test "x$enable_tiny" = xyes; then
     if test "x$enable_comment" = xyes; then
 	AC_MSG_ERROR([--enable-comment cannot work with --enable-tiny])
@@ -100,13 +100,13 @@ if test "x$disable_comment" != xyes; then
 fi
 
 AC_ARG_ENABLE(extra,
-AS_HELP_STRING([--disable-extra], [Disable extra features, currently only easter eggs]))
+AS_HELP_STRING([--disable-extra], [Disable the Easter egg]))
 if test "x$enable_extra" = xno; then
     AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
 fi
 
 AC_ARG_ENABLE(help,
-AS_HELP_STRING([--disable-help], [Disable built-in help texts]))
+AS_HELP_STRING([--disable-help], [Disable the built-in help texts]))
 if test "x$enable_tiny" = xyes; then
     if test "x$enable_help" = xyes; then
 	if test "x$enable_multibuffer" != xyes; then
@@ -137,7 +137,7 @@ if test "x$enable_histories" = xno; then
 fi
 
 AC_ARG_ENABLE(justify,
-AS_HELP_STRING([--disable-justify], [Disable justify/unjustify functions]))
+AS_HELP_STRING([--disable-justify], [Disable the justify/unjustify functions]))
 if test "x$enable_justify" = xno; then
     AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
 fi
@@ -159,9 +159,9 @@ if test "x$disable_linenumbers" != xyes; then
 fi
 
 AC_ARG_ENABLE(mouse,
-AS_HELP_STRING([--disable-mouse], [Disable mouse support (and -m flag)]))
+AS_HELP_STRING([--disable-mouse], [Disable mouse support]))
 if test "x$enable_mouse" = xno; then
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable mouse support.])
 fi
 
 AC_ARG_ENABLE(multibuffer,
@@ -171,7 +171,7 @@ if test "x$enable_multibuffer" = xno; then
 fi
 
 AC_ARG_ENABLE(nanorc,
-AS_HELP_STRING([--disable-nanorc], [Disable use of .nanorc files]))
+AS_HELP_STRING([--disable-nanorc], [Disable the use of .nanorc files]))
 if test "x$enable_nanorc" = xno; then
     AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
 else
@@ -179,25 +179,25 @@ else
 fi
 
 AC_ARG_ENABLE(operatingdir,
-AS_HELP_STRING([--disable-operatingdir], [Disable setting of operating directory (chroot of sorts)]))
+AS_HELP_STRING([--disable-operatingdir], [Disable the setting of an operating directory]))
 if test "x$enable_operatingdir" = xno; then
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of an operating directory (a chroot of sorts).])
 fi
 
 AC_ARG_ENABLE(speller,
-AS_HELP_STRING([--disable-speller], [Disable spell checker functions]))
+AS_HELP_STRING([--disable-speller], [Disable the spell-checker functions]))
 if test "x$enable_speller" = xno; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell-checker functions.])
 fi
 
 AC_ARG_ENABLE(tabcomp,
-AS_HELP_STRING([--disable-tabcomp], [Disable tab completion functions]))
+AS_HELP_STRING([--disable-tabcomp], [Disable the tab-completion functions]))
 if test "x$enable_tabcomp" = xno; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for filenames and search strings.])
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab-completion functions for filenames and search strings.])
 fi
 
 AC_ARG_ENABLE(wordcomp,
-AS_HELP_STRING([--disable-wordcomp], [Disable the word completion function]))
+AS_HELP_STRING([--disable-wordcomp], [Disable the word-completion function]))
 if test "x$enable_tiny" = xyes; then
     if test "x$enable_wordcomp" = xyes; then
 	AC_MSG_ERROR([--enable-wordcomp cannot work with --enable-tiny])
@@ -207,14 +207,14 @@ if test "x$enable_tiny" = xyes; then
 fi
 if test "x$disable_wordcomp" != xyes; then
     if test "x$enable_wordcomp" != xno; then
-	AC_DEFINE(ENABLE_WORDCOMPLETION, 1, [Define this to enable the word completion function.])
+	AC_DEFINE(ENABLE_WORDCOMPLETION, 1, [Define this to enable the word-completion function.])
     fi
 fi
 
 AC_ARG_ENABLE(wrapping,
-AS_HELP_STRING([--disable-wrapping], [Disable all wrapping of text (and -w flag)]))
+AS_HELP_STRING([--disable-wrapping], [Disable all hard-wrapping of text]))
 if test "x$enable_wrapping" = xno; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all hard text wrapping.])
 fi
 
 AC_ARG_ENABLE(wrapping-as-root,
@@ -226,7 +226,7 @@ fi
 AC_ARG_ENABLE(debug,
 AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
 if test "x$enable_debug" = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and abortion on failing asserts.])
 else
     AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
 fi
@@ -259,7 +259,7 @@ if test "x$enable_tiny" = xyes; then
 	enable_libmagic=no
     fi
     if test "x$enable_mouse" != xyes; then
-	AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+	AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable mouse support.])
     fi
     if test "x$enable_multibuffer" != xyes; then
 	AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
@@ -268,13 +268,13 @@ if test "x$enable_tiny" = xyes; then
 	AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
     fi
     if test "x$enable_operatingdir" != xyes; then
-	AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+	AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of an operating directory (a chroot of sorts).])
     fi
     if test "x$enable_speller" != xyes; then
-	AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+	AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell-checker functions.])
     fi
     if test "x$enable_tabcomp" != xyes; then
-	AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.])
+	AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab-completion functions for files and search strings.])
     fi
     if test "x$enable_wrapping" != xyes; then
 	AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
@@ -561,13 +561,13 @@ else
 fi
 
 AC_CHECK_LIB([$CURSES_LIB_NAME], [use_default_colors],
-	     [AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.])],
+	     [AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() function.])],
 	     [], [$CURSES_LIB])
 AC_CHECK_LIB([$CURSES_LIB_NAME], [set_escdelay],
 	     [AC_DEFINE(HAVE_SET_ESCDELAY, 1, [Define this if your curses library has the set_escdelay() function.])],
 	     [], [$CURSES_LIB])
 AC_CHECK_LIB([$CURSES_LIB_NAME], [key_defined],
-	     [AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() command.])],
+	     [AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() function.])],
 	     [], [$CURSES_LIB])
 
 dnl Parse any configure options.
@@ -694,7 +694,7 @@ int main(void)
     int testcolor = COLOR_WHITE;
     return 0;
 }],
-	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support])
+	AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support.])
 	AC_MSG_RESULT(yes),
 	AC_MSG_RESULT(not sure)
 	AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED])
@@ -712,7 +712,7 @@ int main(void)
     COLS = 25;
     return 0;
 }],
-AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug])
+AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug.])
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no),
 AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))

doc/faq.html

@@ -140,19 +140,19 @@
   <b>--disable-browser</b>       Disable the built-in file browser
   <b>--disable-color</b>         Disable color and syntax highlighting
   <b>--disable-comment</b>       Disable the comment/uncomment function
-  <b>--disable-extra</b>         Disable extra features (currently only an easter egg)
+  <b>--disable-extra</b>         Disable the easter egg
   <b>--disable-help</b>          Disable the built-in help texts
   <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
-  <b>--disable-justify</b>       Disable justify/unjustify functions
+  <b>--disable-justify</b>       Disable the justify/unjustify functions
   <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
   <b>--disable-linenumbers</b>   Disable line numbering
   <b>--disable-mouse</b>         Disable mouse support
-  <b>--disable-multibuffer</b>   Disable having multiple file buffers open
+  <b>--disable-multibuffer</b>   Disable the opening of multiple file buffers
   <b>--disable-nanorc</b>        Disable the use of .nanorc files
   <b>--disable-operatingdir</b>  Disable the setting of an operating directory
-  <b>--disable-speller</b>       Disable spell checker functions
-  <b>--disable-tabcomp</b>       Disable tab completion functions
-  <b>--disable-wordcomp</b>      Disable the word completion function
+  <b>--disable-speller</b>       Disable the spell-checker functions
+  <b>--disable-tabcomp</b>       Disable the tab-completion functions
+  <b>--disable-wordcomp</b>      Disable the word-completion function
   <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
   <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages, you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on whether you have locale support on your system. And finally, there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
   <p>With <b>--disable-wrapping-as-root</b> you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.</p>
@@ -198,7 +198,7 @@
 <h2><a name="4.8b"></a>4.8b. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</h2>
 <blockquote><p>When pasting from Windows, in some situations linefeeds are sent instead of carriage returns (Enters). And linefeeds are <b>^J</b>s, which make nano justify (rewrap) the current paragraph. To prevent these linefeeds from causing these unwanted justifications, add this line to your .nanorc on the remote Linux box: <b>unbind ^J main</b>.</p></blockquote>
 <h2><a name="4.9"></a>4.9. I've compiled nano with color support, but I don't see any color when I run it!</h2>
-<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>syntax/</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
+<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>syntax/</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano/</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9a">3.9a</a>.</p></blockquote>
 <h2><a name="4.10"></a>4.10. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
 <blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
   <p><b>export EDITOR=/usr/local/bin/nano</b></p>

doc/nano.texi

@@ -1491,8 +1491,7 @@ the @code{-Y} command-line option, which chooses a specific syntax.
 Disable the single-keystroke comment/uncomment function (M-3).
 
 @item --disable-extra
-Disable extra features.  At the moment, this is just easter-egg-type
-stuff.
+Disable the Easter egg: a crawl of major contributors.
 
 @item --disable-help
 Disable the help function.  Doing this makes the binary much smaller,
@@ -1548,7 +1547,7 @@ command-line option, which allows specifying an alternate spell checker.
 Disable tab completion (when nano asks for a filename or a search string).
 
 @item --disable-wordcomp
-Disable word completion (^[).
+Disable word completion (^]).
 
 @item --disable-wrapping
 Disable all hard-wrapping of overlong lines.  This also eliminates the