[svnbook commit] r3034 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Wed Apr 9 08:11:35 CDT 2008
Author: cmpilato
Date: Wed Apr 9 08:11:35 2008
New Revision: 3034
Log:
Consistify footnote formatting.
Modified:
trunk/src/en/book/appa-quickstart.xml
trunk/src/en/book/appb-svn-for-cvs-users.xml
trunk/src/en/book/ch00-preface.xml
trunk/src/en/book/ch02-basic-usage.xml
trunk/src/en/book/ch04-branching-and-merging.xml
trunk/src/en/book/ch06-server-configuration.xml
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/book/appa-quickstart.xml
==============================================================================
--- trunk/src/en/book/appa-quickstart.xml (original)
+++ trunk/src/en/book/appa-quickstart.xml Wed Apr 9 08:11:35 2008
@@ -81,7 +81,8 @@
subdirectory thereof called <literal>trunk</literal>. See
our discussion of Subversion's branching and tagging model
for the reasoning behind this.</para>
- </footnote></para>
+ </footnote>
+ </para>
<screen>
$ svn checkout http://svn.collab.net/repos/svn/trunk subversion
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 Wed Apr 9 08:11:35 2008
@@ -363,10 +363,12 @@
(<literal>http://svn.example.com/repos/calc/</literal>). If
you make the mistake of checking out the project itself,
you'll wind up with a working copy that contains a copy of
- your project for every branch and tag you
- have.<footnote><para>That is, providing you don't run out of
- disk space before your checkout
- finishes.</para></footnote></para>
+ your project for every branch and tag you have.
+ <footnote>
+ <para>That is, providing you don't run out of disk space
+ before your checkout finishes.</para>
+ </footnote>
+ </para>
</warning>
</sect1>
Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml (original)
+++ trunk/src/en/book/ch00-preface.xml Wed Apr 9 08:11:35 2008
@@ -453,9 +453,12 @@
a risky and ambitious new Open Source project; Jim Blandy for
the original Subversion name and design—we love you, Jim;
Karl Fogel for being such a good friend and a great community
- leader, in that order.<footnote><para>Oh, and thanks, Karl, for
- being too overworked to write this book yourself.</para>
- </footnote></para>
+ leader, in that order.
+ <footnote>
+ <para>Oh, and thanks, Karl, for being too overworked to write
+ this book yourself.</para>
+ </footnote>
+ </para>
<para>Thanks to O'Reilly and our editors, Linda Mui and Tatiana
Diaz for their patience and support.</para>
@@ -656,10 +659,12 @@
packages. The problem is, this sort of data usually isn't
changing at all. The collection itself grows over time, but
the individual files within the collection aren't being
- changed. In this case, using Subversion is
- "overkill".<footnote><para>Or as a friend puts
- it, <quote>swatting a fly with a
- Buick.</quote></para></footnote> There are simpler tools that
+ changed. In this case, using Subversion is "overkill".
+ <footnote>
+ <para>Or as a friend puts it, <quote>swatting a fly with a
+ Buick.</quote></para>
+ </footnote>
+ There are simpler tools that
efficiently replicate data <emphasis>without</emphasis> the
overhead of tracking changes, such as <command>rsync</command>
or <command>unison</command>.</para>
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 Apr 9 08:11:35 2008
@@ -325,12 +325,15 @@
authentication credentials on disk. This is done for
convenience, so that you don't have to continually re-enter
your password for future operations. If you're concerned
- 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 Subversion and, secondly, because your
- Subversion password isn't the same as any of the other three
- million passwords you have, right? Right?</para></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
+ Subversion and, secondly, because your Subversion password
+ isn't the same as any of the other three million passwords
+ you have, right? Right?</para>
+ </footnote>
you can disable caching either permanently or on a
case-by-case basis.</para>
@@ -567,14 +570,17 @@
you commit your changes, <filename>foo</filename> will
be entirely removed from your working copy and the
repository.
- <footnote><para>Of course, nothing is ever totally
- deleted from the repository—just from the
- <literal>HEAD</literal> of the repository. You can get
- back anything you delete by checking out (or updating
- your working copy to) a revision earlier than the one in
- which you deleted it. Also see
- <xref linkend="svn.branchmerge.advanced.resurrect"/>.
- </para></footnote></para>
+ <footnote>
+ <para>Of course, nothing is ever totally deleted from
+ the repository—just from the
+ <literal>HEAD</literal> of the repository. You can
+ get back anything you delete by checking out (or
+ updating your working copy to) a revision earlier
+ than the one in which you deleted it. Also see <xref
+ linkend="svn.branchmerge.advanced.resurrect"
+ />.</para>
+ </footnote>
+ </para>
</listitem>
</varlistentry>
@@ -671,9 +677,12 @@
network. This makes it easy to manage your
changes-in-progress when you are somewhere without a network
connection, such as travelling on an airplane, riding a
- commuter train or hacking on the beach.<footnote><para>And
- also that you don't have a WAN card. Thought you got us,
- huh?</para></footnote></para>
+ commuter train or hacking on the beach.
+ <footnote>
+ <para>And also that you don't have a WAN card. Thought
+ you got us, huh?</para>
+ </footnote>
+ </para>
<para>Subversion does this by keeping private caches of
pristine versions of each versioned file inside of the
@@ -1419,11 +1428,13 @@
<para>Once you've resolved the conflict, you need to let
Subversion know by running <command>svn resolved</command>.
This removes the three temporary files and Subversion no
- longer considers the file to be in a state of
- conflict.<footnote><para>You can always remove the temporary
- files yourself, but would you really want to do that when
- Subversion can do it for you? We didn't think so.</para>
- </footnote></para>
+ longer considers the file to be in a state of conflict.
+ <footnote>
+ <para>You can always remove the temporary files yourself,
+ but would you really want to do that when Subversion can
+ do it for you? We didn't think so.</para>
+ </footnote>
+ </para>
<screen>
$ svn resolved sandwich.txt
@@ -1498,11 +1509,13 @@
surprised when the sandwich arrives and it's not what she
wanted. So 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><para>And if you
- ask them for it, they may very well ride you out of town on
- a rail.</para></footnote> Once you've agreed on the changes
- you will check in, edit your file and remove the conflict
- markers.</para>
+ 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>
+ Once you've agreed on the changes you will check in, edit
+ your file and remove the conflict markers.</para>
<screen>
Top piece of bread
@@ -2116,8 +2129,10 @@
<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><para>See? We told you that Subversion was a time
- machine.</para></footnote>:</para>
+ <footnote>
+ <para>See? We told you that Subversion was a time machine.</para>
+ </footnote>
+ :</para>
<screen>
$ svn checkout -r 1729 # Checks out a new working copy at r1729
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 Apr 9 08:11:35 2008
@@ -1012,21 +1012,24 @@
<warning>
<para>Did you notice how, in the last example, the merge
- invocation caused two distinct ranges of merges to be applied?
- The <command>svn merge</command> command applied two
- independent patches to your working copy in order to skip over
- changeset 355, which your branch already contained. There's
- nothing inherently wrong with this, except that it has the
- potential to make conflict resolution more tricky. If the
- first range of changes creates conflicts,
- you <emphasis>must</emphasis> resolve them interactively in
- order for the merge process to continue and apply the second
- range of changes. If you postpone a conflict from the first
- wave of changes, the whole merge command will bail out with an
- error message.<footnote><para>At least, this is true in
- Subversion 1.5 at the time of writing. This behavior may
- improve in future versions of
- Subversion.</para></footnote></para>
+ invocation caused two distinct ranges of merges to be
+ applied? The <command>svn merge</command> command applied
+ two independent patches to your working copy in order to
+ skip over changeset 355, which your branch already
+ contained. There's nothing inherently wrong with this,
+ except that it has the potential to make conflict resolution
+ more tricky. If the first range of changes creates
+ conflicts, you <emphasis>must</emphasis> resolve them
+ interactively in order for the merge process to continue and
+ apply the second range of changes. If you postpone a
+ conflict from the first wave of changes, the whole merge
+ command will bail out with an error message.
+ <footnote>
+ <para>At least, this is true in Subversion 1.5 at the time
+ of writing. This behavior may improve in future
+ versions of Subversion.</para>
+ </footnote>
+ </para>
</warning>
<para>A word of warning: while <command>svn diff</command> and
@@ -1931,7 +1934,8 @@
abandon an existing working copy. See <xref
linkend="svn.ref.svn.c.switch"/> for more information and an
example.</para>
- </footnote></para>
+ </footnote>
+ </para>
<sidebar>
<title>Switches and Updates</title>
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 Apr 9 08:11:35 2008
@@ -734,8 +734,11 @@
</itemizedlist>
<para>The <command>svnserve</command> server, by default, knows
- only how to send a CRAM-MD5 <footnote><para>See RFC
- 2195.</para></footnote> authentication challenge. In essence,
+ only how to send a CRAM-MD5
+ <footnote>
+ <para>See RFC 2195.</para>
+ </footnote>
+ authentication challenge. In essence,
the server sends a small amount of data to the client. The
client uses the MD5 hash algorithm to create a fingerprint of
the data and password combined, and then sends the fingerprint
@@ -1179,10 +1182,12 @@
here, but it doesn't. Subversion allows you to create custom
tunnel behaviors in your run-time <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
+ 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>
@@ -2932,8 +2937,11 @@
administrator. Decide whether it's worth sacrificing some
server speed for, and remember that there's very little risk
involved; it's bad to become dependent on technology as a
- crutch for social problems.<footnote><para>A common theme in
- this book!</para></footnote>.</para>
+ crutch for social problems.
+ <footnote>
+ <para>A common theme in this book!</para>
+ </footnote>
+ </para>
<para>As an example to ponder, consider that the Subversion
project itself has always had a notion of who is allowed to
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Wed Apr 9 08:11:35 2008
@@ -16,14 +16,16 @@
<title>The Subversion Command Line Client: <command>svn</command></title>
<para>To use the command line client, you type
- <command>svn</command>, the subcommand you wish to use
- <footnote><para>Yes, yes, you don't need a subcommand to use the
- <option>--version</option> option, but we'll get to that in just
- a minute.</para></footnote>, and any options or targets that
- you wish to operate on—there is no specific order that the
- subcommand and the options must appear in. For example, all of
- the following are valid ways to use <command>svn
- status</command>:</para>
+ <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>
+ </footnote>
+ and any options or targets that you wish to operate
+ on—there is no specific order that the subcommand and the
+ options must appear in. For example, all of the following are
+ valid ways to use <command>svn status</command>:</para>
<screen>
$ svn -v status
@@ -5128,13 +5130,16 @@
<para>Create a new, empty repository at the path provided.
If the provided directory does not exist, it will be
- created for you.<footnote><para>Remember,
- <command>svnadmin</command> works only with local
- <emphasis>paths</emphasis>, not
- <emphasis>URLs</emphasis>.</para></footnote> As of
- Subversion 1.2, <command>svnadmin</command> creates new
- repositories with the <literal>fsfs</literal> filesystem
- backend by default.</para>
+ created for you.
+ <footnote>
+ <para>Remember, <command>svnadmin</command> works only
+ with local <emphasis>paths</emphasis>, not
+ <emphasis>URLs</emphasis>.</para>
+ </footnote>
+ As of Subversion 1.2, <command>svnadmin</command>
+ creates new repositories with the
+ <literal>fsfs</literal> filesystem backend by
+ default.</para>
<para>While <command>svnadmin create</command> will create
the base directory for a new repository, it will not
@@ -8014,10 +8019,14 @@
<para>If present on a file, indicates that the file is not
an ordinary file, but a symbolic link or other special
- 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
- Subversion.</para></footnote>.</para>
+ 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
+ Subversion.</para>
+ </footnote>
+ </para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list