[svnbook commit] r3231 - trunk/src/en/book
sussman
noreply at red-bean.com
Sat Aug 2 12:13:40 CDT 2008
Author: sussman
Date: Sat Aug 2 12:13:40 2008
New Revision: 3231
Log:
Enter 2nd-round copyedits (most of them) for Appendixes A and B.
Modified:
trunk/src/en/book/appa-quickstart.xml
trunk/src/en/book/appb-svn-for-cvs-users.xml
Modified: trunk/src/en/book/appa-quickstart.xml
==============================================================================
--- trunk/src/en/book/appa-quickstart.xml (original)
+++ trunk/src/en/book/appa-quickstart.xml Sat Aug 2 12:13:40 2008
@@ -4,7 +4,7 @@
<para>If you're eager to get Subversion up and running (and you
- enjoy learning by experimentation), this chapter will show you how
+ enjoy learning by experimentation), this appendix will show you how
to create a repository, import code, and then check it back out
again as a working copy. Along the way, we give links to the
relevant chapters of this book.</para>
@@ -12,7 +12,7 @@
<warning>
<para>If you're new to the entire concept of version control or to
the <quote>copy-modify-merge</quote> model used by both CVS and
- Subversion, then you should read <xref linkend="svn.basic"/>
+ Subversion, you should read <xref linkend="svn.basic"/>
before going any further.</para>
</warning>
@@ -31,11 +31,11 @@
management, and so on. While Subversion is able to use Apache
as one of its network server programs, its dependence on APR
<emphasis>does not</emphasis> mean that Apache is a required
- component. APR is a standalone library useable by any
+ component. APR is a standalone library usable by any
application. It does mean, however, that like Apache,
Subversion clients and servers run on any operating system that
- the Apache httpd server runs on: Windows, Linux, all flavors of
- BSD, Mac OS X, Netware, and others.</para>
+ the Apache <command>httpd</command> server runs on: Windows,
+ Linux, all flavors of BSD, Mac OS X, NetWare, and others.</para>
<para>The easiest way to get Subversion is to download a binary
package built for your operating system. Subversion's web site
@@ -47,11 +47,11 @@
system (RPMs, DEBs, the ports tree, etc.) to get
Subversion.</para>
- <para>Alternately, you can build Subversion directly from source
+ <para>Alternatively, you can build Subversion directly from source
code, though it's not always an easy task. (If you're not
experienced at building open source software packages, you're
probably better off downloading a binary distribution instead!)
- From the Subversion web site, download the latest source-code
+ From the Subversion web site, download the latest source code
release. After unpacking it, follow the instructions in
the <filename>INSTALL</filename> file to build it. Note that a
released source package may not contain everything you need to
@@ -65,8 +65,8 @@
directory where you unpacked the main Subversion source.
Regardless, it's possible that you may want to fetch other
optional dependencies such as Berkeley DB and possibly Apache
- httpd. If you want to do a complete build, make sure you have
- all of the packages documented in
+ <command>httpd</command>. If you want to do a complete build,
+ make sure you have all of the packages documented in
the <filename>INSTALL</filename> file.</para>
<para>If you're one of those folks that likes to use bleeding-edge
@@ -112,7 +112,7 @@
<!-- ================================================================= -->
<sect1 id="svn.intro.quickstart">
- <title>High-speed Tutorial</title>
+ <title>High-Speed Tutorial</title>
<blockquote>
<para><quote>Please make sure your seat backs are in their full,
@@ -122,7 +122,7 @@
<para>What follows is a quick tutorial that walks you through some
basic Subversion configuration and operation. When you finish
- it, you should have a basic understanding of Subversion's
+ it, you should have a general understanding of Subversion's
typical usage.</para>
<note>
@@ -130,7 +130,7 @@
<command>svn</command>, the Subversion command-line client,
and <command>svnadmin</command>, the administrative tool,
ready to go on a Unix-like operating system. (This tutorial
- also works at the Windows commandline prompt, assuming you
+ also works at the Windows command-line prompt, assuming you
make some obvious tweaks.) We also assume you are using
Subversion 1.2 or later (run <userinput>svn --version</userinput>
to check.)</para>
@@ -158,16 +158,16 @@
that can hold anything you wish. Some administrators prefer to
store only one project in a repository, and others prefer to
store multiple projects in a repository by placing them into
- separate directories. The merits of each approach are discussed
+ separate directories. We discuss the merits of each approach
in <xref linkend="svn.reposadmin.projects.chooselayout"/>.
Either way, the repository manages only files and directories,
so it's up to humans to interpret particular directories as
- <quote>projects</quote>. So while you might see references to
+ <quote>projects.</quote> So while you might see references to
projects throughout this book, keep in mind that we're only ever
talking about some directory (or collection of directories) in
the repository.</para>
- <para>In this example, we assume that you already have some sort
+ <para>In this example, we assume you already have some sort
of project (a collection of files and directories) that you wish
to import into your newly created Subversion repository. Begin
by organizing your data into a single directory called
@@ -177,8 +177,8 @@
directories named <filename>branches</filename>,
<filename>tags</filename>, and <filename>trunk</filename>. The
<filename>trunk</filename> directory should contain all of your
- data, while the <filename>branches</filename> and
- <filename>tags</filename> directories are empty:</para>
+ data, and the <filename>branches</filename> and
+ <filename>tags</filename> directories should be empty:</para>
<screen>
/tmp/myproject/branches/
@@ -221,7 +221,7 @@
<para>Note that the original <filename>/tmp/myproject</filename>
directory is unchanged; Subversion is unaware of it. (In fact,
- you can even delete that directory if you wish.) In order to
+ you can even delete that directory if you wish.) To
start manipulating repository data, you need to create a new
<quote>working copy</quote> of the data, a sort of private
workspace. Ask Subversion to <quote>check out</quote> a working
Modified: trunk/src/en/book/appb-svn-for-cvs-users.xml
==============================================================================
--- trunk/src/en/book/appb-svn-for-cvs-users.xml (original)
+++ trunk/src/en/book/appb-svn-for-cvs-users.xml Sat Aug 2 12:13:40 2008
@@ -4,7 +4,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
- provide backreferences to relevant chapters when
+ provide references to relevant chapters when
possible.</para>
<para>Although the goal of Subversion is to take over the current
@@ -30,7 +30,7 @@
filesystem. Each commit results in an entirely new filesystem
tree; in essence, the repository is an array of trees. Each of
these trees is labeled with a single revision number. When
- someone talks about <quote>revision 54</quote>, they're talking
+ someone talks about <quote>revision 54</quote>, he's talking
about a particular tree (and indirectly, the way the filesystem
looked after the 54th commit).</para>
@@ -152,7 +152,7 @@
serves the same purpose as the <filename>CVS</filename>
directory, except that it also stores read-only,
<quote>pristine</quote> copies of your files. This allows you
- to do much things offline:</para>
+ to do many things offline:</para>
<variablelist>
@@ -187,8 +187,8 @@
<para>The last subcommand in the list—<command>svn
revert</command>—is new. It will not only remove local
- changes, but it will also unschedule operations such as adds and
- deletes. While deleting the file and then running <userinput>svn
+ changes, but also unschedule operations such as adds and
+ deletes. Although deleting the file and then running <userinput>svn
update</userinput> will still work, doing so distorts the true
purpose of updating. And, while we're on this subject…
@@ -313,7 +313,7 @@
X Resource is eXternal to this working copy (may come from another
repository). See <xref linkend="svn.advanced.externals" />
? Resource is not under version control
-! Resource is missing or incomplete (removed by another tool than
+! Resource is missing or incomplete (removed by a tool other than
Subversion)
</screen>
@@ -402,7 +402,7 @@
<title>Conflict Resolution</title>
<para>CVS marks conflicts with inline <quote>conflict
- markers</quote>, and then prints a <literal>C</literal> during
+ markers,</quote> and then prints a <literal>C</literal> during
an update or merge operation. Historically, this has caused
problems, because CVS isn't doing enough. Many users forget
about (or don't see) the <literal>C</literal> after it whizzes
@@ -414,7 +414,7 @@
when a conflict occurs in a file, Subversion records the fact
that the file is in a state of conflict, and won't allow you to
commit changes to that file until you explicitly resolve the
- conflict. Secondly, Subversion 1.5 provides interactive
+ conflict. Second, Subversion 1.5 provides interactive
conflict resolution, which allows you to resolve conflicts as
they happen instead of having to go back and do so after the
update or merge operation completes. See <xref
@@ -434,17 +434,17 @@
only store successive full copies of a changing binary file.
Subversion, however, expresses differences between files using a
binary differencing algorithm, regardless of whether they
- contain textual or binary data. That means that all files are
+ contain textual or binary data. That means all files are
stored differentially (compressed) in the repository.</para>
<para>CVS users have to mark binary files with
- <option>-kb</option> flags in order to prevent data from being
+ <option>-kb</option> flags to prevent data from being
garbled (due to keyword expansion and line-ending translations).
They sometimes forget to do this.</para>
- <para>Subversion takes the more paranoid route—first, it never
+ <para>Subversion takes the more paranoid route. First, it never
performs any kind of keyword or line-ending translation unless
- you explicitly ask it do so (see <xref
+ you explicitly ask it to do so (see <xref
linkend="svn.advanced.props.special.keywords"/> and <xref
linkend="svn.advanced.props.special.eol-style"/> for more details). By default,
Subversion treats all file data as literal byte strings, and
@@ -461,7 +461,7 @@
<para>To determine whether a contextual merge is possible,
Subversion examines the <literal>svn:mime-type</literal>
property. If the file has no <literal>svn:mime-type</literal>
- property, or has a mime-type that is textual (e.g.,
+ property, or has a mime type that is textual (e.g.,
<literal>text/*</literal>),
Subversion assumes it is text. Otherwise, Subversion assumes
the file is binary. Subversion also helps users by running a
@@ -482,8 +482,8 @@
<title>Versioned Modules</title>
<para>Unlike CVS, a Subversion working copy is aware that it has
- checked out a module. That means that if somebody changes the
- definition of a module (e.g., adds or removes components), then a
+ checked out a module. That means if somebody changes the
+ definition of a module (e.g., adds or removes components), a
call to <command>svn update</command> will update the working
copy appropriately, adding and removing components.</para>
@@ -542,17 +542,17 @@
is an extremely difficult problem to solve; it involves
deducing changesets in the absence of atomicity and translating
between the systems' completely orthogonal branching policies,
- among other complications. Still, there are a handful of tools
- claiming to at least partially support the ability to convert
+ among other complications. Still, a handful of tools claim
+ to at least partially support the ability to convert
existing CVS repositories into Subversion ones.</para>
- <para>The most popular (and most mature) conversion tool is
+ <para>The most popular (and mature) conversion tool is
cvs2svn (<ulink url="http://cvs2svn.tigris.org/"/>), a Python
script originally created by members of Subversion's own
development community. This tool is meant to run exactly once:
it scans your CVS repository multiple times and attempts to
deduce commits, branches, and tags as best it can. When it
- finishes, the result is a either a Subversion repository or a
+ finishes, the result is either a Subversion repository or a
portable Subversion dumpfile representing your code's history.
See the web site for detailed instructions and caveats.</para>
More information about the svnbook-dev
mailing list