[svnbook commit] r2109 - trunk/src/en/book
cmpilato
svnbook-dev at red-bean.com
Tue Mar 28 20:36:44 CST 2006
Author: cmpilato
Date: Tue Mar 28 20:36:41 2006
New Revision: 2109
Modified:
trunk/src/en/book/appa.xml
trunk/src/en/book/appb.xml
trunk/src/en/book/book.xml
trunk/src/en/book/ch00.xml
trunk/src/en/book/ch02.xml
trunk/src/en/book/ch03.xml
trunk/src/en/book/ch04.xml
trunk/src/en/book/ch05.xml
trunk/src/en/book/ch06.xml
trunk/src/en/book/ch09.xml
Log:
Ensure two spaces between sentence-ending periods (.) and the next sentence.
Modified: trunk/src/en/book/appa.xml
==============================================================================
--- trunk/src/en/book/appa.xml (original)
+++ trunk/src/en/book/appa.xml Tue Mar 28 20:36:41 2006
@@ -5,7 +5,7 @@
<para>This appendix is a guide for CVS users new to Subversion.
It's essentially a list of differences between the two systems
- as <quote>viewed from 10,000 feet</quote>. For each section, we
+ as <quote>viewed from 10,000 feet</quote>. For each section, we
provide backreferences to relevant chapters when
possible.</para>
@@ -40,7 +40,7 @@
<para>Technically, it's not valid to talk about <quote>revision 5
of <filename>foo.c</filename></quote>. Instead, one would say
<quote><filename>foo.c</filename> as it appears in revision
- 5</quote>. Also, be careful when making assumptions about the
+ 5</quote>. Also, be careful when making assumptions about the
evolution of a file. In CVS, revisions 5 and 6 of
<filename>foo.c</filename> are always different. In Subversion,
it's most likely that <filename>foo.c</filename> did
@@ -279,8 +279,8 @@
<!-- ###TODO describe -v here as well as -uv. -u and -v use
different <quote>long</quote> formats and need to be
- documented separately. Moreover, as you can combine -u and
- -v, it needs to be explained what each of them does. As -u is
+ documented separately. Moreover, as you can combine -u and
+ -v, it needs to be explained what each of them does. As -u is
much more important than -v, and the example following that
paragraph *is* about -u, not -v, my patch concentrated on
that. -->
Modified: trunk/src/en/book/appb.xml
==============================================================================
--- trunk/src/en/book/appb.xml (original)
+++ trunk/src/en/book/appb.xml Tue Mar 28 20:36:41 2006
@@ -155,7 +155,7 @@
<listitem>
<para>Like CVS and other version-control systems,
DeltaV assumes that each resource has a potentially
- infinite number of states. A client begins by placing
+ infinite number of states. A client begins by placing
a resource under version control using the new
<literal>VERSION-CONTROL</literal> method.</para>
</listitem>
@@ -171,7 +171,7 @@
private area, then indicate they want to change
specific resources by <quote>checking them out</quote>
into the workspace, editing them, and <quote>checking
- them in</quote> again. In HTTP terms, the sequence of
+ them in</quote> again. In HTTP terms, the sequence of
methods would be <literal>CHECKOUT</literal>,
<literal>PUT</literal>,
<literal>CHECKIN</literal>.</para>
@@ -189,7 +189,7 @@
<literal>MKACTIVITY</literal> method. The client then
performs a <literal>CHECKOUT</literal> on each
resource it wishes to change and sends
- <literal>PUT</literal> requests. Finally, the client
+ <literal>PUT</literal> requests. Finally, the client
performs a <literal>CHECKIN</literal> resource, or
sends a <literal>MERGE</literal> request to check in
all resources at once.</para>
@@ -202,7 +202,7 @@
<para>DeltaV allows you define flexible collections of
resources called <quote>configurations</quote>, which
don't necessarily correspond to particular
- directories. A configuration can be made to point to
+ directories. A configuration can be made to point to
specific versions of files, and then a
<quote>baseline</quote> snapshot can be made, much
like a tag.</para>
@@ -749,7 +749,7 @@
files first appeared in Subversion 1.2.</para>
<para>One more word of warning: OS X's WebDAV client can
- sometimes be overly sensitive to HTTP redirects. If OS X is
+ sometimes be overly sensitive to HTTP redirects. If OS X is
unable to mount the repository at all, you may need to enable
the BrowserMatch directive in the Apache server's
<filename>httpd.conf</filename>:</para>
@@ -765,7 +765,7 @@
<para>Linux davfs2 is a filesystem module for the Linux kernel,
whose development is located at <ulink
- url="http://dav.sourceforge.net/"/>. Once installed, a WebDAV
+ url="http://dav.sourceforge.net/"/>. Once installed, a WebDAV
network share can be mounted with the usual Linux mount
command:</para>
Modified: trunk/src/en/book/book.xml
==============================================================================
--- trunk/src/en/book/book.xml (original)
+++ trunk/src/en/book/book.xml Tue Mar 28 20:36:41 2006
@@ -71,7 +71,7 @@
</copyright>
<legalnotice><para>This work is licensed under the Creative
- Commons Attribution License. To view a copy of this license,
+ Commons Attribution License. To view a copy of this license,
visit <ulink url="http://creativecommons.org/licenses/by/2.0/"/>
or send a letter to Creative Commons, 559 Nathan Abbott Way,
Stanford, California 94305, USA.</para></legalnotice>
Modified: trunk/src/en/book/ch00.xml
==============================================================================
--- trunk/src/en/book/ch00.xml (original)
+++ trunk/src/en/book/ch00.xml Tue Mar 28 20:36:41 2006
@@ -225,7 +225,7 @@
</sect2>
<para>Note that the source code examples are just
- that—examples. While they will compile with the proper
+ that—examples. While they will compile with the proper
compiler incantations, they are intended to illustrate the
problem at hand, not necessarily serve as examples of good
programming style.</para>
@@ -481,7 +481,7 @@
<para>Huge thanks to my wife Marie for being incredibly
understanding, supportive, and most of all, patient. Thank
you to my brother Eric who first introduced me to UNIX
- programming way back when. Thanks to my Mom and Grandmother
+ programming way back when. Thanks to my Mom and Grandmother
for all their support, not to mention enduring a Christmas
holiday where I came home and promptly buried my head in my
laptop to work on the book.</para>
Modified: trunk/src/en/book/ch02.xml
==============================================================================
--- trunk/src/en/book/ch02.xml (original)
+++ trunk/src/en/book/ch02.xml Tue Mar 28 20:36:41 2006
@@ -167,7 +167,7 @@
Sally simultaneously locks and edits file B. But suppose
that A and B depend on one another, and the changes made
to each are semantically incompatible. Suddenly A and B
- don't work together anymore. The locking system was
+ don't work together anymore. The locking system was
powerless to prevent the problem—yet it somehow
provided a false sense of security. It's easy for Harry and
Sally to imagine that by locking files, each is beginning a
Modified: trunk/src/en/book/ch03.xml
==============================================================================
--- trunk/src/en/book/ch03.xml (original)
+++ trunk/src/en/book/ch03.xml Tue Mar 28 20:36:41 2006
@@ -8,7 +8,7 @@
perform almost all the tasks you need to use Subversion in a
normal day's work. You'll start with an initial checkout of
your code, and walk through making changes and examining those
- changes. You'll also see how to bring changes made by others
+ changes. You'll also see how to bring changes made by others
into your working copy, examine them, and work through any
conflicts that might arise.</para>
@@ -453,10 +453,11 @@
<sect1 id="svn.tour.cycle">
<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 common things that you might
- find yourself doing with Subversion in the course of a day's work.</para>
+ <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
+ common things that you might find yourself doing with Subversion
+ in the course of a day's work.</para>
<para>The typical work cycle looks like this:</para>
@@ -629,7 +630,7 @@
<title>Make Changes to Your Working Copy</title>
<para>Now you can get to work and make changes in your
- working copy. It's usually most convenient to decide on a
+ working copy. It's usually most convenient to decide on a
particular change (or set of changes) to make, such as writing
a new feature, fixing a bug, etc. The Subversion commands
that you will use here are <command>svn add</command>,
@@ -769,11 +770,11 @@
<para>Earlier in this chapter, we said that you have to commit
any changes that you make in order for the repository to
- reflect these changes. That's not entirely true—there
+ reflect these changes. That's not entirely true—there
<emphasis>are</emphasis> some use cases that immediately
commit tree changes to the repository. This only happens
when a subcommand is operating directly on a URL, rather
- than on a working-copy path. In particular, specific uses
+ than on a working-copy path. In particular, specific uses
of <command>svn mkdir</command>, <command>svn
copy</command>, <command>svn move</command>, and
<command>svn delete</command> can work with URLs.</para>
@@ -798,7 +799,7 @@
them to the repository, but before you do so, it's usually a
good idea to take a look at exactly what you've changed. By
examining your changes before you commit, you can make a
- more accurate log message. You may also discover that
+ more accurate log message. You may also discover that
you've inadvertently changed a file, and this gives you a
chance to revert those changes before committing.
Additionally, this is a good opportunity to review and
@@ -1878,7 +1879,7 @@
<para>
<command>svn log</command> also takes a <option>--quiet</option>
(<option>-q</option>) switch, which suppresses the body of the
- log message. When combined with <option>--verbose</option>, it
+ log message. When combined with <option>--verbose</option>, it
gives just the names of the changed files.</para>
<sidebar>
@@ -2154,9 +2155,9 @@
<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
+ Subversion writes its intentions to a log file. Next it executes
the commands in the log file to apply the requested change.
- Finally, Subversion removes the log file. Architecturally, this
+ Finally, Subversion removes the log file. 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
@@ -2234,7 +2235,7 @@
<para>Now we've covered most of the Subversion client commands.
Notable exceptions are those dealing with branching and
merging (see <xref linkend="svn.branchmerge"/>) and properties (see
- <xref linkend="svn.advanced.props"/>). However, you may want to
+ <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
has—and how you can use them to make your work
Modified: trunk/src/en/book/ch04.xml
==============================================================================
--- trunk/src/en/book/ch04.xml (original)
+++ trunk/src/en/book/ch04.xml Tue Mar 28 20:36:41 2006
@@ -1421,7 +1421,7 @@
<para>The plus sign in the status output indicates that the item
isn't merely scheduled for addition, but scheduled for
- addition <quote>with history</quote>. Subversion remembers
+ addition <quote>with history</quote>. Subversion remembers
where it was copied from. In the future, running <command>svn
log</command> on this file will traverse back through the
file's resurrection and through all the history it had prior
@@ -1748,7 +1748,7 @@
<para>When you run <command>svn update</command>, you're asking
the repository to compare two trees. The repository does so,
and then sends a description of the differences back to the
- client. The only difference between <command>svn
+ client. The only difference between <command>svn
switch</command> and <command>svn update</command> is that the
<literal>update</literal> command always compares two identical
paths.</para>
@@ -1890,7 +1890,7 @@
data you need.</para>
<para>Time to make a snapshot. Copying one URL to another won't
- work here. In this case, you want to make a snapshot of your
+ work here. In this case, you want to make a snapshot of your
exact working copy arrangement and store it in the repository.
Luckily, <command>svn copy</command> actually has four
different uses (which you can read about in Chapter 9),
Modified: trunk/src/en/book/ch05.xml
==============================================================================
--- trunk/src/en/book/ch05.xml (original)
+++ trunk/src/en/book/ch05.xml Tue Mar 28 20:36:41 2006
@@ -466,8 +466,8 @@
<para>In Subversion 1.2, a repository is created with a FSFS
back-end by default (see <xref
- linkend="svn.reposadmin.basics.backends"/>). The back-end can be
- explicitly chosen with the <option>--fs-type</option>
+ linkend="svn.reposadmin.basics.backends"/>). The back-end can
+ be explicitly chosen with the <option>--fs-type</option>
argument:</para>
<screen>
@@ -864,7 +864,7 @@
<warning>
<para>Do not attempt to modify the transaction using hook
- scripts. A common example of this would be to automatically
+ scripts. A common example of this would be to automatically
set properties such as <literal>svn:eol-style</literal> or
<literal>svn:mime-type</literal> during the commit. While
this might seem like a good idea, it causes problems. The
@@ -2025,7 +2025,7 @@
equal to the size of the original data, it only takes up
enough space to say, <quote>I look just like this other
piece of data over here, except for the following couple of
- changes</quote>. Specifically, each time a new version of a
+ changes</quote>. Specifically, each time a new version of a
file is committed to the repository, Subversion encodes the
previous version (actually, several previous versions) as a
delta against the new version. The result is that most of
Modified: trunk/src/en/book/ch06.xml
==============================================================================
--- trunk/src/en/book/ch06.xml (original)
+++ trunk/src/en/book/ch06.xml Tue Mar 28 20:36:41 2006
@@ -1015,7 +1015,7 @@
module, <command>httpd</command> makes Subversion repositories
available to clients via the WebDAV/DeltaV protocol, which is an
extension to HTTP 1.1 (see <ulink url="http://www.webdav.org/"/>
- for more information). This protocol takes the ubiquitous HTTP
+ for more information). This protocol takes the ubiquitous HTTP
protocol that is the core of the World Wide Web, and adds
writing—specifically, versioned
writing—capabilities. The result is a standardized,
@@ -1380,7 +1380,7 @@
yet complete, and will not do anything useful. It's merely
telling Apache that whenever authorization is required,
Apache should harvest a username and password from the
- Subversion client. What's missing here, however, are
+ Subversion client. What's missing here, however, are
directives that tell Apache <emphasis>which</emphasis> sorts
of client requests require authorization. Wherever
authorization is required, Apache will demand
Modified: trunk/src/en/book/ch09.xml
==============================================================================
--- trunk/src/en/book/ch09.xml (original)
+++ trunk/src/en/book/ch09.xml Tue Mar 28 20:36:41 2006
@@ -3,7 +3,7 @@
<simplesect>
<para>This chapter is intended to be a complete reference to using
- Subversion. This includes the command line client
+ Subversion. This includes the command line client
(<command>svn</command>) and all its subcommands, as well as the
repository administration programs (<command>svnadmin</command>
and <command>svnlook</command>) and their respective
@@ -108,7 +108,7 @@
<replaceable>CMD</replaceable></term>
<listitem>
<para>Specifies an external program to use to edit a log message
- or a property value. See the <literal>editor-cmd</literal>
+ or a property value. See the <literal>editor-cmd</literal>
section in <xref linkend="svn.advanced.confarea.opts.config"/>
for ways to specify a default editor.</para>
</listitem>
@@ -158,7 +158,7 @@
you from doing in normal usage, but you can pass the
force switch to tell Subversion <quote>I know what I'm
doing as well as the possible repercussions of doing it,
- so let me at 'em</quote>. This switch is the
+ so let me at 'em</quote>. This switch is the
programmatic equivalent of doing your own electrical
work with the power on—if you don't know what
you're doing, you're likely to get a nasty shock.</para>
@@ -236,7 +236,7 @@
</term>
<listitem>
<para>Indicates that you will specify a commit message
- on the command line, following this switch. For
+ on the command line, following this switch. For
example:</para>
<screen>
@@ -299,7 +299,7 @@
<para>Shows files in the status listing that would
normally be omitted since they match a pattern in the
<literal>global-ignores</literal> configuration option
- or the <literal>svn:ignore</literal> property. See <xref
+ or the <literal>svn:ignore</literal> property. See <xref
linkend="svn.advanced.confarea.opts.config"/> and <xref
linkend="svn.advanced.props.special.ignore"/> for more
information.</para>
@@ -406,7 +406,7 @@
provide revision numbers, revision keywords or dates (in
curly braces), as arguments to the revision switch. If
you wish to provide a range of revisions, you can
- provide two revisions separated by a colon. For
+ provide two revisions separated by a colon. For
example:</para>
<screen>
@@ -429,7 +429,7 @@
Subversion property specific to a file or directory.
This switch requires that you also pass a revision
with the <option>--revision</option>
- (<option>-r</option>) switch. See <xref
+ (<option>-r</option>) switch. See <xref
linkend="svn.reposadmin.basics.revprops"/> for more details on
unversioned properties.</para>
</listitem>
@@ -779,7 +779,7 @@
<refsect1>
<title>Description</title>
- <para>Check out a working copy from a repository. If
+ <para>Check out a working copy from a repository. If
<replaceable>PATH</replaceable> is omitted, the
basename of the URL will be used as the destination.
If multiple URLs are given each will be checked out into a
@@ -981,7 +981,7 @@
<title>Description</title>
<para>Send changes from your working copy to the
- repository. If you do not supply a log message with your
+ repository. If you do not supply a log message with your
commit by using either the <option>--file</option> or
<option>--message</option> switch,
<command>svn</command> will launch your editor for you
@@ -1336,7 +1336,7 @@
<para>Using <command>svn</command> to delete a file from
your working copy merely schedules it to be
- deleted. When you commit, the file is deleted in the
+ deleted. When you commit, the file is deleted in the
repository.</para>
<screen>
@@ -1636,7 +1636,7 @@
repository specified by URL, at revision
<replaceable>REV</replaceable> if it is given, otherwise
at <literal>HEAD</literal>, into
- <replaceable>PATH</replaceable>. If
+ <replaceable>PATH</replaceable>. If
<replaceable>PATH</replaceable> is omitted, the last
component of the <replaceable>URL</replaceable> is used
for the local directory name.</para>
@@ -2461,7 +2461,7 @@
be compared.</para>
<para><replaceable>WCPATH</replaceable> is the working copy
- path that will receive the changes. If
+ path that will receive the changes. If
<replaceable>WCPATH</replaceable> is omitted, a default
value of <quote><filename>.</filename></quote> is assumed,
unless the sources have identical basenames that match a
@@ -2817,7 +2817,7 @@
<title>Description</title>
<para>Edit one or more properties using your favorite
- editor. The first form edits versioned properties in
+ editor. The first form edits versioned properties in
your working copy, while the second edits unversioned
remote properties on a repository revision.</para>
</refsect1>
@@ -3043,7 +3043,7 @@
<para>Set <replaceable>PROPNAME</replaceable> to
<replaceable>PROPVAL</replaceable> on files, directories,
- or revisions. The first example creates a versioned, local
+ or revisions. The first example creates a versioned, local
property change in the working copy, and the second
creates an unversioned, remote property change on a
repository revision.</para>
@@ -3149,7 +3149,7 @@
in a Subversion repository. Your repository
administrator must explicitly enable revision property
modifications by creating a hook named
- <literal>pre-revprop-change</literal>. See <xref
+ <literal>pre-revprop-change</literal>. See <xref
linkend="svn.reposadmin.create.hooks"/> for more information on
hook scripts.</para>
</note>
@@ -3171,7 +3171,7 @@
<title>Description</title>
<para>Remove <quote>conflicted</quote> state on working copy
- files or directories. This routine does not semantically
+ files or directories. This routine does not semantically
resolve conflict markers; it merely removes
conflict-related artifact files and allows
<replaceable>PATH</replaceable> to be committed again;
@@ -4524,7 +4524,7 @@
catastrophe. Unless you enable
<literal>DB_LOG_AUTOREMOVE</literal>, the log files
accumulate, although most are no longer used and can be
- deleted to reclaim disk space. See <xref
+ deleted to reclaim disk space. See <xref
linkend="svn.reposadmin.maint.diskspace"/> for more
information.</para>
</refsect1>
@@ -4550,7 +4550,7 @@
catastrophe. Unless you enable
<literal>DB_LOG_AUTOREMOVE</literal>, the log files
accumulate, although most are no longer used and can be
- deleted to reclaim disk space. See <xref
+ deleted to reclaim disk space. See <xref
linkend="svn.reposadmin.maint.diskspace"/> for more
information.</para>
</refsect1>
@@ -5017,7 +5017,7 @@
Subversion property specific to a file or directory.
This switch requires that you also pass a revision
with the <option>--revision</option>
- (<option>-r</option>) switch. See <xref
+ (<option>-r</option>) switch. See <xref
linkend="svn.reposadmin.basics.revprops"/> for more details on
unversioned properties.</para>
</listitem>
@@ -5928,7 +5928,7 @@
switch; tells svnserve to assume that
<replaceable>NAME</replaceable> is the authenticated
user, rather than the UID of the svnserve
- process. Useful for users wishing to share a single
+ process. Useful for users wishing to share a single
system account over SSH, but maintaining separate commit
identities.</para>
</listitem>
More information about the svnbook-dev
mailing list