[Emacs-diffs] /srv/bzr/emacs/trunk r106988: Minor NEWS cleanup, mainly for "Installation Changes" section.

[Glenn Morris]

------------------------------------------------------------
revno: 106988
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-01-28 19:08:15 -0800
message:
  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).
modified:
  etc/NEWS
  src/ChangeLog
  src/gnutls.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-01-29 02:49:57 +0000
+++ b/etc/NEWS  2012-01-29 03:08:15 +0000
@@ -25,9 +25,34 @@
 * 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.
+
+---
+** 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.
+
+---
+** 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 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.
+With it, Emacs integers typically have 62 bits, even on 32-bit machines.
+On 32-bit hosts, this raises the limit on buffer sizes from about 512 MiB
+to about 2 GiB.
 
 ---
 ** By default, the installed Info and man pages are compressed.
@@ -40,33 +65,11 @@
 lib-src/Makefile by hand in order to use the associated 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.
 
 ---
-** There is a new configure option --with-wide-int.
-With it, Emacs integers typically have 62 bits, even on 32-bit machines.
-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.
-
-** 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' .
-
----
 ** The standalone programs digest-doc and sorted-doc are removed.
 Emacs now uses Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 
@@ -231,6 +234,11 @@
 *** `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 @@
 
 *** `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 @@
 
 ** 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
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-28 03:11:41 +0000
+++ b/src/ChangeLog     2012-01-29 03:08:15 +0000
@@ -1,3 +1,7 @@
+2012-01-29  Glenn Morris  <address@hidden>
+
+       * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS).
+
 2012-01-28  Samuel Thibault  <address@hidden>  (tiny change)
 
        * s/gnu.h: Define POSIX_SIGNALS (Bug#10552).

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2012-01-05 09:46:05 +0000
+++ b/src/gnutls.c      2012-01-29 03:08:15 +0000
@@ -1118,7 +1118,10 @@
   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;
 }