[Emacs-diffs] /srv/bzr/emacs/trunk r106803: Fix bug #10422 with Registry-related index entries.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106803
fixes bug(s): http://debbugs.gnu.org/10422
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-01-06 12:17:23 +0200
message:
  Fix bug #10422 with Registry-related index entries.
  
   doc/emacs/cmdargs.texi (MS-Windows Registry): Shorten the index entry.
   Move the stuff about resources to xresources.texi.
   doc/emacs/xresources.texi (Resources): Move information about setting X
   resources in the Registry from cmdargs.texi.  Make the index entry
   be similar to the one in cmdargs.texi.
modified:
  doc/emacs/ChangeLog
  doc/emacs/cmdargs.texi
  doc/emacs/xresources.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-01-05 11:09:27 +0000
+++ b/doc/emacs/ChangeLog       2012-01-06 10:17:23 +0000
@@ -1,3 +1,13 @@
+2012-01-06  Eli Zaretskii  <address@hidden>
+
+       * cmdargs.texi (MS-Windows Registry): Shorten the index entry.
+       (Bug#10422)
+       Move the stuff about resources to xresources.texi.
+
+       * xresources.texi (Resources): Move information about setting X
+       resources in the Registry from cmdargs.texi.  Make the index entry
+       be similar to the one in cmdargs.texi.
+
 2012-01-05  Chong Yidong  <address@hidden>
 
        * custom.texi (Customization Groups): Update example.

=== modified file 'doc/emacs/cmdargs.texi'
--- a/doc/emacs/cmdargs.texi    2012-01-05 09:46:05 +0000
+++ b/doc/emacs/cmdargs.texi    2012-01-06 10:17:23 +0000
@@ -675,9 +675,9 @@
 @node MS-Windows Registry
 @appendixsubsec The MS-Windows System Registry
 @pindex addpm, MS-Windows installation program
address@hidden registry, setting environment variables and resources on 
MS-Windows
address@hidden registry, setting environment variables (MS-Windows)
 
-Under MS-Windows, the installation program @command{addpm.exe} adds
+On MS-Windows, the installation program @command{addpm.exe} adds
 values for @env{emacs_dir}, @env{EMACSLOADPATH}, @env{EMACSDATA},
 @env{EMACSPATH}, @env{EMACSDOC}, @env{SHELL} and @env{TERM} to the
 @file{HKEY_LOCAL_MACHINE} section of the system registry, under
@@ -704,10 +704,6 @@
 In addition to the environment variables above, you can also add many
 of the settings which on X belong in the @file{.Xdefaults} file
 (@pxref{X Resources}) to the @file{/Software/GNU/Emacs} registry key.
-Settings you add to the @file{HKEY_LOCAL_MACHINE} section will affect
-all users of the machine.  Settings you add to the
address@hidden section will only affect you, and will
-override machine wide settings.
 
 @node Display X
 @appendixsec Specifying the Display Name

=== modified file 'doc/emacs/xresources.texi'
--- a/doc/emacs/xresources.texi 2012-01-05 09:46:05 +0000
+++ b/doc/emacs/xresources.texi 2012-01-06 10:17:23 +0000
@@ -51,15 +51,16 @@
 its own list of resources; to update it, use the command
 @command{xrdb}---for instance, @samp{xrdb ~/.Xdefaults}.
 
address@hidden Registry (MS-Windows)
address@hidden registry, setting resources (MS-Windows)
   (MS-Windows systems do not support X resource files; on Windows,
 Emacs looks for X resources in the Windows Registry, first under the
-key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs} and then under the key
address@hidden  The menu and scroll
-bars are native widgets on MS-Windows, so they are only customizable
-via the system-wide settings in the Display Control Panel.  You can
-also set resources using the @samp{-xrm} command line option, as
-explained below.)
+key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs}, which affects only
+the current user and override the system-wide settings, and then under
+the key @samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}, which affects
+all users of the system.  The menu and scroll bars are native widgets
+on MS-Windows, so they are only customizable via the system-wide
+settings in the Display Control Panel.  You can also set resources
+using the @samp{-xrm} command line option, as explained below.)
 
   Each line in the X resource file specifies a value for one option or
 for a collection of related options.  Each resource specification