[svnbook commit] r1525 - trunk/src/en/book

[cmpilato]

Author: cmpilato
Date: Wed Jul  6 08:49:29 2005
New Revision: 1525

Modified:
   trunk/src/en/book/ch07.xml
Log:
* src/en/book/ch07.xml
  s/Gnu/GNU/.  (Reported by sussman.)

Modified: trunk/src/en/book/ch07.xml
==============================================================================
--- trunk/src/en/book/ch07.xml	(original)
+++ trunk/src/en/book/ch07.xml	Wed Jul  6 08:49:29 2005
@@ -3262,7 +3262,7 @@
     <para>The interface between Subversion and external diff and merge
       tools harkens back to a time when Subversion's only contextual
       differencing capabilities were built around invocations of the
-      Gnu diffutils toolchain, specifically the
+      GNU diffutils toolchain, specifically the
       <command>diff</command> and <command>diff3</command> utilities.
       To get the kind of behavior Subversion needed, it called these
       utilities with more than a handful of options and parameters,
@@ -3276,7 +3276,7 @@
       the <option>--diff-cmd</option> and <option>--diff3-cmd</option>
       options were added to the Subversion command-line client so
       users could more easily indicate that they preferred to use the
-      Gnu diff and diff3 utilities instead of the newfangled internal
+      GNU diff and diff3 utilities instead of the newfangled internal
       diff library.  If those options were used, Subversion would
       simply ignore the internal diff library, and fall back to
       running those external programs, lengthy argument lists and all.
@@ -3284,24 +3284,24 @@
 
     <para>It didn't take long for folks to realize that having such
       easy configuration mechanisms for specifying that Subversion
-      should use the external Gnu diff and diff3 utilities located at
+      should use the external GNU diff and diff3 utilities located at
       a particular place on the system could be applied toward the use
       of other diff and merge tools, too.  After all, Subversion
       didn't actually verify that the things it was being told to run
-      were members of the Gnu diffutils toolchain.  But the only
+      were members of the GNU diffutils toolchain.  But the only
       configurable aspect of using those external tools is their
       location on the system—not the option set, parameter
-      order, etc.  Subversion continues throwing all those Gnu utility
+      order, etc.  Subversion continues throwing all those GNU utility
       options at your external diff tool regardless of whether or not
       that program can understand those options.  And that's where
       things get unintuitive for most users.</para>
 
     <para>The key to using external diff and merge tools (other than
-      Gnu diff and diff3, of course) with Subversion is to use wrapper
+      GNU diff and diff3, of course) with Subversion is to use wrapper
       scripts which convert the input from Subversion into something
       that your differencing tool can understand, and then to convert
       the output of your tool back into a format which Subversion
-      expects—the format that the Gnu tools would have used.
+      expects—the format that the GNU tools would have used.
       The following sections cover the specifics of those
       expectations.</para>
 
@@ -3325,7 +3325,7 @@
       <title>External diff</title>
 
       <para>Subversion calls external diff programs with parameters
-        suitable for the Gnu diff utility, and expects only that the
+        suitable for the GNU diff utility, and expects only that the
         external program return with a successful error code.  For
         most alternative diff program, only the sixth and seventh
         arguments, the paths of the files which represent the left and
@@ -3343,7 +3343,7 @@
       <title>External diff3</title>
 
       <para>Subversion calls external merge programs with parameters
-        suitable for the Gnu diff3 utility, expecting that the
+        suitable for the GNU diff3 utility, expecting that the
         external program return with a successful error code and that
         the full file contents which result from the completed merge
         operation are printed on the standard output stream (so that