[svnbook commit] r1863 - trunk/src/en/book
sussman
svnbook-dev at red-bean.com
Mon Nov 28 08:18:42 CST 2005
Author: sussman
Date: Mon Nov 28 08:18:41 2005
New Revision: 1863
Modified:
trunk/src/en/book/appa.xml
trunk/src/en/book/ch03.xml
Log:
Fixes from Jens Seidel <Jens.Seidel at imkf.tu-freiberg.de>.
* src/en/book/ch03.xml: s/mods/changes/, avoiding jargon.
* src/en/book/appa.xml: s/mods/changes/. Also, it's 'cvs -n update.'
Modified: trunk/src/en/book/appa.xml
==============================================================================
--- trunk/src/en/book/appa.xml (original)
+++ trunk/src/en/book/appa.xml Mon Nov 28 08:18:41 2005
@@ -175,7 +175,7 @@
to send differences when committing, which CVS cannot do.</para>
<para>The last subcommand in the list is new; it will not only
- remove local mods, but it will un-schedule operations such as
+ remove local changes, but it will un-schedule operations such as
adds and deletes. It's the preferred way to revert a file;
running <command>rm file; svn update</command> will still work, but
it blurs the purpose of updating. And, while we're on this
@@ -200,11 +200,12 @@
copy, and second, to show the user which files are out-of-date.
Unfortunately, because of CVS's hard-to-read status output, many
CVS users don't take advantage of this command at all. Instead,
- they've developed a habit of running <command>cvs update</command>
- or <command>cvs update -n</command> to quickly see their mods. If
- users forget to use the <option>-n</option> option, this has the
- side effect of merging repository changes they may not be ready
- to deal with.</para>
+ they've developed a habit of running <command>cvs
+ update</command> or <command>cvs -n update/command> to quickly
+ see their changes. If users forget to use
+ the <option>-n</option> option, this has the side effect of
+ merging repository changes they may not be ready to deal
+ with.</para>
<para>With Subversion, we've tried to remove this muddle by making
the output of <command>svn status</command> easy to read for
Modified: trunk/src/en/book/ch03.xml
==============================================================================
--- trunk/src/en/book/ch03.xml (original)
+++ trunk/src/en/book/ch03.xml Mon Nov 28 08:18:41 2005
@@ -177,11 +177,11 @@
# shows log message for the latest repository commit
$ svn diff --revision HEAD
-# compares your working file (with local mods) to the latest version
+# compares your working file (with local changes) to the latest version
# in the repository
$ svn diff --revision BASE:HEAD foo.c
-# compares your <quote>pristine</quote> foo.c (no local mods) with the
+# compares your <quote>pristine</quote> foo.c (no local changes) with the
# latest version in the repository
$ svn log --revision BASE:HEAD
More information about the svnbook-dev
mailing list