[svnbook commit] r3235 - trunk/src/en/book
fitz
noreply at red-bean.com
Sat Aug 2 23:22:34 CDT 2008
Author: fitz
Date: Sat Aug 2 23:22:34 2008
New Revision: 3235
Log:
Second round of copyedits for chapter 2.
I didn't reflow any of the paragraphs that I edited, and I have to
say--it almost killed me. M-q is as much of a reflex for me as
blinking my eye when someone is trying to poke their finger in it.
Damn you, Emacs!
* src/en/book/ch02-basic-usage.xml: Copyedit.
Modified:
trunk/src/en/book/ch02-basic-usage.xml
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 Sat Aug 2 23:22:34 2008
@@ -12,7 +12,7 @@
arise.</para>
<para>Note that this chapter is not meant to be an exhaustive list
- of all Subversion's commands—rather, it's a conversational
+ of all of Subversion's commands—rather, it's a conversational
introduction to the most common Subversion tasks that you'll
encounter. This chapter assumes that you've read and understood
<xref linkend="svn.basic"/> and are familiar with the general
@@ -30,7 +30,7 @@
ever need when using Subversion: <command>svn help</command>.
The Subversion command-line client is self-documenting—at
any time, a quick <userinput>svn help
- <replaceable>SUBCOMMAND</replaceable></userinput> will describe
+ <replaceable>subcommand</replaceable></userinput> will describe
the syntax, options, and behavior of the subcommand.</para>
<screen>
@@ -62,15 +62,15 @@
distinct kinds of options: short options
are a single hyphen followed by a single letter, and
long options consist of two hyphens
- followed by a number of letters (e.g. <literal>-s</literal>
- and <literal>--this-is-a-long-option</literal>
+ followed by a number of letters (e.g., <literal>-s</literal>
+ and <literal>--this-is-a-long-option</literal>,
respectively). Every option has a long format, but only
certain options have an additional short format (these are
- typically options that are frequently used). In order to
+ typically options that are frequently used). To
maintain clarity, we <emphasis>usually</emphasis> use the
long form in code examples, but when describing options, if
there's a short form, we'll provide the long form (to
- improve clarity), and the short form (to make it easier to
+ improve clarity) and the short form (to make it easier to
remember). You should use whichever one you're more
comfortable with, but don't try to use both.</para>
@@ -84,8 +84,8 @@
<sect1 id="svn.tour.importing">
<title>Getting Data into Your Repository</title>
- <para>There are two ways to get new files into your Subversion
- repository: <command>svn import</command> and <command>svn
+ <para>You can get new files into your Subversion
+ repository in two ways: <command>svn import</command> and <command>svn
add</command>. We'll discuss <command>svn import</command> now
and will discuss <command>svn add</command> later in this
chapter when we review a typical day with Subversion.</para>
@@ -98,8 +98,8 @@
copy an unversioned tree of files into a repository, creating
intermediate directories as necessary. <command>svn
import</command> doesn't require a working copy, and your files
- are immediately committed to the repository. This is typically
- used when you have an existing tree of files that you want to
+ are immediately committed to the repository. You typically
+ use this when you have an existing tree of files that you want to
begin tracking in your Subversion repository. For example:</para>
<screen>
@@ -142,7 +142,7 @@
<quote>main line</quote> of development, a
<filename>branches</filename> directory to contain branch
copies, and a <filename>tags</filename> directory to contain tag
- copies—for example:</para>
+ copies. For example:</para>
<screen>
$ svn list file:///var/svn/repos
@@ -201,7 +201,7 @@
stores.</para>
<para>Subversion internally handles certain bits of
- data—for example, property names, path names, and log
+ data—for example, property names, pathnames, and log
messages—as UTF-8-encoded Unicode. This is not to say
that all your interactions with Subversion must involve UTF-8,
though. As a general rule, Subversion clients will gracefully
@@ -213,7 +213,7 @@
<para>In WebDAV exchanges and older versions of some of
Subversion's administrative files, paths are used as XML
attribute values, and property names in XML tag names. This
- means that path names can contain only legal XML (1.0)
+ means that pathnames can contain only legal XML (1.0)
characters, and properties are further limited to ASCII
characters. Subversion also prohibits TAB, CR, and LF
characters in path names to prevent paths from being broken up
@@ -225,14 +225,14 @@
locale settings are compatible with UTF-8 and you don't use
control characters in path names, you should have no trouble
communicating with Subversion. The command-line client adds
- an extra bit of help—in order to create
+ an extra bit of help—to create
<quote>legally correct</quote> versions for internal
use it will automatically escape illegal
path characters as needed in URLs that you type.</para>
</sidebar>
- <para>Although the above example checks out the trunk directory,
+ <para>Although the preceding example checks out the trunk directory,
you can just as easily check out any deep subdirectory of a
repository by specifying the subdirectory in the checkout
URL:</para>
@@ -249,13 +249,13 @@
Checked out revision 8810.
</screen>
- <para>Since Subversion uses a <quote>copy-modify-merge</quote>
- model instead of <quote>lock-modify-unlock</quote> (see
- <xref linkend="svn.basic.vsn-models"/>), you can start right in
- making changes to the files and directories in your working
+ <para>Since Subversion uses a copy-modify-merge
+ model instead of lock-modify-unlock (see
+ <xref linkend="svn.basic.vsn-models"/>), you can immediately
+ make changes to the files and directories in your working
copy. Your working copy is just like any other collection of
files and directories on your system. You can edit and change
- them, move them around, even delete the entire working copy and
+ it, move it around, even delete the entire working copy and
forget about it.</para>
<warning>
@@ -276,7 +276,7 @@
anything.</para>
<sidebar>
- <title>What's with the <filename>.svn</filename> Directory?</title>
+ <title>What's with the .svn Directory?</title>
<para>Every directory in a working copy contains an
administrative area—a subdirectory named
@@ -291,7 +291,7 @@
the entire containing directory (a normal system deletion,
not <command>svn delete</command>), then run <userinput>svn
update</userinput> from a parent directory. The Subversion
- client will re-download the directory you've deleted, with a
+ client will download the directory you've deleted, with a
new <filename>.svn</filename> area as well.</para>
</sidebar>
@@ -324,17 +324,16 @@
<para>When you perform a Subversion operation that requires you
to authenticate, by default Subversion caches your
authentication credentials on disk. This is done for
- convenience, so that you don't have to continually re-enter
+ convenience so that you don't have to continually reenter
your password for future operations. If you're concerned
- about caching your Subversion passwords,
- <footnote>
+ about caching your Subversion passwords<footnote>
<para>Of course, you're not terribly worried—first
because you know that you can't
<emphasis>really</emphasis> delete anything from
- Subversion and, secondly, because your Subversion password
+ Subversion, and second because your Subversion password
isn't the same as any of the other 3 million passwords
you have, right? Right?</para>
- </footnote>
+ </footnote>,
you can disable caching either permanently or on a
case-by-case basis.</para>
@@ -349,14 +348,14 @@
</sect2>
<sect2 id="svn.tour.initial.different-user">
- <title>Authenticating as a Different User</title>
+ <title>Authenticating As a Different User</title>
<para>Since Subversion caches auth credentials by default (both
username and password), it conveniently remembers who you were
- acting as the last time you modified you working copy. But
+ acting as the last time you modified your working copy. But
sometimes that's not helpful—particularly if you're
working in a shared working copy such as a system
- configuration directory or a webserver document root. In this
+ configuration directory or a web server document root. In this
case, just pass the <option>--username</option> option on the
command line, and Subversion will attempt to authenticate as
that user, prompting you for a password if necessary.</para>
@@ -372,8 +371,8 @@
<title>Basic Work Cycle</title>
<para>Subversion has numerous features, options, bells, and
- whistles, but on a day-to-day basis, odds are that you will only
- use a few of them. In this section, we'll run through the most
+ whistles, but on a day-to-day basis, odds are that you will use
+ only a few of them. In this section, we'll run through the most
common things that you might find yourself doing with Subversion
in the course of a day's work.</para>
@@ -457,8 +456,8 @@
<title>Update Your Working Copy</title>
<para>When working on a project with a team, you'll want to
- update your working copy to receive any changes made since
- your last update by other developers on the project. Use
+ update your working copy to receive any changes other developers
+ on the project have made since your last update. Use
<command>svn update</command> to bring your working copy into
sync with the latest revision in the repository:</para>
@@ -490,7 +489,7 @@
<para>Now you can get to work and make changes in your working
copy. It's usually most convenient to decide on a discrete
change (or set of changes) to make, such as writing a new
- feature, fixing a bug, etc. The Subversion commands that you
+ feature, fixing a bug, and so on. The Subversion commands that you
will use here are <command>svn add</command>, <command>svn
delete</command>, <command>svn copy</command>, <command>svn
move</command>, and <command>svn mkdir</command>. However, if
@@ -498,15 +497,15 @@
you may not need to use any of these commands until you
commit.</para>
- <para>There are two kinds of changes you can make to your
+ <para>You can make two kinds of changes to your
working copy: <firstterm>file changes</firstterm>
and <firstterm>tree changes</firstterm>. You don't need to
tell Subversion that you intend to change a file; just make
your changes using your text editor, word processor, graphics
program, or whatever tool you would normally use. Subversion
automatically detects which files have been changed, and in
- addition, handles binary files just as easily as it handles
- text files—and just as efficiently too. For tree
+ addition, it handles binary files just as easily as it handles
+ text files—and just as efficiently, too. For tree
changes, you can ask Subversion to <quote>mark</quote> files
and directories for scheduled removal, addition, copying, or
moving. These changes may take place immediately in your
@@ -540,7 +539,7 @@
Subversion-related activities.</para> </sidebar>
<para>Here is an overview of the five Subversion subcommands
- that you'll use most often to make tree changes.</para>
+ that you'll use most often to make tree changes:</para>
<variablelist>
@@ -570,8 +569,7 @@
deleted, but Subversion schedules it for deletion. When
you commit your changes, <filename>foo</filename> will
be entirely removed from your working copy and the
- repository.
- <footnote>
+ repository<footnote>
<para>Of course, nothing is ever totally deleted from
the repository—just from the
<literal>HEAD</literal> of the repository. You can
@@ -580,7 +578,7 @@
than the one in which you deleted it. Also see <xref
linkend="svn.branchmerge.basicmerging.resurrect"
/>.</para>
- </footnote>
+ </footnote>.
</para>
</listitem>
</varlistentry>
@@ -644,7 +642,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 represents an
+ directly on a URL, any of the aforementioned actions represents an
immediate commit.</para>
</sidebar>
@@ -671,22 +669,21 @@
<sidebar>
<title>Look Ma! No Network!</title>
- <para>The commands <command>svn status</command>,
+ <para>You can use the commands <command>svn status</command>,
<command>svn diff</command>, and <command>svn
- revert</command> can be used without any network access even
+ revert</command> without any network access even
if your repository <emphasis>is</emphasis> across the
network. This makes it easy to manage your
changes-in-progress when you are somewhere without a network
- connection, such as travelling on an airplane, riding a
- commuter train, or hacking on the beach.
- <footnote>
- <para>And also that you don't have a WLAN card. Thought
+ connection, such as traveling on an airplane, riding a
+ commuter train, or hacking on the beach<footnote>
+ <para>And you don't have a WLAN card. Thought
you got us, huh?</para>
- </footnote>
+ </footnote>.
</para>
<para>Subversion does this by keeping private caches of
- pristine versions of each versioned file inside of the
+ pristine versions of each versioned file inside the
<filename>.svn</filename> administrative areas. This allows
Subversion to report—and revert—local
modifications to those files <emphasis>without network
@@ -696,7 +693,7 @@
a compressed <firstterm>delta</firstterm> (or
<quote>difference</quote>) against the pristine version.
Having this cache is a tremendous benefit—even if you
- have a fast net connection, it's much faster to send only a
+ have a fast Internet connection, it's much faster to send only a
file's changes rather than the whole file to the
server.</para>
@@ -705,8 +702,8 @@
<para>Subversion has been optimized to help you with this task,
and it is able to do many things without communicating with
the repository. In particular, your working copy contains a
- hidden cached <quote>pristine</quote> copy of each version
- controlled file within the <filename>.svn</filename> area.
+ hidden cached <quote>pristine</quote> copy of each version-controlled
+ file within the <filename>.svn</filename> area.
Because of this, Subversion can quickly show you how your
working files have changed or even allow you to undo your
changes without contacting the repository.</para>
@@ -733,7 +730,7 @@
<para>In Subversion, <command>svn update</command> does just
that—it updates your working copy with any changes
- committed to the repository since the last time you've
+ committed to the repository since the last time you
updated your working copy. You may have to break the
habit of using the <command>update</command> command to
see what local modifications you've made.</para>
@@ -742,7 +739,7 @@
<para>If you run <command>svn status</command> at the top of
your working copy with no arguments, it will detect all file
- and tree changes you've made. Below are a few examples of
+ and tree changes you've made. Here are a few examples of
the most common status codes that <command>svn
status</command> can return. (Note that the text following
<literal>#</literal> is not
@@ -951,7 +948,7 @@
</screen>
<para>You could, for example, email the patch file to another
- developer for review or testing prior to commit.</para>
+ developer for review or testing prior to a commit.</para>
<para>Subversion uses its internal diff engine, which produces
unified diff format, by default. If you want diff output in
@@ -1011,10 +1008,10 @@
</screen>
<note>
- <para><userinput>svn revert <replaceable>ITEM</replaceable></userinput> has exactly the same
- effect as deleting <replaceable>ITEM</replaceable> from
+ <para><userinput>svn revert <replaceable>item</replaceable></userinput> has exactly the same
+ effect as deleting <replaceable>item</replaceable> from
your working copy and then running <userinput>svn update -r
- BASE <replaceable>ITEM</replaceable></userinput>. However,
+ BASE <replaceable>item</replaceable></userinput>. However,
if you're reverting a file, <command>svn revert</command>
has one very noticeable difference—it doesn't have
to communicate with the repository to restore your
@@ -1092,7 +1089,7 @@
<variablelist>
<varlistentry>
- <term><computeroutput>(p)ostpone</computeroutput></term>
+ <term>(<computeroutput>p</computeroutput>)ostpone</term>
<listitem>
<para>Leave the file in a conflicted state for you to
@@ -1104,7 +1101,7 @@
<varlistentry>
- <term><computeroutput>(d)iff</computeroutput></term>
+ <term>(<computeroutput>d</computeroutput>)iff</term>
<listitem>
<para>Display the differences between the base revision
@@ -1115,7 +1112,7 @@
<varlistentry>
- <term><computeroutput>(e)dit</computeroutput></term>
+ <term>(<computeroutput>e</computeroutput>)dit</term>
<listitem>
<para>Open the file in conflict with your favorite editor,
@@ -1127,7 +1124,7 @@
<varlistentry>
- <term><computeroutput>(r)esolved</computeroutput></term>
+ <term>(<computeroutput>r</computeroutput>)esolved</term>
<listitem>
<para>After editing a file, tell
@@ -1140,7 +1137,7 @@
</varlistentry>
<varlistentry>
- <term><computeroutput>(m)ine-(f)ull</computeroutput></term>
+ <term>(<computeroutput>m</computeroutput>)ine-(<computeroutput>f</computeroutput>)ull</term>
<listitem>
<para>Discard the newly received changes from the server
@@ -1150,7 +1147,7 @@
</varlistentry>
<varlistentry>
- <term><computeroutput>(t)heirs-(f)ull</computeroutput></term>
+ <term>(<computeroutput>t</computeroutput>)heirs-(<computeroutput>f</computeroutput>)ull</term>
<listitem>
<para>Discard your local changes to the file under review
@@ -1161,7 +1158,7 @@
</varlistentry>
<varlistentry>
- <term><computeroutput>(l)aunch</computeroutput></term>
+ <term>(<computeroutput>l</computeroutput>)aunch</term>
<listitem>
<para>Launch an external program to perform the conflict
@@ -1172,7 +1169,7 @@
</varlistentry>
<varlistentry>
- <term><computeroutput>(h)elp</computeroutput></term>
+ <term>(<computeroutput>h</computeroutput>)elp</term>
<listitem>
<para>Show the list of all possible commands you can use
@@ -1193,7 +1190,7 @@
<title>Viewing conflict differences interactively</title>
<para>Before deciding how to attack a conflict interactively,
- odds are that you'd like to see what exactly is in conflict,
+ odds are that you'd like to see exactly what is in conflict,
and the <firstterm>diff</firstterm> command
(<userinput>d</userinput>) is what you'll use for this:</para>
@@ -1244,16 +1241,16 @@
walkthrough), so some people like to use fancy graphical
merge tools instead.</para>
- <para>In order to use a merge tool, you need to either set the
+ <para>To use a merge tool, you need to either set the
<literal>SVN_MERGE</literal> environment variable or define
the <literal>merge-tool-cmd</literal> option in your
Subversion configuration file (see <xref
linkend="svn.advanced.confarea.opts"/> for more details).
- Subversion will pass four arguments to the merge tool: The
+ Subversion will pass four arguments to the merge tool: the
<literal>BASE</literal> revision of the file, the revision
of the file received from the server as part of the update,
the copy of the file containing your local edits, and
- lastly, the merged copy of the file (which contains conflict
+ the merged copy of the file (which contains conflict
markers). If your merge tool is expecting arguments in a
different order or format, you'll need to write a wrapper
script for Subversion to invoke. After you've edited the
@@ -1267,7 +1264,7 @@
<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
+ other, you can either choose your changes (a.k.a.
<quote>mine</quote>) by using the <quote>mine-full</quote>
command (<userinput>mf</userinput>) or choose theirs by using the
<quote>theirs-full</quote> command
@@ -1317,7 +1314,7 @@
delimit the <quote>sides</quote> of the
conflict—into the file to visibly demonstrate the
overlapping areas. (Subversion uses the
- <literal>svn:mime-type</literal> property to decide if a
+ <literal>svn:mime-type</literal> property to decide whether a
file is capable of contextual, line-based merging. See
<xref linkend="svn.advanced.props.special.mime-type"/>
to learn more.)</para>
@@ -1336,7 +1333,7 @@
copy before you updated your working copy—that
is, without conflict markers. This file has only
your latest changes in it. (If Subversion considers
- the file to be unmergeable, then the
+ the file to be unmergeable, the
<filename>.mine</filename> file isn't created, since
it would be identical to the working file.)</para>
</listitem>
@@ -1399,7 +1396,7 @@
<para>At this point, Subversion will <emphasis>not</emphasis>
allow Sally to commit the file
<filename>sandwich.txt</filename> until the three temporary
- files are removed.</para>
+ files are removed:</para>
<screen>
$ svn commit -m "Add a few more things"
@@ -1434,10 +1431,10 @@
argument.</para>
<para><command>svn resolve</command> removes the three
- temporary files, accepts the version of the file that you
+ temporary files and accepts the version of the file that you
specified with the <option>--accept</option> option, and
Subversion no longer considers the file to be in a state of
- conflict.</para>
+ conflict:</para>
<screen>
$ svn resolve --accept working sandwich.txt
@@ -1459,7 +1456,7 @@
<filename>sandwich.txt</filename> at the same time. Sally
commits her changes, and when you go to update your working
copy, you get a conflict and you're going to have to edit
- <filename>sandwich.txt</filename> to resolve the conflicts.
+ <filename>sandwich.txt</filename> to resolve the conflict.
First, let's take a look at the file:</para>
<screen>
@@ -1481,7 +1478,7 @@
Bottom piece of bread
</screen>
- <para>The strings of less-than signs, equal signs, and
+ <para>The strings of less-than signs, equals signs, and
greater-than signs are conflict markers and are not part of
the actual data in conflict. You generally want to ensure
that those are removed from the file before your next
@@ -1510,15 +1507,14 @@
<para>Usually you won't want to just delete the conflict
markers and Sally's changes—she's going to be awfully
surprised when the sandwich arrives and it's not what she
- wanted. So this is where you pick up the phone or walk
+ wanted. This is where you pick up the phone or walk
across the office and explain to Sally that you can't get
- sauerkraut from an Italian deli.
- <footnote>
+ sauerkraut from an Italian deli<footnote>
<para>And if you ask them for it, they may very well ride
you out of town on a rail.</para>
- </footnote>
+ </footnote>.
Once you've agreed on the changes you will check in, edit
- your file and remove the conflict markers.</para>
+ your file and remove the conflict markers:</para>
<screen>
Top piece of bread
@@ -1586,10 +1582,10 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.resolve.revert">
- <title>Punting: using <command>svn revert</command></title>
+ <title>Punting: Using svn revert</title>
<para>If you decide that you want to throw out your changes
- and start your edits again (Whether this occurs after a
+ and start your edits again (whether this occurs after a
conflict or anytime), just revert your changes:</para>
<screen>
@@ -1616,7 +1612,7 @@
<para>The <command>svn commit</command> command sends all of
your changes to the repository. When you commit a change, you
- need to supply a <firstterm>log message</firstterm>,
+ need to supply a <firstterm>log message</firstterm>
describing your change. Your log message will be attached to
the new revision you create. If your log message is brief,
you may wish to supply it on the command line using the
@@ -1644,8 +1640,8 @@
<para>If you fail to specify either the
<option>--message</option> or <option>--file</option> option,
- then Subversion will automatically launch your favorite editor
- (see the <literal>editor-cmd</literal> section in
+ Subversion will automatically launch your favorite editor
+ (see the information on <literal>editor-cmd</literal> in
<xref linkend="svn.advanced.confarea.opts.config"/>) for composing a log
message.</para>
@@ -1654,7 +1650,7 @@
decide that you want to cancel your commit, you can just
quit your editor without saving changes. If you've already
saved your commit message, simply delete the text, save
- again, then abort.</para>
+ again, and then abort:</para>
<screen>
$ svn commit
@@ -1667,12 +1663,12 @@
</screen>
</tip>
- <para>The repository doesn't know or care if your changes make
- any sense as a whole; it checks only to make sure that nobody
+ <para>The repository doesn't know or care whether your changes make
+ any sense as a whole; it checks only to make sure nobody
else has changed any of the same files that you did when you
weren't looking. If somebody <emphasis>has</emphasis> done
that, the entire commit will fail with a message informing you
- that one or more of your files is out of date:</para>
+ that one or more of your files are out of date:</para>
<screen>
$ svn commit -m "Add another rule"
@@ -1691,7 +1687,7 @@
result, and attempt your commit again.</para>
<para>That covers the basic work cycle for using Subversion.
- There are many other features in Subversion that you can use
+ Subversion offerse many other features that you can use
to manage your repository and working copy, but most of your
day-to-day use of Subversion will involve only the commands
that we've discussed so far in this chapter. We will,
@@ -1718,7 +1714,7 @@
just want to <emphasis>peer into</emphasis> the past instead of
<emphasis>going into</emphasis> it.</para>
- <para>There are several commands that can provide you with
+ <para>Several commands can provide you with
historical data from the repository:</para>
<variablelist>
@@ -1728,14 +1724,14 @@
<listitem>
<para>Shows you broad information: log messages with date
and author information attached to revisions and which
- paths changed in each revision.</para>
+ paths changed in each revision</para>
</listitem>
</varlistentry>
<varlistentry>
<term><command>svn diff</command></term>
<listitem>
- <para>Shows line-level details of a particular change.</para>
+ <para>Shows line-level details of a particular change</para>
</listitem>
</varlistentry>
@@ -1743,7 +1739,7 @@
<term><command>svn cat</command></term>
<listitem>
<para>Retrieves a file as it existed in a particular
- revision number and displays it on your screen.</para>
+ revision number and displays it on your screen</para>
</listitem>
</varlistentry>
@@ -1751,7 +1747,7 @@
<term><command>svn list</command></term>
<listitem>
<para>Displays the files in a directory for any given
- revision.</para>
+ revision</para>
</listitem>
</varlistentry>
@@ -1768,7 +1764,7 @@
record of who made changes to a file or directory, at what
revision it changed, the time and date of that revision,
and—if it was provided—the log message that accompanied
- the commit.</para>
+ the commit:</para>
<screen>
$ svn log
@@ -1818,7 +1814,7 @@
<sidebar>
- <title>Why Does <command>svn log</command> Not Show Me What I
+ <title>Why Does svn log Not Show Me What I
Just Committed?</title>
<para>If you make a commit and immediately type <userinput>svn
@@ -1872,7 +1868,7 @@
gives just the names of the changed files.</para>
<sidebar>
- <title>Why Does <command>svn log</command> Give Me an Empty
+ <title>Why Does svn log Give Me an Empty
Response?</title>
<para>After working with Subversion for a bit, most users will
@@ -1894,7 +1890,7 @@
nor any of its children was changed, Subversion will show you
an empty log. If you want to see what changed in that
revision, try pointing <command>svn log</command> directly at
- the top-most URL of your repository, as in <userinput>svn log -r 2
+ the topmost URL of your repository, as in <userinput>svn log -r 2
http://svn.collab.net/repos/svn</userinput>.</para>
</sidebar>
@@ -1907,7 +1903,7 @@
<para>We've already seen <command>svn diff</command>
before—it displays file differences in unified diff
- format; it was used to show the local modifications made to
+ format; we used it to show the local modifications made to
our working copy before committing to the repository.</para>
<para>In fact, it turns out that there are
@@ -1917,7 +1913,7 @@
<itemizedlist>
<listitem>
- <para>Examining Local Changes</para>
+ <para>Examining local changes</para>
</listitem>
<listitem>
@@ -1925,7 +1921,7 @@
</listitem>
<listitem>
- <para>Comparing repository to repository</para>
+ <para>Comparing one repository to another</para>
</listitem>
</itemizedlist>
@@ -1962,9 +1958,9 @@
<title>Comparing working copy to repository</title>
<para>If a single <option>--revision</option>
- (<option>-r</option>) number is passed, then your
+ (<option>-r</option>) number is passed, your
working copy is compared to the specified revision in the
- repository.</para>
+ repository:</para>
<screen>
$ svn diff -r 3 rules.txt
@@ -1990,7 +1986,7 @@
<para>If two revision numbers, separated by a colon, are
passed via <option>--revision</option>
- (<option>-r</option>), then the two revisions are directly
+ (<option>-r</option>), the two revisions are directly
compared:</para>
<screen>
@@ -2008,7 +2004,7 @@
$
</screen>
- <para>A more convenient way of comparing a revision to the
+ <para>A more convenient way of comparing one revision to the
previous revision is to use the <option>--change</option>
(<option>-c</option>) option:</para>
@@ -2053,7 +2049,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.browsing.cat">
- <title><command>svn cat</command></title>
+ <title>svn cat</title>
<para>If you want to examine an earlier version of a file and
@@ -2081,7 +2077,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.history.browsing.list">
- <title><command>svn list</command></title>
+ <title>svn list</title>
<para>The <command>svn list</command> command shows you what
files are in a repository directory without actually
@@ -2135,10 +2131,9 @@
<para>In addition to all of the previous commands, you can use
<command>svn update</command> and <command>svn
checkout</command> with the <option>--revision</option> option
- to take an entire working copy <quote>back in time</quote>:
- <footnote>
+ to take an entire working copy <quote>back in time</quote><footnote>
<para>See? We told you that Subversion was a time machine.</para>
- </footnote>
+ </footnote>:
</para>
<screen>
@@ -2160,7 +2155,7 @@
<para>Lastly, if you're building a release and wish to bundle up
your files from Subversion but don't want those
- pesky <filename>.svn</filename> directories in the way, then
+ pesky <filename>.svn</filename> directories in the way,
you can use <command>svn export</command> to create a local
copy of all or part of your repository
sans <filename>.svn</filename> directories. As
@@ -2197,7 +2192,7 @@
<title>Disposing of a Working Copy</title>
- <para>Subversion doesn't track either the state or existence of
+ <para>Subversion doesn't track either the state or the existence of
working copies on the server, so there's no server overhead to
keeping working copies around. Likewise, there's no need to
let the server know that you're going to delete a working
@@ -2206,14 +2201,14 @@
<para>If you're likely to use a working copy again, there's
nothing wrong with just leaving it on disk until you're ready
to use it again, at which point all it takes is an
- <command>svn update</command> to bring it up to date and ready
+ <command>svn update</command> to bring it up-to-date and ready
for use.</para>
<para>However, if you're definitely not going to use a working
copy again, you can safely delete the entire thing, but you'd
be well served to take a look through the working copy for
unversioned files. To find these files, run <userinput>svn
- status</userinput> and review any files that are prefixed by a
+ status</userinput> and review any files that are prefixed with a
<literal>?</literal> to make certain that they're not of
importance. After you're done reviewing, you can safely
delete your working copy.</para>
@@ -2227,16 +2222,16 @@
<para>When Subversion modifies your working copy (or any
information within <filename>.svn</filename>), it tries to do
so as safely as possible. Before changing the working copy,
- Subversion writes its intentions to a log file. Next, it
- executes the commands in the log file to apply the requested
+ Subversion writes its intentions to a logfile. Next, it
+ executes the commands in the logfile to apply the requested
change, holding a lock on the relevant part of the working
copy while it works—to prevent other Subversion clients
from accessing the working copy mid-change. Finally,
- Subversion removes the log file. Architecturally, this is
+ Subversion removes the logfile. Architecturally, this is
similar to a journaled filesystem. If a Subversion operation
- is interrupted (if the process is killed or if the machine
- crashes, for example), the log files remain on disk. By
- re-executing the log files, Subversion can complete the
+ is interrupted (e.g, if the process is killed or if the machine
+ crashes), the logfiles remain on disk. By
+ reexecuting the logfiles, Subversion can complete the
previously started operation, and your working copy can get
itself back into a consistent state.</para>
@@ -2244,7 +2239,7 @@
does: it searches your working copy and runs any leftover
logs, removing working copy locks in the process.
If Subversion ever tells you that some part of your working copy
- is <quote>locked,</quote> then this is the command that you
+ is <quote>locked,</quote> this is the command that you
should run. Also, <command>svn status</command> will display
an <literal>L</literal> next to locked items:</para>
@@ -2260,8 +2255,8 @@
<para>Don't confuse these working copy locks with the ordinary
locks that Subversion users create when using
- the <quote>lock-modify-unlock</quote> model of concurrent
- version control; see
+ the lock-modify-unlock model of concurrent
+ version control; see the sidebar
<xref linkend="svn.advanced.locking.meanings"/> for
clarification.</para>
@@ -2280,7 +2275,7 @@
merging (see <xref linkend="svn.branchmerge"/>) and properties (see
<xref linkend="svn.advanced.props"/>). However, you may want to
take a moment to skim through <xref linkend="svn.ref"/> to
- get an idea of all the many different commands that Subversion
+ get an idea of all the different commands that Subversion
has—and how you can use them to make your work
easier.</para>
More information about the svnbook-dev
mailing list