[svnbook commit] r3229 - trunk/src/en/book
sussman
noreply at red-bean.com
Sat Aug 2 10:38:02 CDT 2008
Author: sussman
Date: Sat Aug 2 10:38:01 2008
New Revision: 3229
Log:
Enter 2nd-round copyedits (most of them) for Foreword and Preface.
Modified:
trunk/src/en/book/ch00-preface.xml
trunk/src/en/book/foreword.xml
Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml (original)
+++ trunk/src/en/book/ch00-preface.xml Sat Aug 2 10:38:01 2008
@@ -21,13 +21,13 @@
its nonrestrictive modus operandi and support for networked
operation allowed dozens of geographically dispersed programmers
to share their work. It fit the collaborative nature of the
- opensource world very well. CVS and its semi-chaotic development
+ open source world very well. CVS and its semi-chaotic development
model have since become cornerstones of open source
culture.</para>
<para>But CVS was not without its flaws, and simply fixing those
flaws promised to be an enormous effort. Enter Subversion.
- Designed to be a successor to CVS, Subversion's originators set
+ Subversion was designed to be a successor to CVS, and its originators set
out to win the hearts of CVS users in two ways—by creating
an open source system with a design (and <quote>look and
feel</quote>) similar to CVS, and by attempting to avoid most of
@@ -40,8 +40,8 @@
<para>This book is written to document the 1.5 series of the
Subversion version control system. We have made every attempt to
be thorough in our coverage. However, Subversion has a thriving
- and energetic development community, so there are already a number
- of features and improvements planned for future versions that may
+ and energetic development community, so already a number
+ of features and improvements are planned for future versions that may
change some of the commands and specific notes in this
book.</para>
@@ -89,7 +89,7 @@
<para>Note also that the source code examples used throughout the
book are only examples. While they will compile with the proper
compiler incantations, they are intended to illustrate a
- particular scenario and not necessarily serve as examples of good
+ particular scenario and not necessarily to serve as examples of good
programming style or practices.</para>
</sect1>
@@ -105,12 +105,12 @@
or to <firstterm>bottom-up</firstterm> learners. A top-down
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
+ start using the software. A bottom-up learner is a <quote>learn by
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
- towards top-down learners. (And if you're actually reading this
+ toward top-down learners. (And if you're actually reading this
section, you're probably already a top-down learner yourself!)
However, if you're a bottom-up person, don't despair. While the
book may be laid out as a broad survey of Subversion topics, the
@@ -130,7 +130,7 @@
<variablelist>
<varlistentry>
- <term>Experienced System Administrators</term>
+ <term>Experienced system administrators</term>
<listitem>
<para>The assumption here is that you've probably used
version control before and are dying to get a
@@ -186,7 +186,7 @@
<para>The book ends with reference material—<xref
linkend="svn.ref"/> is a reference guide for all Subversion
- commands, and the appendices cover a number of useful topics.
+ commands, and the appendixes cover a number of useful topics.
These are the chapters you're mostly likely to come back to
after you've finished the book.</para>
@@ -197,13 +197,10 @@
<!-- ================================================================= -->
<sect1 id="svn.preface.conventions">
<title>Conventions Used in This Book</title>
-
- <para>This section covers the various conventions used in this
- book.</para>
-
+
<!-- =============================================================== -->
<sect2 id="svn.preface.conventions.typo">
- <title>Typographic Conventions</title>
+ <title></title>
<para>The following typographic conventions are used in this
book:</para>
@@ -245,7 +242,7 @@
<!-- =============================================================== -->
<sect2 id="svn.preface.conventions.icons">
- <title>Tips and Warnings</title>
+ <title></title>
<note>
<para>This icon designates a note relating to the surrounding
@@ -275,14 +272,6 @@
here:</para>
<variablelist>
-
- <varlistentry>
- <term><xref linkend="svn.preface"/></term>
- <listitem>
- <para>Covers the history of Subversion as well as its
- features, architecture, and components.</para>
- </listitem>
- </varlistentry>
<varlistentry>
<term><xref linkend="svn.basic"/></term>
@@ -357,7 +346,7 @@
<para>Describes the internals of Subversion, the
Subversion filesystem, and the working copy
administrative areas from a programmer's point of view.
- Demonstrates how to use the public APIs to write a
+ It also demonstrates how to use the public APIs to write a
program that uses Subversion, and most importantly, how
to contribute to the development of Subversion.</para>
</listitem>
@@ -408,7 +397,7 @@
<varlistentry>
<term><xref linkend="svn.copyright"/></term>
<listitem>
- <para>A copy of the Creative Commons Attribution License.,
+ <para>A copy of the Creative Commons Attribution License,
under which this book is licensed.</para>
</listitem>
</varlistentry>
@@ -428,8 +417,8 @@
Subversion project developers, which were then coalesced into a
single work and rewritten. As such, it has always been under a
free license (see <xref linkend="svn.copyright"/>). In fact,
- the book was written in the public eye, originally as a part of
- Subversion project itself. This means two things:</para>
+ the book was written in the public eye, originally as part of
+ the Subversion project itself. This means two things:</para>
<itemizedlist>
<listitem>
@@ -441,20 +430,20 @@
<para>You can make changes to this book and redistribute it
however you wish—it's under a free license. Your only
obligation is to maintain proper attribution to the original
- authors. Of course, rather than distribute your own private
- version of this book, we'd much rather you send feedback and
- patches to the Subversion developer community.</para>
+ authors. Of course, we'd much rather you send feedback and
+ patches to the Subversion developer community, instead of
+ distributing your private version of this book.</para>
</listitem>
</itemizedlist>
<!-- O'REILLY SHOULD TWEAK THIS PARAGRAPH -->
<para>The online home of this book's development and most of the
- volunteer-driven translation efforts around it is
- <ulink url="http://svnbook.red-bean.com"/>. There, you can find
+ volunteer-driven translation efforts regarding it is
+ <ulink url="http://svnbook.red-bean.com"/>. There you can find
links to the latest releases and tagged versions of the book in
various formats, as well as instructions for accessing the
- book's Subversion repository (where lives its DocBook XML source
- code). Feedback is welcome—encouraged, even. Please
+ book's Subversion repository (where its DocBook XML source
+ code lives). Feedback is welcomed—encouraged, even. Please
submit all comments, complaints, and patches against the book
sources to <email>svnbook-dev at red-bean.com</email>.</para>
@@ -479,8 +468,8 @@
</footnote>
</para>
- <para>Thanks to O'Reilly and our editors: Chuck Toporek, Linda
- Mui, Tatiana Apandi, and Mary Brady. Their patience and support
+ <para>Thanks to O'Reilly and our various editors: Chuck Toporek, Linda
+ Mui, Tatiana Apandi, Mary Brady, and Mary Treseler. Their patience and support
has been tremendous.</para>
<para>Finally, we thank the countless people who contributed to
@@ -640,7 +629,7 @@
John Szakmeister,
Arfrever Frehtes Taifersar Arahesis,
Robert Tasarz,
- Michael W Thelen,
+ Michael W. Thelen,
Mason Thomas,
Erik van der Kolk,
Joshua Varner,
@@ -663,15 +652,15 @@
<title>From Ben Collins-Sussman</title>
<para>Thanks to my wife Frances, who, for many months, got to
- hear, <quote>But honey, I'm still working on the book,</quote>
- rather than the usual, <quote>But honey, I'm still doing
+ hear <quote>But honey, I'm still working on the book,</quote>
+ rather than the usual <quote>But honey, I'm still doing
email.</quote> I don't know where she gets all that patience!
She's my perfect counterbalance.</para>
<para>Thanks to my extended family and friends for their sincere
encouragement, despite having no actual interest in the
subject. (You know, the ones who say, <quote>Ooh, you wrote a
- book?</quote>, and then when you tell them it's a computer
+ book?</quote> and then when you tell them it's a computer
book, sort of glaze over.)</para>
<para>Thanks to all my close friends, who make me a rich, rich man.
@@ -695,7 +684,7 @@
holiday where I came home and promptly buried my head in my
laptop to work on the book.</para>
- <para>To Mike and Ben: It was a pleasure working with you on the
+ <para>To Mike and Ben: it was a pleasure working with you on the
book. Heck, it's a pleasure working with you at work!</para>
<para>To everyone in the Subversion community and the Apache
@@ -703,7 +692,7 @@
where I don't learn something from at least one of you.
</para>
- <para>Lastly, thanks to my Grandfather who always told me that
+ <para>Lastly, thanks to my grandfather, who always told me that
<quote>freedom equals responsibility.</quote> I couldn't agree
more.</para>
@@ -713,11 +702,11 @@
<sect2 id="svn.preface.acks.cmpilato">
<title>From C. Michael Pilato</title>
- <para>Special thanks to Amy, my best friend and wife of over
+ <para>Special thanks to Amy, my best friend and wife of more than
ten incredible years, for her love and patient support, for
putting up with the late nights, and for graciously enduring
the version control processes I've imposed on her. Don't
- worry, Sweetheart—you'll be a TortoiseSVN wizard in no
+ worry, sweetheart—you'll be a TortoiseSVN wizard in no
time!</para>
<para>Gavin, you're able to read half of the words in this book
@@ -732,9 +721,9 @@
<para>Hats off to Shep Kendall, through whom the world of
computers was first opened to me; Ben Collins-Sussman, my
- tour-guide through the open source world; Karl Fogel, you
+ tour guide through the open source world; Karl Fogel, you
<emphasis>are</emphasis> my <filename>.emacs</filename>; Greg
- Stein, for oozing practical programming know-how; Brian
+ Stein, for oozing practical programming know-how; and Brian
Fitzpatrick, for sharing this writing experience with me.
To the many folks from whom I am constantly picking up new
knowledge—keep dropping it!</para>
@@ -872,7 +861,7 @@
day at their jobs. Their frustration with CVS had led Jim to
think carefully about better ways to manage versioned data, and
he'd already come up with not only the name
- <quote>Subversion,</quote> but also with the basic design of
+ <quote>Subversion,</quote> but also the basic design of
the Subversion data store. When CollabNet called, Karl
immediately agreed to work on the project, and Jim got his
employer, Red Hat Software, to essentially donate him to the
@@ -947,8 +936,8 @@
<para>Subversion, once installed, has a number of different
pieces. The following is a quick overview of what you get.
Don't be alarmed if the brief descriptions leave you scratching
- your head—there are <emphasis>plenty</emphasis> more pages
- in this book devoted to alleviating that confusion.</para>
+ your head—<emphasis>plenty</emphasis> more pages
+ in this book are devoted to alleviating that confusion.</para>
<variablelist>
<varlistentry>
@@ -1043,9 +1032,9 @@
<listitem>
<para>Release 1.1 introduced FSFS, a flat-file repository
storage option for the repository. While the Berkeley DB
- back-end is still widely used and supported, FSFS has
+ backend is still widely used and supported, FSFS has
since become the default choice for
- newly-created repositories due to its low barrier to
+ newly created repositories due to its low barrier to
entry and minimal maintenance requirements. Also in
this release came the ability to put symbolic links
under version control, auto-escaping of URLs, and a
@@ -1060,7 +1049,7 @@
server-side locks on files, thus serializing commit
access to certain resources. While Subversion is still
a fundamentally concurrent version control system,
- certain types of binary files (art assets, for example)
+ certain types of binary files (e.g. art assets)
cannot be merged together. The locking feature fulfills
the need to version and protect such resources. With
locking also came a complete WebDAV auto-versioning
@@ -1091,8 +1080,8 @@
tool—<command>svnsync</command>—for doing
one-way repository replication over a network. Major
parts of the working copy metadata were revamped to no
- longer use XML (resulting in client side speed gains),
- while the Berkeley DB repository back-end gained the
+ longer use XML (resulting in client-side speed gains),
+ while the Berkeley DB repository backend gained the
ability to automatically recover itself after a server
crash.</para>
</listitem>
@@ -1109,7 +1098,7 @@
commercial competitors such as Perforce and Clearcase.
Subversion 1.5 also introduced a bevy of other
user-focused features, such as interactive resolution of
- file conflicts, partial checkouts, client side
+ file conflicts, partial checkouts, client-side
management of changelists, powerful new syntax for
externals definitions, and SASL authentication support for
the <command>svnserve</command> server.</para>
Modified: trunk/src/en/book/foreword.xml
==============================================================================
--- trunk/src/en/book/foreword.xml (original)
+++ trunk/src/en/book/foreword.xml Sat Aug 2 10:38:01 2008
@@ -10,7 +10,7 @@
<firstname>Karl</firstname>
<surname>Fogel</surname>
</author>
- <pubdate>Chicago, March 14, 2004</pubdate>
+ <pubdate>Chicago, March 14, 2004.</pubdate>
</prefaceinfo>
<title>Foreword</title>
@@ -37,7 +37,7 @@
<para>The problem with such FAQs is that they are not, in a
literal sense, FAQs at all. No one ever called the tech support
line and asked, <quote>How can we maximize
- productivity?</quote>. Rather, people asked highly specific
+ productivity?</quote> Rather, people asked highly specific
questions, such as <quote>How can we change the calendaring system
to send reminders two days in advance instead of one?</quote>
and so on. But it's a lot easier to make up imaginary
@@ -56,13 +56,13 @@
of the authors' encounters with users. It began with Ben
Collins-Sussman's observation that people were asking the same
basic questions over and over on the Subversion mailing lists:
- What are the standard workflows to use with Subversion? Do
+ what are the standard workflows to use with Subversion? Do
branches and tags work the same way as in other version control
systems? How can I find out who made a particular change?</para>
<para>Frustrated at seeing the same questions day after day, Ben
worked intensely over a month in the summer of 2002 to write
- <citetitle>The Subversion Handbook</citetitle>, a 60 page
+ <citetitle>The Subversion Handbook</citetitle>, a 60-page
manual that covered all the basics of using Subversion. The
manual made no pretense of being complete, but it was
distributed with Subversion and got users over that initial hump
@@ -78,7 +78,7 @@
stream—indeed, an uncontrollable geyser—of bottom-up
source material. Subversion was already in the hands of
thousands of early adopters, and those users were giving tons of
- feedback, not only about Subversion, but about its existing
+ feedback, not only about Subversion, but also about its existing
documentation.</para>
<para>During the entire time they wrote this book, Ben, Mike, and
@@ -94,7 +94,7 @@
back, the book is simply a straightforward description of a
piece of software. There's the overview, the obligatory guided
tour, the chapter on administrative configuration, some advanced
- topics, and of course a command reference and troubleshooting
+ topics, and of course, a command reference and troubleshooting
guide. Only when you come back to it later, seeking the
solution to some specific problem, does its authenticity shine
out: the telling details that can only result from encounters
@@ -103,7 +103,7 @@
user's point of view.</para>
<para>Of course, no one can promise that this book will answer
- every question you have about Subversion. Sometimes, the
+ every question you have about Subversion. Sometimes the
precision with which it anticipates your questions will seem
eerily telepathic; yet occasionally, you will stumble into a
hole in the community's knowledge and come away empty-handed.
More information about the svnbook-dev
mailing list