[svnbook commit] r2841 - trunk/src/en/book
sussman
noreply at red-bean.com
Sun Aug 12 22:23:03 CDT 2007
Author: sussman
Date: Sun Aug 12 22:23:03 2007
New Revision: 2841
Log:
Trac issue 61: incorporate a huge number of micro-suggestions from offby1.
* book/ch00-preface.xml,
book/ch01-fundamental-concepts.xml,
book/ch02-basic-usage.xml,
book/ch03-advanced-topics.xml,
book/ch04-branching-and-merging.xml,
book/ch06-server-configuration.xml:
Billions of teeny changes for improved readability.
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/ch06-server-configuration.xml
Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml (original)
+++ trunk/src/en/book/ch00-preface.xml Sun Aug 12 22:23:03 2007
@@ -57,11 +57,11 @@
use Subversion to manage their data. While Subversion runs on a
number of different operating systems, its primary user
interface is command-line based. That command-line tool
- (<command>svn</command>) and auxiliary program are the focus of
- this book.</para>
+ (<command>svn</command>), and some auxiliary programs, are the
+ focus of this book.</para>
<para>For consistency, the examples in this book assume the reader
- is using a Unix-like operating system and relatively comfortable
+ is using a Unix-like operating system and is relatively comfortable
with Unix and command-line interfaces. That said, the
<command>svn</command> program also runs on non-Unix platforms
like Microsoft Windows. With a few minor exceptions, such as
@@ -323,7 +323,7 @@
<term><xref linkend="svn.serverconfig"/></term>
<listitem>
<para>Explains how to configure your Subversion server and
- the three ways to access your repository:
+ different ways to access your repository:
<literal>HTTP</literal>, the <literal>svn</literal>
protocol, and local disk access. It also covers the details
of authentication, authorization and anonymous
@@ -439,9 +439,9 @@
<!-- 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 links
- to the latest snapshots and tagged versions of the book in
+ volunteer-driven translation efforts around 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
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 Sun Aug 12 22:23:03 2007
@@ -51,11 +51,10 @@
<emphasis>previous</emphasis> states of the filesystem. For
example, a client can ask historical questions like, <quote>What
did this directory contain last Wednesday?</quote> or <quote>Who
- was the last person to change this file, and what changes did
- he make?</quote> These are the sorts of questions that are at
- the heart of any <firstterm>version control system</firstterm>:
- systems that are designed to record and track changes to data
- over time.
+ was the last person to change this file, and what changes did he
+ make?</quote> These are the sorts of questions that are at the
+ heart of any <firstterm>version control system</firstterm>:
+ systems that are designed to track changes to data over time.
</para>
</sect1>
@@ -187,8 +186,8 @@
<sect2 id="svn.basic.vsn-models.copy-merge">
<title>The Copy-Modify-Merge Solution</title>
- <para>Subversion, CVS, and a number of other version control
- systems use a <firstterm>copy-modify-merge</firstterm> model as an
+ <para>Subversion, CVS, and many other version control systems
+ use a <firstterm>copy-modify-merge</firstterm> model as an
alternative to locking. In this model, each user's client
contacts the project repository and creates a personal
<firstterm>working copy</firstterm>—a local reflection
@@ -253,9 +252,9 @@
and semantic conflicts increase. No system can force users to
communicate perfectly, and no system can detect semantic
conflicts. So there's no point in being lulled into a false
- promise that a locking system will somehow prevent conflicts;
- in practice, locking seems to inhibit productivity more than
- anything else.</para>
+ sense of security that a locking system will somehow prevent
+ conflicts; in practice, locking seems to inhibit productivity
+ more than anything else.</para>
<sidebar id="svn.basic.vsn-models.copy-merge.sb-1">
<title>When Locking is Necessary</title>
@@ -277,7 +276,7 @@
<para>While Subversion is still primarily a copy-modify-merge
system, it still recognizes the need to lock an occasional
- file ands provide mechanisms for this. This feature is
+ file and thus provide mechanisms for this. This feature is
discussed later in this book, in
<xref linkend="svn.advanced.locking"/>.</para>
@@ -457,75 +456,17 @@
Makefile integer.c button.c .svn/
</screen>
- <para>The list of letter A's indicates that Subversion is adding
- a number of items to your working copy. You now have a
- personal copy of the repository's <filename>/calc</filename>
- directory, with one additional
- entry—<filename>.svn</filename>—which holds the
- extra information needed by Subversion, as mentioned
+ <para>The list of letter A's in the left margin indicates that
+ Subversion is adding a number of items to your working copy.
+ You now have a personal copy of the
+ repository's <filename>/calc</filename> directory, with one
+ additional entry—<filename>.svn</filename>—which
+ holds the extra information needed by Subversion, as mentioned
earlier.</para>
-
- <sidebar id="svn.basic.in-action.wc.sb-1">
- <title>Repository URLs</title>
-
- <para>Subversion repositories can be accessed through many
- different methods—on local disk, or through various
- network protocols, depending on how your administrator has
- set things up for you. A repository location, however, is
- always a URL.
- <xref linkend="svn.basic.in-action.wc.tbl-1"/> describes how
- different URL schemas map to the available access
- methods.</para>
-
- <table id="svn.basic.in-action.wc.tbl-1">
- <title>Repository Access URLs</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Schema</entry>
- <entry>Access Method</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><literal>file:///</literal></entry>
- <entry>direct repository access (on local disk)</entry>
- </row>
- <row>
- <entry><literal>http://</literal></entry>
- <entry>access via WebDAV protocol to Subversion-aware
- Apache server</entry>
- </row>
- <row>
- <entry><literal>https://</literal></entry>
- <entry>same as <literal>http://</literal>, but with
- SSL encryption.</entry>
- </row>
- <row>
- <entry><literal>svn://</literal></entry>
- <entry>access via custom protocol to an
- <literal>svnserve</literal> server</entry>
- </row>
- <row>
- <entry><literal>svn+ssh://</literal></entry>
- <entry>same as <literal>svn://</literal>, but through
- an SSH tunnel.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>For more information on how Subversion parses URLs, see
- <xref linkend="svn.advanced.reposurls"/>. For more
- information on the different types of network servers
- available for Subversion, see
- <xref linkend="svn.serverconfig"/>.</para>
-
- </sidebar>
<para>Suppose you make changes to <filename>button.c</filename>.
Since the <filename>.svn</filename> directory remembers the
- file's modification date and original contents, Subversion can
+ file's original modification date and contents, Subversion can
tell that you've changed the file. However, Subversion does
not make your changes public until you explicitly tell it to.
The act of publishing your changes is more commonly known as
@@ -582,6 +523,64 @@
in the <filename>.svn</filename> directory, and further
information in the repository, to decide which files need to
be brought up to date.</para>
+
+ <sidebar id="svn.basic.in-action.wc.sb-1">
+ <title>Repository URLs</title>
+
+ <para>Subversion repositories can be accessed through many
+ different methods—on local disk, or through various
+ network protocols, depending on how your administrator has
+ set things up for you. A repository location, however, is
+ always a URL.
+ <xref linkend="svn.basic.in-action.wc.tbl-1"/> describes how
+ different URL schemas map to the available access
+ methods.</para>
+
+ <table id="svn.basic.in-action.wc.tbl-1">
+ <title>Repository Access URLs</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Schema</entry>
+ <entry>Access Method</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>file:///</literal></entry>
+ <entry>direct repository access (on local disk)</entry>
+ </row>
+ <row>
+ <entry><literal>http://</literal></entry>
+ <entry>access via WebDAV protocol to Subversion-aware
+ Apache server</entry>
+ </row>
+ <row>
+ <entry><literal>https://</literal></entry>
+ <entry>same as <literal>http://</literal>, but with
+ SSL encryption.</entry>
+ </row>
+ <row>
+ <entry><literal>svn://</literal></entry>
+ <entry>access via custom protocol to an
+ <literal>svnserve</literal> server</entry>
+ </row>
+ <row>
+ <entry><literal>svn+ssh://</literal></entry>
+ <entry>same as <literal>svn://</literal>, but through
+ an SSH tunnel.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>For more information on how Subversion parses URLs, see
+ <xref linkend="svn.advanced.reposurls"/>. For more
+ information on the different types of network servers
+ available for Subversion, see
+ <xref linkend="svn.serverconfig"/>.</para>
+
+ </sidebar>
</sect2>
@@ -593,8 +592,8 @@
<para>An <command>svn commit</command> operation publishes
changes to any number of files and directories as a single
atomic transaction. In your working copy, you can change
- files' contents, create, delete, rename and copy files and
- directories, and then commit a complete set of changes as an
+ files' contents; create, delete, rename and copy files and
+ directories; then commit a complete set of changes as an
atomic transaction.</para>
<para>By <quote>atomic transaction</quote>, we mean simply this:
@@ -892,7 +891,7 @@
contained in a subdirectory, or perhaps you'd like to figure
out when a bug first came into existence in a specific file.
This is the <quote>time machine</quote> aspect of a version
- control system — the feature which allows you to move
+ control system—the feature which allows you to move
any portion of your working copy forward and backward in
history.</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 Sun Aug 12 22:23:03 2007
@@ -125,7 +125,7 @@
</screen>
<para>You'll learn more about tags and branches in <xref
- linkend="svn.branchmerge"/>. For details and how to setup
+ linkend="svn.branchmerge"/>. For details and how to set up
multiple projects, see <xref
linkend="svn.branchmerge.maint.layout"/> and <xref
linkend="svn.reposadmin.projects.chooselayout"/> to read more
@@ -210,7 +210,7 @@
URL:</para>
<screen>
-$ svn checkout -r 8810 \
+$ svn checkout \
http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/
A cmdline/revert_tests.py
A cmdline/diff_tests.py
@@ -223,15 +223,14 @@
<para>Since Subversion uses a <quote>copy-modify-merge</quote>
model instead of <quote>lock-modify-unlock</quote> (see <xref
- linkend="svn.basic.vsn-models"/>), you're already able to start
+ linkend="svn.basic.vsn-models"/>), you can start right in
making changes to the files and directories in your working
copy. Your working copy is just like any other collection of
files and directories on your system. You can edit and change
them, move them around, you can even delete the entire working
copy and forget about it.</para>
- <note>
-
+ <warning>
<para>While your working copy is <quote>just like any other
collection of files and directories on your system</quote>,
you can edit files at will, but you must tell Subversion
@@ -241,11 +240,12 @@
<command>svn move</command> instead of the copy and move
commands provided by your operating system. We'll talk more
about them later in this chapter.</para>
- </note>
+ </warning>
- <para>Unless you're ready to commit a new file or directory, or
- changes to existing ones, there's no need to further notify the
- Subversion server that you've done anything.</para>
+ <para>Unless you're ready to commit the addition of a new file or
+ directory, or changes to existing ones, there's no need to
+ further notify the Subversion server that you've done
+ anything.</para>
<sidebar>
<title>What's with the <filename>.svn</filename> directory?</title>
@@ -258,6 +258,13 @@
change anything in the administrative area! Subversion
depends on it to manage your working copy.</para>
+ <para>If you accidentally remove the <filename>.svn</filename>
+ subdirectory, the easiest way to fix the problem is to remove
+ the entire containing directory (a normal system deletion,
+ not <command>svn delete</command>), then run <command>svn
+ update</command> from a parent directory. The Subversion
+ client will re-download the directory you've deleted, with a
+ new <filename>.svn</filename> area as well.</para>
</sidebar>
<para>While you can certainly check out a working copy with the
@@ -266,7 +273,7 @@
copy in the new directory that you name. For example:</para>
<screen>
-$ svn -r 8810 checkout http://svn.collab.net/repos/svn/trunk subv
+$ svn checkout http://svn.collab.net/repos/svn/trunk subv
A subv/Makefile.in
A subv/ac-helpers
A subv/ac-helpers/install.sh
@@ -288,14 +295,17 @@
<para>When you perform a Subversion operation that requires you
to authenticate, by default Subversion caches your
- authentication credentials on disk. 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> you can disable caching
- either permanently or on a case-by-case basis.</para>
+ 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>
+ you can disable caching either permanently or on a
+ case-by-case basis.</para>
<para>To disable password caching for a particular one-time
command, pass the <option >--no-auth-cache</option > switch on
@@ -438,7 +448,7 @@
to each item to let you know what actions Subversion performed
to bring your working copy up-to-date. To find out what these
letters mean, see <xref linkend
- ="svn.ref.svn.c.update"/></para>
+ ="svn.ref.svn.c.update"/>.</para>
</sect2>
@@ -467,8 +477,8 @@
text files—and just as efficiently too. For tree
changes, you can ask Subversion to <quote>mark</quote> files
and directories for scheduled removal, addition, copying, or
- moving. While these changes may take place immediately in
- your working copy, no additions or removals will happen in the
+ moving. These changes may take place immediately in your
+ working copy, but no additions or removals will happen in the
repository until you commit them.</para>
<para>Here is an overview of the five Subversion subcommands
@@ -487,9 +497,9 @@
<para>When a symlink is committed into a Subversion
repository, Subversion remembers that the file was in fact a
- symlink, as well as to what object the symlink
+ symlink, as well as the object to which the symlink
<quote>points</quote>. When that symlink is checked out to
- another working copy on a supporting system, Subversion
+ another working copy on a non-Windows system, Subversion
reconstructs a real filesystem-level symbolic link from the
versioned symlink. But that doesn't in any way limit the
usability of working copies on systems such as Windows which
@@ -528,14 +538,16 @@
If <filename>foo</filename> is a directory, it is not
deleted, but Subversion schedules it for deletion. When
you commit your changes, <filename>foo</filename> will
- be removed from your working copy and the repository.
+ 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) a revision earlier than the one in
- which you deleted it. Also see <xref
- linkend="svn.branchmerge.commonuses.resurrect"/>></para></footnote></para>
+ your working copy to) a revision earlier than the one in
+ which you deleted it. Also see
+ <xref linkend="svn.branchmerge.commonuses.resurrect"/>.
+ </para></footnote></para>
</listitem>
</varlistentry>
@@ -623,11 +635,11 @@
<sidebar>
<title>Look Ma! No Network!</title>
- <para>The commands (<command>svn status</command>,
+ <para>The commands <command>svn status</command>,
<command>svn diff</command>, and <command>svn
- revert</command>) can be used without any network access
- (assuming, of course, that your repository is across the
- network and not local). This makes it easy to manage your
+ revert</command> can be used without any network access even
+ if your repository <emphasis>is</emphasis> across the
+ 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
@@ -654,7 +666,7 @@
<para>Subversion has been optimized to help you with this task,
and is able to do many things without communicating with the
repository. In particular, your working copy contains a
- secret cached <quote>pristine</quote> copy of each version
+ hidden cached <quote>pristine</quote> copy of each version
controlled file within the <filename>.svn</filename> area.
Because of this, Subversion can quickly show you how your
working files have changed, or even allow you to undo your
@@ -780,16 +792,15 @@
</screen>
<para>This is the <quote>long form</quote> output of
- <command>svn status</command>. The first column remains the
- same, but the second column shows the working-revision of
- the item. The third and fourth columns show the revision in
- which the item last changed, and who changed it (these
- columns are not to be confused with the columns of
- characters that we just discussed).</para>
-
- <para>None of the above invocations to <command>svn
- status</command> contact the repository, they work only
- locally by comparing the metadata in the
+ <command>svn status</command>. The leters in the first
+ column mean the same as before, but the second column shows
+ the working-revision of the item. The third and fourth
+ columns show the revision in which the item last changed,
+ and who changed it.</para>
+
+ <para>None of the prior invocations to <command>svn
+ status</command> contact the repository—instead, they
+ compare the metadata in the
<filename>.svn</filename> directory with the working copy.
Finally, there is the <option>--show-updates (-u)</option>
option, which contacts the repository and adds information
@@ -814,7 +825,7 @@
commit, or the repository will reject your commit for being
out-of-date. (More on this subject later.)</para>
- <para><command>svn status</command> displays much more
+ <para><command>svn status</command> can display much more
information about the files and directories in your
working copy than we've shown here—for an exhaustive
description of svn status and its output, see <xref
@@ -830,8 +841,8 @@
<command>svn diff</command> command. You can find out
<emphasis>exactly</emphasis> how you've modified things by
running <command>svn diff</command> with no arguments, which
- prints out file changes in unified diff
- format:</para>
+ prints out file changes in <firstterm>unified diff
+ format</firstterm>:</para>
<screen>
$ svn diff
@@ -882,11 +893,11 @@
scheduled for deletion are displayed as all deleted
text.</para>
- <para>Output is displayed in <firstterm>unified diff
- format</firstterm>. That is, removed lines are prefaced
- with a <literal>-</literal> and added lines are prefaced
- with a <literal>+</literal>. <command>svn diff</command>
- also prints filename and offset information useful to the
+ <para>Output is displayed in unified diff format. That is,
+ removed lines are prefaced with <literal>-</literal> and
+ added lines are prefaced with
+ <literal>+</literal>. <command>svn diff</command> also
+ prints filename and offset information useful to the
<command>patch</command> program, so you can generate
<quote>patches</quote> by redirecting the diff output to a
file:</para>
@@ -1015,9 +1026,9 @@
changes.</para>
<para>But the <computeroutput>C</computeroutput> stands for
- conflict. This means that the changes from the server overlapped
- with your own, and now you have to manually choose between
- them.</para>
+ <computeroutput>c</computeroutput>onflict. This means that the
+ changes from the server overlapped with your own, and now you
+ have to manually choose between them.</para>
<para>Whenever a conflict occurs, three things typically occur
to assist you in noticing and resolving that conflict:</para>
@@ -1359,7 +1370,7 @@
decide that you want to cancel your commit, you can just
quit your editor without saving changes. If you've already
saved your commit message, simply delete the text, save
- again, then quit.</para>
+ again, then abort.</para>
<screen>
$ svn commit
@@ -1387,6 +1398,10 @@
…
</screen>
+ <para>(The exact wording of this error message depends on the
+ network protocol and server you're using, but the idea is the
+ same in all cases.)</para>
+
<para>At this point, you need to run <command>svn
update</command>, deal with any merges or conflicts that
result, and attempt your commit again.</para>
@@ -1396,7 +1411,7 @@
to manage your repository and working copy, but most of your
day-to-day use of Subversion will involve only the commands
that we've discussed so far in this chapter. We will,
- however, cover a few more commands that you'll use just fairly
+ however, cover a few more commands that you'll use fairly
often.</para>
</sect2>
@@ -1443,9 +1458,8 @@
<varlistentry>
<term><command>svn cat</command></term>
<listitem>
- <para>This is used to retrieve any file as it existed in a
- particular revision number and display it on your
- screen.</para>
+ <para>Retrieves a file as it existed in a particular
+ revision number and display it on your screen.</para>
</listitem>
</varlistentry>
@@ -1591,15 +1605,15 @@
<itemizedlist>
<listitem>
- <para>Examine local changes</para>
+ <para>Examining local changes</para>
</listitem>
<listitem>
- <para>Compare your working copy to the repository</para>
+ <para>Comparing your working copy to the repository</para>
</listitem>
<listitem>
- <para>Compare repository to repository</para>
+ <para>Comparing repository to repository</para>
</listitem>
</itemizedlist>
@@ -1700,13 +1714,9 @@
$
</screen>
- <para>Not only can you use <command>svn diff</command> to
- compare files in your working copy to the repository, but if
- you supply a URL argument, you can examine the differences
- between items in the repository without even having a
- working copy. This is especially useful if you wish to
- inspect changes in a file when you don't have a working copy
- on your local machine:</para>
+ <para>Lastly, you can compare repository revisions even when
+ you don't have a working copy on your local machine, just by
+ including the appropriate URL on the command line:</para>
<screen>
$ svn diff -c 5 http://svn.example.com/repos/example/trunk/text/rules.txt
@@ -1823,7 +1833,7 @@
…
</screen>
- <warning>
+ <tip>
<para>Many Subversion newcomers attempt to use the above
<command>svn update</command> example to <quote>undo</quote>
committed changes, but this won't work as you can't commit
@@ -1831,13 +1841,15 @@
the changed files have newer revisions. See <xref
linkend="svn.branchmerge.commonuses.resurrect"/> for a
description of how to <quote>undo</quote> a commit.</para>
- </warning>
+ </tip>
<para>Lastly, if you're building a release and wish to bundle up
- your files from Subversion but don't want those pesky .svn
- directories in the way, then you can use svn export to create
- a local copy of all or part of your repository sans .svn
- directories. As with <command>svn update</command> and
+ your files from Subversion but don't want those
+ pesky <filename>.svn</filename> directories in the way, then
+ you can use <command>svn export</command> to create a local
+ copy of all or part of your repository
+ sans <filename>.svn</filename> directories. As
+ with <command>svn update</command> and
<command>svn checkout</command>, you can also pass the
<option>--revision</option> switch to <command>svn
export</command>:</para>
@@ -1859,7 +1871,7 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.tour.cleanup">
- <title>Sometimes You Just Need to Cleanup</title>
+ <title>Sometimes You Just Need to Clean Up</title>
<para>When Subversion modifies your working copy (or any
information within <filename>.svn</filename>), it tries to do
@@ -1867,7 +1879,7 @@
Subversion writes its intentions to a log file. Next it
executes the commands in the log file to apply the requested
change, holding a lock on the relevant part of the working
- copy while it works — to prevent other Subversion clients
+ copy while it works—to prevent other Subversion clients
from accessing the working copy in mid-change. Finally,
Subversion removes the log file. Architecturally, this is
similar to a journaled filesystem. If a Subversion operation
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 Sun Aug 12 22:23:03 2007
@@ -926,7 +926,7 @@
it, this RFC describes the concept of media types and
subtypes, and recommends a syntax for the representation of
those types. Today, MIME media types—or, MIME
- types— are used almost universally across e-mail
+ types—are used almost universally across e-mail
applications, Web servers, and other software as the de
facto mechanism for clearing up the file content
confusion.</para>
@@ -2594,7 +2594,7 @@
to give the project a name.
<footnote>
<para><quote>You're not supposed to name it. Once you name it,
- you start getting attached to it.</quote> — Mike
+ you start getting attached to it.</quote>—Mike
Wazowski</para>
</footnote>
Let's say you called your software Frabnaggilywort. At this
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 Sun Aug 12 22:23:03 2007
@@ -1051,7 +1051,7 @@
file. This can lead to problems, especially because the
same thing happens with renamed files. A lesser-known fact
about Subversion is that it lacks <quote>true
- renames</quote> — the <command>svn move</command>
+ renames</quote>—the <command>svn move</command>
command is nothing more than an aggregation of <command>svn
copy</command> and <command>svn delete</command>.</para>
@@ -1077,7 +1077,7 @@
operation has deleted the latest version
of <filename>integer.c</filename> file (the one containing
Sally's latest changes), and blindly added your
- new <filename>whole.c</filename> file — which is a
+ new <filename>whole.c</filename> file—which is a
duplicate of the <emphasis>older</emphasis> version
of <filename>integer.c</filename>. The net effect is that
merging your <quote>rename</quote> to the branch has removed
@@ -1414,8 +1414,8 @@
particular revision tree, and the second coordinate is a path
within that tree. So every version of your file or directory
can be defined by a specific coordinate pair. (Remember the
- familiar <quote>peg revision</quote> syntax — foo.c at 224
- — mentioned back in
+ familiar <quote>peg revision</quote> syntax—foo.c at 224
+ —mentioned back in
<xref linkend="svn.advanced.pegrevs"/>.) </para>
<para>First, you might need to use <command>svn log</command> to
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 Sun Aug 12 22:23:03 2007
@@ -409,7 +409,7 @@
<xref linkend="svn.serverconfig.multimethod"/>.) Note
that this is also one of the reasons we warn against
accessing repositories via <literal>svn+ssh://</literal>
- URLs — from a security standpoint, it's effectively
+ URLs—from a security standpoint, it's effectively
the same as local users accessing
via <literal>file://</literal>, and can entail all the
same problems if the administrator isn't careful.</para>
@@ -2090,7 +2090,7 @@
the <quote>default</quote> MIME type,
typically <literal>text/plain</literal>. This can be
frustrating, however, if a user wishes repository files to
- render as something more meaningful — for example,
+ render as something more meaningful—for example,
it might be nice to have a <filename>foo.html</filename> file
in the repository actually render as HTML when
browsing.</para>
@@ -2221,7 +2221,7 @@
even the simplest Subversion client operation generates
multiple network requests. It's very difficult to look at
the <filename>access_log</filename> and deduce what the
- client was doing — most operations look like a series
+ client was doing—most operations look like a series
of cryptic <literal>PROPPATCH</literal>, <literal>GET</literal>,
<literal>PUT</literal>, and <literal>REPORT</literal>
requests. To make things worse, many client operations send
More information about the svnbook-dev
mailing list