[svnbook commit] r3301 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Fri Sep 12 09:39:36 CDT 2008
Author: cmpilato
Date: Fri Sep 12 09:39:35 2008
New Revision: 3301
Log:
* src/en/book/ch00-preface.xml,
* src/en/book/ch03-advanced-topics.xml,
* src/en/book/ch05-repository-admin.xml,
* src/en/book/ch01-fundamental-concepts.xml,
* src/en/book/copyright.xml,
* src/en/book/ch06-server-configuration.xml,
* src/en/book/ch04-branching-and-merging.xml,
* src/en/book/ch02-basic-usage.xml,
* src/en/book/ch07-customizing-svn.xml
If we're lucky, our last batch of edits before the second edition
goes to print.
(This includes a couple of tweaks suggested by Alex Purins
<alex.purins {at} businesslink.com>. Thanks, Alex.)
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
trunk/src/en/book/copyright.xml
Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml (original)
+++ trunk/src/en/book/ch00-preface.xml Fri Sep 12 09:39:35 2008
@@ -340,8 +340,7 @@
Subversion filesystem, and the working copy
administrative areas from a programmer's point of view.
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>
+ program that uses Subversion.</para>
</listitem>
</varlistentry>
@@ -784,7 +783,7 @@
documents (usually over a network) and keep track of who made
which changes, then Subversion is also appropriate. This is
why Subversion is so often used in software development
- environments— programming is an inherently social
+ environments— working on a development team is an inherently social
activity, and Subversion makes it easy to collaborate with
other programmers. Of course, there's a cost to using
Subversion as well: administrative overhead. You'll need to
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 Fri Sep 12 09:39:35 2008
@@ -708,7 +708,7 @@
</listitem>
<listitem>
- <para>A timestamp recording of when the local copy was last
+ <para>A timestamp recording when the local copy was last
updated by the repository</para>
</listitem>
</itemizedlist>
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 Fri Sep 12 09:39:35 2008
@@ -215,10 +215,11 @@
attribute values, and property names in XML tag names. This
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
- in diffs or in the output of commands such as <command>svn
- log</command> or <command>svn status</command>.</para>
+ characters. Subversion also prohibits <literal>TAB</literal>,
+ <literal>CR</literal>, and <literal>LF</literal> characters in
+ path names to prevent paths from being broken up in diffs or
+ in the output of commands such as <command>svn log</command>
+ or <command>svn status</command>.</para>
<para>While it may seem like a lot to remember, in practice
these limitations are rarely a problem. As long as your
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 Fri Sep 12 09:39:35 2008
@@ -652,7 +652,7 @@
</screen>
<para>But even if you haven't checked out a working copy from
- that repository, you can still affect the property change by
+ that repository, you can still effect the property change by
providing the repository's root URL:</para>
<screen>
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 Fri Sep 12 09:39:35 2008
@@ -1692,7 +1692,7 @@
<para>This technique works, but it's also a little bit
dangerous. The main problem is that we're not clearly
- differentiating between the ideas of <quote>I don't want this
+ differentiating between the ideas of <quote>I already have this
change</quote> and <quote>I don't have this change.</quote>
We're effectively lying to the system, making it think that
the change was previously merged. This puts the
@@ -1966,7 +1966,7 @@
merging your <quote>rename</quote> to the branch has removed
Sally's recent changes from the latest revision!</para>
- <para>This isn't true data loss; Sally's changes are still in
+ <para>This isn't true data loss. Sally's changes are still in
the repository's history, but it may not be immediately
obvious that this has happened. The moral of this story is
that until Subversion improves, be very careful about
@@ -2532,7 +2532,7 @@
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/stable-1.0 \
- -m "Creating stable branch of calc project."
+ -m "Creating stable branch of calc project."
Committed revision 377.
</screen>
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 Fri Sep 12 09:39:35 2008
@@ -921,7 +921,7 @@
problems that could prevent the hook from performing the tasks
it is designed to perform.</para>
- <para>There are nine hooks implemented by the Subversion
+ <para>There are serveral hooks implemented by the Subversion
repository, and you can get details about each of them in
<xref linkend="svn.ref.reposhooks" />. As a repository
administrator, you'll need to decide which hooks you wish
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 Fri Sep 12 09:39:35 2008
@@ -2742,7 +2742,7 @@
</screen>
<para>After this is done, we configure the master server's
- <filename>post-commit</filename> hook script to invoke
+ <literal>post-commit</literal> hook script to invoke
<command>svnsync</command> on each slave server:</para>
<programlisting>
@@ -2759,8 +2759,8 @@
commands to run in the background so that the Subversion
client isn't left waiting forever for the commit to
finish. In addition to this
- <filename>post-commit</filename> hook, you'll need a
- <filename>post-revprop-change</filename> hook as well so
+ <literal>post-commit</literal> hook, you'll need a
+ <literal>post-revprop-change</literal> hook as well so
that when a user, say, modifies a log message, the slave
servers get that change also:</para>
@@ -2784,8 +2784,8 @@
won't be able to query the status of locks
(e.g., <userinput>svn status -u</userinput> will show no
information about repository locks). If this bothers you,
- you can write <filename>post-lock</filename> and
- <filename>post-unlock</filename> hook scripts that run
+ you can write <literal>post-lock</literal> and
+ <literal>post-unlock</literal> hook scripts that run
<command>svn lock</command> and <command>svn
unlock</command> on each slave machine, presumably through
a remote shell method such as SSH. That's left as an
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 Fri Sep 12 09:39:35 2008
@@ -769,10 +769,11 @@
the Subversion client's ability to automatically set
properties on files when they are added or imported.
It contains any number of key-value pairs in the
- format <literal>PATTERN = PROPNAME=PROPVALUE</literal>,
- where <literal>PATTERN</literal> is a file pattern
- that matches a set of filenames and the rest of the
- line is the property and its value. Multiple matches
+ format <literal>PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE
+ ...]</literal>, where <literal>PATTERN</literal> is a file
+ pattern that matches one or more filenames and the rest of
+ the line is a semicolon-delimited set of property
+ assignments. Multiple matches
on a file will result in multiple propsets for that
file; however, there is no guarantee that auto-props
will be applied in the order in which they are listed
Modified: trunk/src/en/book/copyright.xml
==============================================================================
--- trunk/src/en/book/copyright.xml (original)
+++ trunk/src/en/book/copyright.xml Fri Sep 12 09:39:35 2008
@@ -3,7 +3,7 @@
<programlisting>
-Copyright (c) 2002-2007
+Copyright (c) 2002-2008
Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato.
This work is licensed under the Creative Commons Attribution License.
More information about the svnbook-dev
mailing list