[svnbook commit] r3246 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Wed Aug 6 03:45:58 CDT 2008
Author: cmpilato
Date: Wed Aug 6 03:45:58 2008
New Revision: 3246
Log:
* src/en/book/ch08-embedding-svn.xml
* src/en/book/ch03-advanced-topics.xml
* src/en/book/ch09-reference.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
Various fixes found while porting copyedit changes to ORA's tree.
This also includes a revert of the partial change to close up spaces
between footnote markers and preceding text, not because that change
was wrong, but because it was a tip-of-the-iceburg approach.
Consistency is easier to automate around.
Modified:
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/ch06-server-configuration.xml
trunk/src/en/book/ch07-customizing-svn.xml
trunk/src/en/book/ch08-embedding-svn.xml
trunk/src/en/book/ch09-reference.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 Wed Aug 6 03:45:58 2008
@@ -326,7 +326,8 @@
authentication credentials on disk. This is done for
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
@@ -569,7 +570,8 @@
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
@@ -676,7 +678,8 @@
network. This makes it easy to manage your
changes-in-progress when you are somewhere without a network
connection, such as traveling on an airplane, riding a
- commuter train, or hacking on the beach.<footnote>
+ commuter train, or hacking on the beach.
+ <footnote>
<para>And you don't have a WLAN card. Thought
you got us, huh?</para>
</footnote>
@@ -1509,7 +1512,8 @@
surprised when the sandwich arrives and it's not what she
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>
@@ -2131,7 +2135,8 @@
<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>
</para>
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 Wed Aug 6 03:45:58 2008
@@ -4075,11 +4075,11 @@
about branches, tags, and merging. Then you'll have nearly full
mastery of the Subversion client. Though our lawyers won't
allow us to promise you anything, this additional knowledge
- could make your measurably more cool.
+ could make you measurably more cool.
<footnote>
<para>No purchase necessary. Certains terms and conditions
- apply. No guarantee of coolness, implicit or otherwise,
- exists. Mileage may vary.</para>
+ apply. No guarantee of coolness—implicit or
+ otherwise—exists. Mileage may vary.</para>
</footnote>
</para>
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 Wed Aug 6 03:45:58 2008
@@ -1536,7 +1536,8 @@
commit r5 to the trunk, then immediately roll back r5
using <userinput>svn merge . -c -5</userinput>), this
sort of merge doesn't affect the recorded mergeinfo.
- <footnote><para>Interestingly, after rolling back a
+ <footnote>
+ <para>Interestingly, after rolling back a
revision like this, we wouldn't be able to reapply
the revision using <userinput>svn merge . -c 5</userinput>,
since the mergeinfo would already list r5 as being
@@ -1908,7 +1909,7 @@
<title>Merges and Moves</title>
<para>A common desire is to refactor source code, especially
- in Java™-based software projects. Files and directories are
+ in Java-based software projects. Files and directories are
shuffled around and renamed, often causing great disruption
to everyone working on the project. Sounds like a perfect
case to use a branch, doesn't it? Just create a branch,
@@ -2043,7 +2044,7 @@
of thing, you can get a fantastic overview in a paper posted
at CollabNet's website: <ulink
url="http://www.collab.net/community/subversion/articles/merge-info.html"
- >http://www.collab.net/community/subversion/articles/merge-info.html</ulink>.</para>
+ />.</para>
<para>For now, if you want to steer clear of bugs and odd
behaviors in automatic merging, the CollabNet article
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 Wed Aug 6 03:45:58 2008
@@ -734,7 +734,8 @@
</itemizedlist>
<para>The <command>svnserve</command> server, by default, knows
- only how to send a CRAM-MD5<footnote>
+ only how to send a CRAM-MD5
+ <footnote>
<para>See RFC 2195.</para>
</footnote>
authentication challenge. In essence,
@@ -1174,20 +1175,25 @@
chapter). But even in the case of tunneling, you can still use the
<filename>svnserve.conf</filename> file to block access, by
simply setting <literal>auth-access = read</literal>
- or <literal>auth-access = none</literal><footnote> <para>Note
- that using any sort of
- <command>svnserve</command>-enforced access control at all is
- a bit pointless; the user already has direct access to the
- repository database.</para> </footnote>. </para>
+ or <literal>auth-access = none</literal>.
+ <footnote>
+ <para>Note that using any sort of
+ <command>svnserve</command>-enforced access control at all
+ is a bit pointless; the user already has direct access to
+ the repository database.</para>
+ </footnote>
+ </para>
<para>You'd think that the story of SSH tunneling would end
here, but it doesn't. Subversion allows you to create custom
tunnel behaviors in your runtime <filename>config</filename>
file (see <xref linkend="svn.advanced.confarea"/>.) For
- example, suppose you want to use RSH instead of SSH.<footnote>
- <para>We don't actually recommend this, since RSH
- is notably less secure than SSH.</para> </footnote> In the
- <literal>[tunnels]</literal> section of your
+ example, suppose you want to use RSH instead of SSH.
+ <footnote>
+ <para>We don't actually recommend this, since RSH
+ is notably less secure than SSH.</para>
+ </footnote>
+ In the <literal>[tunnels]</literal> section of your
<filename>config</filename> file, simply define it like
this:</para>
@@ -1359,12 +1365,12 @@
arding,no-X11-forwarding,no-pty TYPE1 KEY1 harry at example.com
</screen>
- <para>(Note that this all must be on one line—truly on
+ <para>Note that this all must be on one line—truly on
one line—since SSH <filename>authorized_keys</filename>
files do not even allow the conventional backslash character
(<literal>\</literal>) for line continuation. The only
reason we've formatted it with a line break is to fit it on
- the physical page of a book.)</para>
+ the physical page of a book.</para>
</sect3>
@@ -1392,9 +1398,11 @@
robust system that is conveniently packaged as part of the
Apache 2.0 software, supported by numerous operating systems
and third-party products, and doesn't require network
- administrators to open up yet another custom port.<footnote>
- <para>They really hate doing that.</para></footnote> While an
- Apache-Subversion server has more features than
+ administrators to open up yet another custom port.
+ <footnote>
+ <para>They really hate doing that.</para>
+ </footnote>
+ While an Apache-Subversion server has more features than
<command>svnserve</command>, it's also a bit more difficult
to set up. With flexibility often comes more complexity.</para>
@@ -1427,7 +1435,7 @@
<para>If you're a system administrator, it's very likely that
you're already running the Apache web server and have some
prior experience with it. At the time of this writing, Apache 1.3
- iss the more popular version of Apache. The world has
+ is the more popular version of Apache. The world has
been somewhat slow to upgrade to the Apache 2.x series for
various reasons: some people fear change, especially changing
something as critical as a web server. Other people depend on
@@ -1820,13 +1828,14 @@
some sort of SSL encryption, so that clients authenticate
via <literal>https://</literal> instead
of <literal>http://</literal>; at a bare minimum, you can
- configure Apache to use a self-signed server certificate<footnote>
+ configure Apache to use a self-signed server certificate.
+ <footnote>
<para>While self-signed server certificates are still
vulnerable to a <quote>man-in-the-middle</quote> attack,
such an attack is much more difficult for a casual
observer to pull off, compared to sniffing unprotected
passwords.</para>
- </footnote>.
+ </footnote>
Consult Apache's documentation (and OpenSSL documentation)
about how to do that.</para>
@@ -1874,7 +1883,7 @@
verify that it trusts the certificate: is the server really
who it claims to be? The OpenSSL library does this by
examining the signer of the server certificate, or
- <firstterm>certifcate authority</firstterm> (CA). If
+ <firstterm>certificate authority</firstterm> (CA). If
OpenSSL is unable to automatically trust the CA, or if some
other problem occurs (such as an expired certificate or
hostname mismatch), the Subversion command-line client will
@@ -1972,11 +1981,12 @@
<literal>ssl-client-cert-file</literal> and
<literal>ssl-client-cert-password</literal> variables, the
Subversion client can automatically respond to a client
- certificate challenge without prompting you<footnote>
+ certificate challenge without prompting you.
+ <footnote>
<para>More security-conscious folk might not want to store
the client certificate password in the runtime
<filename>servers</filename> file.</para>
- </footnote>.
+ </footnote>
</para>
</sect3>
@@ -2351,9 +2361,10 @@
web browser, however, you can use third-party software. A
good example of this is ViewVC (<ulink
url="http://viewvc.tigris.org/"/>). ViewVC was originally
- written to display CVS repositories through the Web<footnote>
+ written to display CVS repositories through the Web,
+ <footnote>
<para>Back then, it was called ViewCVS.</para>
- </footnote>,
+ </footnote>
and the latest releases are able to understand Subversion
repositories as well.</para>
</sidebar>
@@ -2392,7 +2403,7 @@
file <filename>foo.html</filename>, Apache would
properly tell your web browser to render the file as HTML.
One could also attach proper <literal>image/*</literal>
- mime-type properties to image files and ultimately get an
+ MIME-type properties to image files and ultimately get an
entire web site to be viewable directly from a repository!
There's generally no problem with this, as long as the web
site doesn't contain any dynamically generated
@@ -2942,9 +2953,10 @@
administrator. Decide whether it's worth sacrificing some
server speed, and remember that there's very little risk
involved; it's bad to become dependent on technology as a
- crutch for social problems<footnote>
+ crutch for social problems.
+ <footnote>
<para>A common theme in this book!</para>
- </footnote>.
+ </footnote>
</para>
<para>As an example to ponder, consider that the Subversion
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 Wed Aug 6 03:45:58 2008
@@ -1196,7 +1196,7 @@
REM Configure your favorite diff program here.
SET DIFF="C:\Program Files\Funky Stuff\My Diff Tool.exe"
-REM Subversion provides the paths we need as that last two parameters.
+REM Subversion provides the paths we need as the last two parameters.
REM These are parameters 6 and 7 (unless you use svn diff -x, in
REM which case, all bets are off).
SET LEFT=%6
@@ -1249,7 +1249,7 @@
# Configure your favorite diff program here.
DIFF3 = "/usr/local/bin/my-merge-tool"
-# Subversion provides the paths we need as last three parameters.
+# Subversion provides the paths we need as the last three parameters.
MINE = sys.argv[-3]
OLDER = sys.argv[-2]
YOURS = sys.argv[-1]
@@ -1274,7 +1274,7 @@
REM Configure your favorite diff3/merge program here.
SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
-REM Subversion provides the paths we need as last three parameters.
+REM Subversion provides the paths we need as the last three parameters.
REM These are parameters 9, 10, and 11. But we have access to only
REM nine parameters at a time, so we shift our nine-parameter window
REM twice to let us get to what we need.
@@ -1316,7 +1316,7 @@
configuration system and other mechanisms by which users can
control those configurable behaviors. If you are a developer,
though, the next chapter will take you one step further. It
- will discuss how you can further customize your Subversion
+ describes how you can further customize your Subversion
experience by writing your own software against Subversion's
libraries.</para>
Modified: trunk/src/en/book/ch08-embedding-svn.xml
==============================================================================
--- trunk/src/en/book/ch08-embedding-svn.xml (original)
+++ trunk/src/en/book/ch08-embedding-svn.xml Wed Aug 6 03:45:58 2008
@@ -777,7 +777,7 @@
developers immediately recognized the value of using APR as
well. This means that there is practically no OS-specific
code in Subversion itself. Also, it means that the Subversion
- client compiles and runs anywhere that th eApache HTTP Server
+ client compiles and runs anywhere that the Apache HTTP Server
does. Currently, this list includes all flavors of Unix,
Win32, BeOS, OS/2, and Mac OS X.</para>
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Wed Aug 6 03:45:58 2008
@@ -16,7 +16,8 @@
<title>The Subversion Command-Line Client: <command>svn</command></title>
<para>To use the command-line client, type
- <command>svn</command>, the subcommand you wish to use,<footnote>
+ <command>svn</command>, the subcommand you wish to use,
+ <footnote>
<para>Well, you don't need a subcommand to use the
<option>--version</option> option, but we'll get to that in
just a minute.</para>
@@ -349,7 +350,7 @@
<varlistentry>
<term><option>--keep-changelists</option></term>
<listitem>
- <para>Tells Subversion onot to delete changelists after committing.</para>
+ <para>Tells Subversion not to delete changelists after committing.</para>
</listitem>
</varlistentry>
@@ -4567,8 +4568,8 @@
</variablelist>
<para>The third column is populated only if the
- working copy directory is locked (See
- <xref linkend="svn.tour.cleanup"/>.):</para>
+ working copy directory is locked (see
+ <xref linkend="svn.tour.cleanup"/>):</para>
<variablelist>
@@ -4697,7 +4698,7 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
- <para>The item in your working copy is up-to-date.</para>
+ <para>The item in your working copy is up to date.</para>
</listitem>
</varlistentry>
@@ -4965,7 +4966,7 @@
Updated to revision 31.
</screen>
- <para >To switch back, just provide the URL to the
+ <para>To switch back, just provide the URL to the
location in the repository from which you originally
checked out your working copy:</para>
@@ -5497,8 +5498,7 @@
<title>svnadmin Subcommands</title>
<para>Here are the various subcommands
- for <command>svnadmin</command>.</para>
-
+ for the <command>svnadmin</command> program.</para>
<refentry id="svn.ref.svnadmin.c.crashtest">
@@ -5569,7 +5569,8 @@
<para>Create a new, empty repository at the path provided.
If the provided directory does not exist, it will be
- created for you.<footnote>
+ created for you.
+ <footnote>
<para>Remember, <command>svnadmin</command> works only
with local <emphasis>paths</emphasis>, not
<emphasis>URLs</emphasis>.</para>
@@ -9100,7 +9101,8 @@
<para>If present on a file, indicates that the file is not
an ordinary file, but a symbolic link or other special
- object.<footnote>
+ object.
+ <footnote>
<para>As of this writing, symbolic links are indeed
the only <quote>special</quote> objects. But there
might be more in future releases of
More information about the svnbook-dev
mailing list