[svnbook commit] r3117 - trunk/src/en/book
sussman
noreply at red-bean.com
Wed Jun 11 15:42:00 CDT 2008
Author: sussman
Date: Wed Jun 11 15:42:00 2008
New Revision: 3117
Log:
A billion little corrections from Jens Seidel <jensseidel at users.sf.net>.
Modified:
trunk/src/en/book/ch00-preface.xml
trunk/src/en/book/ch01-fundamental-concepts.xml
trunk/src/en/book/ch02-basic-usage.xml
trunk/src/en/book/ch03-advanced-topics.xml
trunk/src/en/book/ch04-branching-and-merging.xml
trunk/src/en/book/ch05-repository-admin.xml
trunk/src/en/book/ch06-server-configuration.xml
trunk/src/en/book/ch07-customizing-svn.xml
Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml (original)
+++ trunk/src/en/book/ch00-preface.xml Wed Jun 11 15:42:00 2008
@@ -106,7 +106,7 @@
learner prefers to read or skim documentation, getting a large
overview of how the system works; only then does she actually
start using the software. A bottom-learner is a <quote>learn by
- doing</quote> personmdash;someone who just wants to dive into the
+ doing</quote> person—someone who just wants to dive into the
software and figure it out as she goes, referring to book
sections when necessary. Most books tend to be written for one
type of person or the other, and this book is undoubtedly biased
@@ -842,7 +842,7 @@
server—authentication, authorization, wire
compression, and so on. A more lightweight, standalone
Subversion server process is also available. This server
- speaks a custom protocol that can be easily tunneled over
+ speaks a custom protocol that can be easily tunneled via
SSH.</para>
</listitem>
</varlistentry>
@@ -1081,7 +1081,7 @@
was a huge boon for users, and pushed Subversion far
beyond the abilities of CVS and into the ranks of
commercial competitors such as Perforce and Clearcase.
- Subversion 1.5 also introduced a bevy of smaller
+ Subversion 1.5 also introduced a bevy of other
user-focused features, such as interactive resolution of
file conflicts, partial checkouts, client side
management of changelists, powerful new syntax for
Modified: trunk/src/en/book/ch01-fundamental-concepts.xml
==============================================================================
--- trunk/src/en/book/ch01-fundamental-concepts.xml (original)
+++ trunk/src/en/book/ch01-fundamental-concepts.xml Wed Jun 11 15:42:00 2008
@@ -512,12 +512,12 @@
Checked out revision 56.
$ ls -A calc
-Makefile integer.c button.c .svn/
+Makefile button.c integer.c .svn/
</screen>
- <para>The list of letter As in the left margin indicates that
- Subversion is adding a number of items to your working copy.
- You now have a personal copy of the
+ <para>The list of letter <literal>A</literal>s in the left
+ margin indicates that Subversion is adding a number of items
+ to your working copy. You now have a personal copy of the
repository's <filename>/calc</filename> directory, with one
additional entry—<filename>.svn</filename>—which
holds the extra information needed by Subversion, as mentioned
@@ -567,7 +567,7 @@
/home/sally/calc
$ ls -A
-.svn/ Makefile integer.c button.c
+Makefile button.c integer.c .svn/
$ svn update
U button.c
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Wed Jun 11 15:42:00 2008
@@ -49,8 +49,8 @@
Valid options:
-q [--quiet] : print nothing, or only summary information
-N [--non-recursive] : obsolete; try --depth=files or --depth=immediates
- --depth ARG : pass depth ('empty', 'files', 'immediates', or
- 'infinity') as ARG
+ --depth ARG : limit operation by depth ARG ('empty', 'files',
+ 'immediates', or 'infinity')
…
</screen>
@@ -468,16 +468,17 @@
Updated to revision 2.
</screen>
- <para>In this case, someone else checked in modifications to
- both <filename>foo.c</filename> and <filename>bar.c</filename>
- since the last time you updated, and Subversion has updated
- your working copy to include those changes.</para>
+ <para>In this case, it appears that someone checked in
+ modifications to both <filename>foo.c</filename>
+ and <filename>bar.c</filename> since the last time you
+ updated, and Subversion has updated your working copy to
+ include those changes.</para>
<para>When the server sends changes to your working copy via
<command>svn update</command>, a letter code is displayed next
to each item to let you know what actions Subversion performed
to bring your working copy up-to-date. To find out what these
- letters mean, see <command>svn update</command>.</para>
+ letters mean, run <command>svn help update</command>.</para>
</sect2>
@@ -553,8 +554,7 @@
underneath <filename>foo</filename> will be scheduled
for addition. If you want only to add
<filename>foo</filename> itself, pass the
- <option>--non-recursive</option> (<option>-N</option>)
- option.</para>
+ <option>--depth empty</option> option.</para>
</listitem>
</varlistentry>
@@ -643,7 +643,7 @@
sort of <quote>staging area</quote> to set up your changes
before committing them to the repository. Commands that
operate on URLs don't have this luxury, so when you operate
- directly on a URL, any of the above actions represent an
+ directly on a URL, any of the above actions represents an
immediate commit.</para>
</sidebar>
@@ -866,7 +866,7 @@
useful information—you'll need to update and get the
server changes on <filename>README</filename> before you
commit, or the repository will reject your commit for being
- out of date. (more on this subject later).</para>
+ out of date (more on this subject later).</para>
<para><command>svn status</command> can display much more
information about the files and directories in your
@@ -1026,7 +1026,6 @@
<screen>
$ svn status README
- README
$ svn delete README
D README
@@ -1035,7 +1034,6 @@
Reverted 'README'
$ svn status README
- README
</screen>
</sect2>
@@ -1053,7 +1051,8 @@
U INSTALL
G README
Conflict discovered in 'bar.c'.
-Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options:
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h) help for more options:
</screen>
<para>The <computeroutput>U</computeroutput> and
@@ -1141,7 +1140,7 @@
</varlistentry>
<varlistentry>
- <term><computeroutput>(m)ine</computeroutput></term>
+ <term><computeroutput>(m)ine-(f)ull</computeroutput></term>
<listitem>
<para>Discard the newly received changes from the server
@@ -1151,7 +1150,7 @@
</varlistentry>
<varlistentry>
- <term><computeroutput>(t)heirs</computeroutput></term>
+ <term><computeroutput>(t)heirs-(f)ull</computeroutput></term>
<listitem>
<para>Discard your local changes to the file under review
@@ -1200,7 +1199,8 @@
<screen>
…
-Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : d
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h)elp for more options : d
--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007
+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007
@@ -1 +1,5 @@
@@ -1268,9 +1268,10 @@
<para>If you decide that you don't need to merge any changes,
but just want to accept one version of the file or the
other, you can either choose your changes (aka
- <quote>mine</quote>) by using the <quote>mine</quote>
- command (<command>m</command>) or choose theirs by using the
- <quote>theirs</quote> command (<command>t</command>).</para>
+ <quote>mine</quote>) by using the <quote>mine-full</quote>
+ command (<command>mf</command>) or choose theirs by using the
+ <quote>theirs-full</quote> command
+ (<command>tf</command>).</para>
</sect3>
@@ -1342,7 +1343,8 @@
</varlistentry>
<varlistentry>
- <term><filename>filename.rOLDREV</filename></term>
+ <term><filename>filename.r<replaceable>OLDREV</replaceable>
+ </filename></term>
<listitem>
<para>This is the file that was the
<literal>BASE</literal> revision before you updated
@@ -1353,7 +1355,8 @@
</varlistentry>
<varlistentry>
- <term><filename>filename.rNEWREV</filename></term>
+ <term><filename>filename.r<replaceable>NEWREV</replaceable>
+ </filename></term>
<listitem>
<para>This is the file that your Subversion client
just received from the server when you updated your
@@ -1365,9 +1368,9 @@
</variablelist>
- <para>Here <literal>OLDREV</literal> is the revision number
+ <para>Here <replaceable>OLDREV</replaceable> is the revision number
of the file in your <filename>.svn</filename> directory,
- and <literal>NEWREV</literal> is the revision number of
+ and <replaceable>NEWREV</replaceable> is the revision number of
the repository <literal>HEAD</literal>.</para>
</listitem>
@@ -1382,7 +1385,8 @@
<screen>
$ svn update
Conflict discovered in 'sandwich.txt'.
-Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : p
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h)elp for more options : p
C sandwich.txt
Updated to revision 2.
$ ls -1
Modified: trunk/src/en/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/en/book/ch03-advanced-topics.xml (original)
+++ trunk/src/en/book/ch03-advanced-topics.xml Wed Jun 11 15:42:00 2008
@@ -1901,7 +1901,7 @@
<term><literal>--depth files</literal></term>
<listitem>
<para>Include the immediate target of the operation and any
- of its immediate file chidren.</para>
+ of its immediate file children.</para>
</listitem>
</varlistentry>
@@ -1909,7 +1909,7 @@
<term><literal>--depth immediates</literal></term>
<listitem>
<para>Include the immediate target of the operation and any
- of its immediate file or directory chidren. The directory
+ of its immediate file or directory children. The directory
children will themselves be empty.</para>
</listitem>
</varlistentry>
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Wed Jun 11 15:42:00 2008
@@ -1787,7 +1787,7 @@
</screen>
<para>And while it's true that you did actually commit those
- three lines in revision 390, two of them were actually writen
+ three lines in revision 390, two of them were actually written
by Sally back in revision 383:</para>
<screen>
@@ -3054,7 +3054,7 @@
</row>
<row>
- <entry>See merge history or eligible changests</entry>
+ <entry>See merge history or eligible changesets</entry>
<entry>svn mergeinfo target [--from-source=URL]</entry>
</row>
Modified: trunk/src/en/book/ch05-repository-admin.xml
==============================================================================
--- trunk/src/en/book/ch05-repository-admin.xml (original)
+++ trunk/src/en/book/ch05-repository-admin.xml Wed Jun 11 15:42:00 2008
@@ -1298,7 +1298,7 @@
revisions are committed to the repository, Subversion drops
more files into these two directories—over time, the
number of these files in each directory can grow to be quite
- large. This has been observed to cause perfomance problems
+ large. This has been observed to cause performance problems
on certain network-based filesystems.</para>
<para>Subversion 1.5 creates FSFS-backed repositories using a
@@ -3132,7 +3132,7 @@
load</command>.</para>
<screen>
-$ cat - <<EOF | svnadmin load --force-uuid /var/snv/repos
+$ cat - <<EOF | svnadmin load --force-uuid /var/svn/repos
SVN-fs-dump-format-version: 2
UUID: cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec
Modified: trunk/src/en/book/ch06-server-configuration.xml
==============================================================================
--- trunk/src/en/book/ch06-server-configuration.xml (original)
+++ trunk/src/en/book/ch06-server-configuration.xml Wed Jun 11 15:42:00 2008
@@ -27,7 +27,7 @@
<para>Subversion was designed with an abstract network layer.
This means that a repository can be programmatically accessed by
any sort of server process, and the client <quote>repository
- access</quote> API allows programmers to write plugins that
+ access</quote> API allows programmers to write plug-ins that
speak relevant network protocols. In theory, Subversion can use
an infinite number of network implementations. In practice,
there are only two servers at the time of this writing.</para>
Modified: trunk/src/en/book/ch07-customizing-svn.xml
==============================================================================
--- trunk/src/en/book/ch07-customizing-svn.xml (original)
+++ trunk/src/en/book/ch07-customizing-svn.xml Wed Jun 11 15:42:00 2008
@@ -713,7 +713,7 @@
<filename>.pdf</filename>, there probably isn't an
application configured on your system to open all
files whose extensions are
- <filename>.r4321</filename>.</para>
+ <filename>.r4231</filename>.</para>
<para>You can fix this annoyance by using this
configuration option, though. For files with one of
More information about the svnbook-dev
mailing list