Minor NEWS cleanup, mainly for "Installation Changes" section.

* etc/NEWS: Reorder items.
Standardize new --with-libfoo type configure options.
Don't say precisely which library versions are needed - it tends to
change and people who care can look at configure.
Move new Hebrew tutorial entry to "Internationalization changes" section.
Small tidy up for imagemagick and gnutls entries.

* src/gnutls.c (syms_of_gnutls): More doc (from etc/NEWS).

3 files changed, 51 insertions, 44 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 2d8740f690e..18b6d1d5f22 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -25,30 +25,28 @@ so we will look at it and add it to the manual.
 * Installation Changes in Emacs 24.1
 
 ---
-** Configure links against libselinux if it is found.
-You can disable this by using --without-selinux.  See below for
-information on SELinux support.
+** Emacs can be compiled with Gtk+ 3.0 if you pass --with-x-toolkit=gtk3
+to configure.  Note that other libraries used by Emacs, RSVG and GConf,
+also depend on Gtk+.  You can disable them with --without-rsvg and
+--without-gconf.
 
 ---
-** By default, the installed Info and man pages are compressed.
-You can disable this by configuring --without-compress-info.
+** Emacs can be compiled with GnuTLS support.
+This happens by default if a suitably recent version of the library is
+found at build time.  To prevent this, use the configure option
+`--without-gnutls'.  See below for GnuTLS features.
 
 ---
-** There are new configure options:
---with-mmdf, --with-mail-unlink, --with-mailhost.
-These provide no new functionality, they just remove the need to edit
-lib-src/Makefile by hand in order to use the associated features.
+** Emacs can be compiled with SELinux support.
+This happens by default if a suitably recent version of the library is
+found at build time.  To prevent this, use the configure option
+`--without-selinux'.  See below for SELinux features.
 
 ---
-** Emacs can be compiled against Gtk+ 3.0 if you pass --with-x-toolkit=gtk3
-to configure.  Note that other libraries used by Emacs, RSVG and GConf,
-also depend on Gtk+.  You can disable them with --without-rsvg and
---without-gconf.
-
----
-** There is a new configure option --enable-use-lisp-union-type.
-This is only useful for Emacs developers to debug certain types of bugs.
-This is not a new feature; only the configure flag is new.
+** Emacs can be compiled with ImageMagick support.
+This happens by default if a suitably recent version of the library is
+found at build time.  To prevent this, use the configure option
+`--without-imagemagick'.  See below for ImageMagick features.
 
 ---
 ** There is a new configure option --with-wide-int.
@@ -57,14 +55,19 @@ On 32-bit hosts, this raises the limit on buffer sizes from about 512 MiB
 to about 2 GiB.
 
 ---
-** New translation of the Emacs Tutorial in Hebrew is available.
-Type `C-u C-h t' to choose it in case your language setup doesn't
-automatically select it.
+** By default, the installed Info and man pages are compressed.
+You can disable this by configuring --without-compress-info.
 
-** Emacs can be compiled with ImageMagick support.
-Emacs links to ImageMagick if version 6.2.8 or newer of the library is
-present at build time.  To inhibit ImageMagick, use the configure
-option `--without-imagemagick' .
+---
+** There are new configure options:
+--with-mmdf, --with-mail-unlink, --with-mailhost.
+These provide no new functionality, they just remove the need to edit
+lib-src/Makefile by hand in order to use the associated features.
+
+---
+** There is a new configure option --enable-use-lisp-union-type.
+This is only useful for Emacs developers to debug certain types of bugs.
+This is not a new feature; only the configure flag is new.
 
 ---
 ** The standalone programs digest-doc and sorted-doc are removed.
@@ -231,6 +234,11 @@ cannot be encoded by the `terminal-coding-system'.
 *** `nobreak-char-display' now also highlights Unicode hyphen chars
 (U+2010 and U+2011).
 
+---
+*** New translation of the Emacs Tutorial in Hebrew is available.
+Type `C-u C-h t' to choose it in case your language setup doesn't
+automatically select it.
+
 ** Improved GTK integration
 +++
 *** GTK scroll-bars are now placed on the right by default.
@@ -1307,9 +1315,9 @@ is being animated.
 
 *** `image-extension-data' is renamed to `image-metadata'.
 
-*** If Emacs is compiled with ImageMagick support (see Startup
-Changes), the function `imagemagick-types' returns a list of image
-file extensions that your installation of ImageMagick supports.  The
+*** Emacs can be compiled with ImageMagick support.
+Then the function `imagemagick-types' returns a list of image file
+extensions that your installation of ImageMagick supports.  The
 function `imagemagick-register-types' enables ImageMagick support for
 these image types, minus those listed in `imagemagick-types-inhibit'.
 
@@ -1327,21 +1335,13 @@ FIXME: These should be front-ended by xml.el.
 
 ** GnuTLS
 
-*** Emacs can be compiled with libgnutls support
-This is the default.  You will then be able to use the functionality
-in gnutls.el, namely the `open-gnutls-stream' and `gnutls-negotiate'
-functions.  It's easiest to use these functions through
-`open-network-stream' because it can upgrade connections through
-STARTTLS opportunistically or use plain SSL, depending on your needs.
-
-Only versions 2.8.x and higher or GnuTLS have been tested.
-[FIXME: this statement needs clarifying, given that GnuTLS >= 2.6.6
-is the test used by configure.]
-
-*** gnutls-log-level
-Set `gnutls-log-level' higher than 0 to get debug output.  1 is for
-important messages, 2 is for debug data, and higher numbers are as per
-the GnuTLS logging conventions.  The output is in *Messages*.
+*** New library `gnutls.el'.
+This requires Emacs to have built with GnuTLS support.
+The main functions are `open-gnutls-stream' and `gnutls-negotiate'.
+It's easiest to use these functions through `open-network-stream'
+because it can upgrade connections through STARTTLS opportunistically
+or use plain SSL, depending on your needs.  For debugging, set
+`gnutls-log-level' greater than 0.
 
 ** Isearch
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 720614faecc..89fa90d9f92 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-29  Glenn Morris  <rgm@gnu.org>
+
+        * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS).
+
 2012-01-28  Samuel Thibault  <sthibault@debian.org>  (tiny change)
 
         * s/gnu.h: Define POSIX_SIGNALS (Bug#10552).
diff --git a/src/gnutls.c b/src/gnutls.c
index e7801cea746..d7bf0e8edb8 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1118,7 +1118,10 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_available_p);
 
   DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level,
-              doc: /* Logging level used by the GnuTLS functions.  */);
+              doc: /* Logging level used by the GnuTLS functions.
+Set this larger than 0 to get debug output in the *Messages* buffer.
+1 is for important messages, 2 is for debug data, and higher numbers
+are as per the GnuTLS logging conventions.  */);
   global_gnutls_log_level = 0;
 }