[svnbook commit] r2843 - trunk/src/en/book
C. Michael Pilato
cmpilato at red-bean.com
Mon Aug 13 09:33:54 CDT 2007
fitz wrote:
> Author: fitz
> Date: Mon Aug 13 00:16:25 2007
> New Revision: 2843
>
> Log:
> Fix Issue #65. Eric's review was *awesome*.
>
> * src/en/book/ch09-reference.xml: Incorporate the mega-review changes
> from Eric Hanchrow (offby1) into th book
>
>
> Modified:
> trunk/src/en/book/ch09-reference.xml
>
> Modified: trunk/src/en/book/ch09-reference.xml
> ==============================================================================
> --- trunk/src/en/book/ch09-reference.xml (original)
> +++ trunk/src/en/book/ch09-reference.xml Mon Aug 13 00:16:25 2007
> @@ -75,12 +75,13 @@
> <listitem>
> <para>Specifies an external program to use to show
> differences between files. When <command>svn
> - diff</command> is invoked, it uses Subversion's internal
> - diff engine, which provides unified diffs by default.
> - If you want to use an external diff program, use
> - <option>--diff-cmd</option>. You can pass switches to
> - the diff program with the <option>--extensions</option>
> - switch (more on that later in this section).</para>
> + diff</command> is invoked without this option, it uses
> + Subversion's internal diff engine, which provides
> + unified diffs by default. If you want to use an
> + external diff program, use <option>--diff-cmd</option>.
> + You can pass switches to the diff program with the
> + <option>--extensions</option> switch (more on that later
> + in this section).</para>
The parenthetical "more on that later in this section" doesn't really jiv
with any of American English's grammar rules. :-) Suggest: "(which we'll
discuss later in this section)".
> @@ -143,8 +146,12 @@
> <replaceable>FILENAME</replaceable>
> </term>
> <listitem>
> - <para>Uses the contents of the file passed as an argument
> - to this switch for the specified subcommand.</para>
> + <para>Uses the contents of the named file for the
> + specified subcommand, however, different subcommands do
s/however, /though /
> + different things with this content—for example,
s/—f/. F/
> - <para>This imports the local directory <filename>myproj</filename>
> - into <filename>trunk/misc</filename> in your repository. The
> - directory <filename>trunk/misc</filename> need not exist before
> - you import into it—<command>svn import</command> will
> - recursively create directories for you:</para>
> + <para>Be aware that this will <emphasis>not</emphasis>
> + create a directory named <filename>myproj</filename> in
> + the repository. If that's what you want, simply add
> + <filename>myproj</filename> to the end of the
> + URL:</para>
Oops -- indentation got horked here.
> @@ -5281,8 +5344,13 @@
> <para>Run this command if you wish to verify the integrity
> of your repository. This basically iterates through all
> revisions in the repository by internally dumping all
> - revisions and discarding the output.</para>
> - </refsect1>
> + revisions and discarding the output—it's a good idea
> + to run this on a regular basis to guard against latent
> + hard disk failures and <quote>bitrot</quote>. If this
> + command fails, that means that your repository has at
> + least one corrupted revision and you should restore the
> + corrupted revision from a backup (you did make a backup,
> + didn't you?).</para> </refsect1>
Nit: Bring that </refsect1> tag back down.
> @@ -6303,8 +6379,9 @@
> <term><option>--listen-port</option>=<replaceable>PORT</replaceable></term>
> <listitem>
> <para>Causes svnserve to listen on
> - <replaceable>PORT</replaceable> when run in daemon
> - mode.</para>
> + <replaceable>PORT</replaceable> when run in daemon mode
> + (FreeBSD daemons only listen on tcp6 by default—this
> + option tells them to also listen on tcp4).</para>
s/mode (FreeBSD/mode. (FreeBSD/
s/tcp4)./tcp4.)/
--
C. Michael Pilato <cmpilato at red-bean.com>
"The Christian ideal has not been tried and found wanting. It has
been found difficult; and left untried." -- G. K. Chesterton
More information about the svnbook-dev
mailing list