[svnbook commit] r1098 - branches/1.0/src/en/book

[cmpilato at red-bean.com]

Author: cmpilato
Date: Wed Feb 23 00:59:37 2005
New Revision: 1098

Modified:
   branches/1.0/src/en/book/ch07.xml
Log:
[1.0 branch]:  Merge in a change relevant to the 1.0 line.

* src/en/book/ch07.xml
  Merge r687 into this branch.


Modified: branches/1.0/src/en/book/ch07.xml
==============================================================================
--- branches/1.0/src/en/book/ch07.xml	(original)
+++ branches/1.0/src/en/book/ch07.xml	Wed Feb 23 00:59:37 2005
@@ -229,7 +229,7 @@
 "#diff3-has-program-arg"=""
 
 [HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\miscellany]
-"#global-ignores"="*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#*"
+"#global-ignores"="*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store"
 "#log-encoding"=""
 "#use-commit-times"=""
 "#template-root"=""
@@ -548,7 +548,7 @@
                 files and directories that Subversion should not
                 display unless they are versioned.  The default value
                 is <literal>*.o *.lo *.la #*# .*.rej *.rej .*~ *~
-                .#*</literal>.</para>
+                .#* .DS_Store</literal>.</para>
 
               <para>You can override this option for a single instance
                 of the <command>svn status</command> command by using