[svnbook commit] r3524 - Stylistic changes across a few files...

codesite-noreply at google.com codesite-noreply at google.com
Tue May 26 10:18:58 CDT 2009


Author: julianfoad at btopenworld.com
Date: Tue May 26 08:17:39 2009
New Revision: 3524

Modified:
    trunk/src/en/book/appb-svn-for-cvs-users.xml
    trunk/src/en/book/appc-webdav.xml
    trunk/src/en/book/ch00-preface.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/ch09-reference.xml

Log:
Stylistic changes across a few files...

* src/en/book/appb-svn-for-cvs-users.xml,
   src/en/book/appc-webdav.xml,
   src/en/book/ch00-preface.xml,
   src/en/book/ch02-basic-usage.xml,
   src/en/book/ch03-advanced-topics.xml,
   src/en/book/ch04-branching-and-merging.xml,
   src/en/book/ch05-repository-admin.xml,
   src/en/book/ch06-server-configuration.xml,
   src/en/book/ch09-reference.xml:
     Add an extra space after sentences.
     Remove spaces around —.
     Add (<option>-SHORTOPTION</option>) where appropriate.
     Wrap quotes in <quote/> tags.
     Fix command line examples to use " instead of ', per HACKING.
     Use short option for command line examples, per HACKING.
     Add options that were missing in reference.
     Make the ARGs in options section standard across rest of reference  
chapter.
     Use full subcommand name (e.g. copy instead of cp, etc).
     Add svnadmin pack stub in reference.

Patch by: Larry Shatzer, Jr. <larrys {_AT_} gmail.com>


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	Tue May 26 08:17:39 2009
@@ -49,11 +49,11 @@
        whereas in Subversion, a tag or branch is a copy of an entire
        tree (by convention, into the <filename>/branches</filename>
        or <filename>/tags</filename> directories that appear at the top
-      level of the repository, beside <filename>/trunk</filename>). In
+      level of the repository, beside <filename>/trunk</filename>).  In
        the repository as a whole, many versions of each file may be
        visible: the latest version on each branch, every tagged
        version, and of course the latest version on the trunk
-      itself. So, to refine the terms even further, one would often
+      itself.  So, to refine the terms even further, one would often
        say <quote><filename>foo.c</filename> as it appears in
        <filename>/branches/REL1</filename> in revision
        5.</quote></para>

Modified: trunk/src/en/book/appc-webdav.xml
==============================================================================
--- trunk/src/en/book/appc-webdav.xml	(original)
+++ trunk/src/en/book/appc-webdav.xml	Tue May 26 08:17:39 2009
@@ -195,7 +195,7 @@
        any application.  One remedy is to have a sysadmin (or other
        Subversion-knowledgeable person) check out a working copy and
        manually set the <literal>svn:mime-type</literal> property on
-      necessary files. But there's potentially no end to such cleanup
+      necessary files.  But there's potentially no end to such cleanup
        tasks.  Instead, you can use the
        <literal>ModMimeUsePathInfo</literal> directive in your
        Subversion <literal><Location></literal> block:</para>

Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml	(original)
+++ trunk/src/en/book/ch00-preface.xml	Tue May 26 08:17:39 2009
@@ -704,7 +704,7 @@

        <para>Gavin, you're able to read half of the words in this book
          yourself now; sadly, it's the other half that provide the key
-        concepts.  And sorry, Aidan — I couldn't find a way to
+        concepts.  And sorry, Aidan—I couldn't find a way to
          work Disney/Pixar characters into the text.  But Daddy loves
          you both, and can't wait to teach you about programming.</para>

@@ -783,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— working on a development team 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/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml	(original)
+++ trunk/src/en/book/ch02-basic-usage.xml	Tue May 26 08:17:39 2009
@@ -326,7 +326,7 @@
          to authenticate, by default Subversion tries to cache your
          authentication credentials on disk in encrypted form.
          On some systems, Subversion may be unable to encrypt your
-        authentication data. You will then be asked whether you
+        authentication data.  You will then be asked whether you
          want to cache your credentials to disk in plaintext.
          You can choose to do so for convenience so that you don't have
          to continually reenter your password for future operations.
@@ -351,7 +351,7 @@
          in encrypted form or not.</para>

        <para>To disable password caching entirely for a particular one-time
-        command, pass the <option >--no-auth-cache</option > option on
+        command, pass the <option>--no-auth-cache</option> option on
          the command line.  To permanently disable caching entirely,
          you can add the line <literal>store-passwords = no</literal>
          to your local machine's Subversion configuration file.  See <xref
@@ -589,7 +589,7 @@
                    <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
+                  than the one in which you deleted it.  Also see <xref
                    linkend="svn.branchmerge.basicmerging.resurrect"
                    />.</para>
                </footnote>
@@ -973,7 +973,7 @@
            (<option>-x</option>) option.  For example, to see local
            differences in file <filename>foo.c</filename> in context
            output format while ignoring case differences, you might run
-          <userinput>svn diff --diff-cmd /usr/bin/diff --extensions '-i'
+          <userinput>svn diff --diff-cmd /usr/bin/diff -x "-i"
            foo.c</userinput>.</para>

        </sect3>
@@ -1632,7 +1632,7 @@
          describing your change.  Your log message will be attached to
          the new revision you create.  If your log message is brief,
          you may wish to supply it on the command line using the
-        <option>--message</option> (or <option>-m</option>)
+        <option>--message</option> (<option>-m</option>)
          option:</para>

        <screen>
@@ -1859,7 +1859,7 @@
          <option>--verbose</option> (<option>-v</option>) option.
          Because Subversion allows you to move and copy files and
          directories, it is important to be able to track path changes
-        in the filesystem. So, in verbose mode, <command>svn
+        in the filesystem.  So, in verbose mode, <command>svn
          log</command> will include a list of changed paths in a
          revision in its output:</para>

@@ -2288,21 +2288,21 @@
      <title>Dealing with Structural Conflicts</title>

        <para>So far, we have only talked about conflicts at the level
-        of file content. When you and your collaborators make overlapping
+        of file content.  When you and your collaborators make overlapping
          changes within the same file, Subversion forces you to merge those
          changes before you can commit.<footnote><para>Well, you could mark
          files containing conflict markers as resolved and commit them,
-        if you really wanted to. But this is rarely done in  
practice.</para>
+        if you really wanted to.  But this is rarely done in  
practice.</para>
          </footnote></para>

        <para>But what happens if your collaborators move or delete a file
          that you are still working on? Maybe there was a miscommunication,
          and one person thinks the file should be deleted, while another
-        person still wants to commit changes to the file. Or maybe your
+        person still wants to commit changes to the file.  Or maybe your
          collaborators did some refactoring, renaming files and moving
-        around directories in the process. If you were still working on
+        around directories in the process.  If you were still working on
          these files, those modifications may need to be applied to the
-        files at their new location. Such conflicts manifest themselves at
+        files at their new location.  Such conflicts manifest themselves at
          the directory tree structure level rather than at the file content
          level, and are known as <firstterm>tree  
conflicts</firstterm>.</para>

@@ -2310,7 +2310,7 @@
          <title>Tree conflicts prior to Subversion 1.6</title>

          <para>Prior to Subversion 1.6, tree conflicts could yield
-          rather unexpected results. For example, if a file was
+          rather unexpected results.  For example, if a file was
            locally modified, but had been renamed in the repository,
            running <command>svn update</command> would make Subversion
            carry out the following steps:</para>
@@ -2321,7 +2321,7 @@

            <listitem><para>Delete the file at its old location, and
              if it had local modifications, keep an on-disk copy
-            of the file at the old location. This on-disk copy
+            of the file at the old location.  This on-disk copy
              now appears as an unversioned file in the working
              copy.</para></listitem>

@@ -2412,7 +2412,7 @@
   }
  </screen>

-      <para>Your changes are all based on revision 4. They cannot be
+      <para>Your changes are all based on revision 4.  They cannot be
          committed because Harry has already checked in revision 5:</para>

        <screen>
@@ -2463,7 +2463,7 @@
          can warn you about is an incoming delete operation on a locally
          modified file.
          This delete operation <emphasis>may</emphasis> be part of a move,
-        or it could be a genuine delete operation. Talking to your
+        or it could be a genuine delete operation.  Talking to your
          collaborators, or, as a last resort, <command>svn log</command>,
          is a good way to find out what has actually happened.</para>

@@ -2471,7 +2471,7 @@
          are reported as locally modified in the output of
          <command>svn status</command>.  You made the changes to
          <filename>foo.c</filename> yourself, so this should not be
-        surprising. But why is <filename>baz.c</filename> reported as
+        surprising.  But why is <filename>baz.c</filename> reported as
          locally modified?</para>

        <para>
@@ -2501,7 +2501,7 @@
            which it was last modified before being moved in the repository.
            Otherwise, Subversion will resort to retreiving
            <filename>baz.c</filename> from the repository, and will not
-          try to transfer your local modifications to it. You will have
+          try to transfer your local modifications to it.  You will have
            to do so manually.
          </para>
        </warning>
@@ -2518,7 +2518,7 @@
  </screen>

        <para>So how can this conflict be resolved? You can either agree
-        or disagree with the move Harry made. In case you agree, you can
+        or disagree with the move Harry made.  In case you agree, you can
          delete <filename>bar.c</filename> and mark the tree conflict as
          resolved:</para>

@@ -2557,7 +2557,7 @@
        <para>If you do not agree with the move, you can delete
          <filename>baz.c</filename> instead, after making sure any
          changes made to it after it was renamed are either preserved
-        or not worth keeping. Do not forget to revert the changes
+        or not worth keeping.  Do not forget to revert the changes
          Harry made to the <filename>Makefile</filename>.
          Since <filename>bar.c</filename> is already scheduled for
          re-addition, there is nothing else left to do, and the conflict

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	Tue May 26 08:17:39 2009
@@ -431,8 +431,8 @@

          <para>Trying to locate a custom revision property generally
            involves performing a linear walk across all the revisions
-          of the repository, asking of each revision, "Do you have the
-          property I'm looking for?"  Trying to find a custom
+          of the repository, asking of each revision, <quote>Do you have  
the
+          property I'm looking for?</quote>  Trying to find a custom
            versioned property is painful, too, and often involves a
            recursive <command>svn propget</command> across an entire
            working copy.  In your situation, that might not be as bad
@@ -507,7 +507,7 @@
          (<literal>.</literal>).
            <footnote>
              <para>If you're familiar with XML, this is pretty much the
-            ASCII subset of the syntax for XML "Name".</para>
+            ASCII subset of the syntax for XML <quote>Name</quote>.</para>
            </footnote>
        </para>

@@ -600,7 +600,7 @@
          <emphasis>not</emphasis> yield the desired effect:</para>

        <screen>
-$ svn propset license '' calc/button.c
+$ svn propset license "" calc/button.c
  property 'license' set on 'calc/button.c'
  $ svn proplist -v calc/button.c
  Properties on 'calc/button.c':
@@ -646,7 +646,7 @@
          <command>svn propset</command> command with no target path:</para>

        <screen>
-$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop
+$ svn propset svn:log "* button.c: Fix a compiler warning." -r11 --revprop
  property 'svn:log' set on repository revision '11'
  $
  </screen>
@@ -656,7 +656,7 @@
          providing the repository's root URL:</para>

        <screen>
-$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop  
\
+$ svn propset svn:log "* button.c: Fix a compiler warning." -r11 --revprop  
\
                http://svn.example.com/repos/project
  property 'svn:log' set on repository revision '11'
  $
@@ -1960,7 +1960,7 @@
          value:</para>

        <screen>
-$ svn info mom-immediates | grep '^Depth:'
+$ svn info mom-immediates | grep "^Depth:"
  Depth: immediates
  $
  </screen>
@@ -2466,7 +2466,7 @@

        <para>When a commit fails due to someone else's locks, it's
          fairly easy to learn about them.  The easiest way is to run
-        <userinput>svn status --show-updates</userinput>:</para>
+        <userinput>svn status -u</userinput>:</para>

        <screen>
  $ svn status -u
@@ -2699,7 +2699,7 @@
        <para>For example, suppose Harry locks an image file and then
          begins editing it.  Meanwhile, miles away, Sally wants to do
          the same thing.  She doesn't think to run <userinput>svn status
-        --show-updates</userinput>, so she has no idea that Harry has
+        -u</userinput>, so she has no idea that Harry has
          already locked the file.  She spends hours editing the file,
          and when she tries to commit her change, she discovers that
          either the file is locked or that she's out of date.
@@ -3879,7 +3879,7 @@
          <listitem>
            <para>On Windows, the Subversion client stores passwords
              in the <filename>%APPDATA%/Subversion/auth/</filename>
-            directory. On Windows 2000 and later, the standard Windows
+            directory.  On Windows 2000 and later, the standard Windows
              cryptography services are used to encrypt the password
              on disk.  Because the encryption key is managed
              by Windows and is tied to the user's own login

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	Tue May 26 08:17:39  
2009
@@ -1704,7 +1704,7 @@
          the change wasn't actually merged, it just wasn't wanted.
          There's no way to ask Subversion for a list of <quote>blocked
          changelists.</quote> If you want to track them (so that you
-        can unblock them someday). you'll need to record them in a
+        can unblock them someday) you'll need to record them in a
          text file somewhere, or perhaps in an invented property.  In
          Subversion 1.5, unfortunately, this is the only way to manage
          blocked revisions; the plans are to make a better interface
@@ -2870,7 +2870,7 @@
        <screen>
  $ svn import /path/to/libcomplex-1.0 \
               http://svn.example.com/repos/vendor/libcomplex/current \
-             -m 'importing initial 1.0 vendor drop'
+             -m "importing initial 1.0 vendor drop"
  …
  </screen>

@@ -2887,11 +2887,11 @@
        <screen>
  $ svn copy http://svn.example.com/repos/vendor/libcomplex/current  \
             http://svn.example.com/repos/vendor/libcomplex/1.0      \
-           -m 'tagging libcomplex-1.0'
+           -m "tagging libcomplex-1.0"
  …
  $ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0  \
             http://svn.example.com/repos/calc/libcomplex        \
-           -m 'bringing libcomplex-1.0 into the main branch'
+           -m "bringing libcomplex-1.0 into the main branch"
  …
  </screen>

@@ -2959,7 +2959,7 @@
              ^/vendor/libcomplex/current  \
              libcomplex
  … # resolve all the conflicts between their changes and our changes
-$ svn commit -m 'merging libcomplex-1.1 into the main branch'
+$ svn commit -m "merging libcomplex-1.1 into the main branch"
  …
  </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	Tue May 26 08:17:39 2009
@@ -844,7 +844,7 @@

        <para>Present in the <filename>db/</filename> subdirectory of
          your repository is the implementation of the versioned
-        filesystem. Your new repository's versioned filesystem begins
+        filesystem.  Your new repository's versioned filesystem begins
          life at revision 0, which is defined to consist of nothing but
          the top-level root (<filename>/</filename>) directory.
          Initially, revision 0 also has a single revision property,
@@ -1265,7 +1265,7 @@
          <screen>
  $ svndumpfilter help
  general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]
-Type "svndumpfilter help <subcommand>" for help on a specific  
subcommand.
+Type 'svndumpfilter help <subcommand>' for help on a specific  
subcommand.
  Type 'svndumpfilter --version' to see the program version.

  Available subcommands:
@@ -1741,7 +1741,7 @@

          <para>To solve these problems, Subversion 1.6 introduced the
            <command>svnadmin pack</command> command.  By concatenating
-          all the files of a completed shard into a single "pack" file
+          all the files of a completed shard into a single  
<quote>pack</quote> file
            and then removing the original per-revision
            files, <command>svnadmin pack</command> reduces the file
            count within a given shard down to just a single file.  In

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	Tue May 26 08:17:39 2009
@@ -65,7 +65,7 @@
        user spawn a private, temporary <command>svnserve</command>
        process, it's equivalent (from a permissions point of view) to
        allowing a group of local users to all access the repository
-      via <literal>file://</literal> URLs. Path-based access control
+      via <literal>file://</literal> URLs.  Path-based access control
        has no meaning, since each user is accessing the repository
        database files directly.</para>

@@ -95,9 +95,9 @@

            <row>
              <entry>User account options</entry>
-            <entry>Private 'users' file, or other mechanisms
+            <entry>Private <quote>users</quote> file, or other mechanisms
              available to Apache httpd (LDAP, SQL, etc.)</entry>
-            <entry>Private 'users' file, or other mechanisms available
+            <entry>Private <quote>users</quote> file, or other mechanisms  
available
                to SASL (LDAP, SQL, etc.)</entry>
              <entry>System accounts</entry>
            </row>
@@ -1893,7 +1893,7 @@
  $ svn list https://host.example.com/repos/project

  Error validating server certificate for 'https://host.example.com:443':
- - The certificate is not issued by a trusted authority. Use the
+ - The certificate is not issued by a trusted authority.  Use the
     fingerprint to validate the certificate manually!
  Certificate information:
   - Hostname: host.example.com
@@ -3070,7 +3070,7 @@

      <para>This is a common setup; notice that no repository
        name is mentioned in the section name.  This makes all repositories
-      world-readable to all users. Once all users have read access to
+      world-readable to all users.  Once all users have read access to
        the repositories, you can give explicit
        <literal>rw</literal> permission to certain users on specific
        subdirectories within specific repositories.</para>
@@ -3279,7 +3279,7 @@
        won't necessarily be owned by that same group, which then
        creates more permissions problems for your users.  A good
        workaround is to set the group SUID bit on the
-      repository's <filename>db</filename> directory. This causes all
+      repository's <filename>db</filename> directory.  This causes all
        newly created log files to have the same group owner as the
        parent directory.</para>


Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml	(original)
+++ trunk/src/en/book/ch09-reference.xml	Tue May 26 08:17:39 2009
@@ -198,8 +198,8 @@
                unified diffs by default.  If you want to use an
                external diff program, use <option>--diff-cmd</option>.
                You can pass options to the diff program with the
-              <option>--extensions</option> option (more on that later
-              in this section).</para>
+              <option>--extensions</option> (<option>-x</option>)
+              option (more on that later in this section).</para>
            </listitem>
          </varlistentry>

@@ -244,7 +244,7 @@

          <varlistentry>
            <term><option>--extensions</option> (<option>-x</option>)
-          <replaceable>ARGS</replaceable></term>
+          <replaceable>ARG</replaceable></term>
            <listitem>
              <para>Specifies an argument or arguments that Subversion
                should pass to an external diff command.  This option is
@@ -487,8 +487,9 @@
          <varlistentry>
            <term><option>--record-only</option></term>
            <listitem>
-            <para>Marks revisions as merged (for use with
-              <option>--revision</option>).</para>
+            <para>Marks revisions as merged, for use with
+              <option>--revision</option>
+              (<option>-r</option>).</para>
            </listitem>
          </varlistentry>

@@ -867,7 +868,7 @@
  --extensions (-x) ARG
  --force
  --incremental
---revision (-r) ARG
+--revision (-r) REV
  --use-merge-history (-g)
  --verbose (-v)
  --xml
@@ -1087,7 +1088,7 @@
  --quiet (-q)
  --recursive (-R)
  --remove
---targets ARG
+--targets FILENAME
  </screen>
          </refsect1>

@@ -1098,7 +1099,7 @@
              commit only files in that changelist:</para>

            <screen>
-$ svn cl issue1729 foo.c bar.c baz.c
+$ svn changelist issue1729 foo.c bar.c baz.c
  Path 'foo.c' is now a member of changelist 'issue1729'.
  Path 'bar.c' is now a member of changelist 'issue1729'.
  Path 'baz.c' is now a member of changelist 'issue1729'.
@@ -1425,12 +1426,12 @@
            <screen>
  --changelist ARG
  --depth ARG
---editor-cmd ARG
+--editor-cmd CMD
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force-log
  --keep-changelists
---message (-m) TEXT
+--message (-m) MESSAGE
  --no-unlock
  --quiet (-q)
  --targets FILENAME
@@ -1595,11 +1596,12 @@
            <title>Options</title>

            <screen>
---editor-cmd EDITOR
+--editor-cmd CMD
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force-log
---message (-m) TEXT
+--ignore-externals
+--message (-m) MESSAGE
  --parents
  --quiet (-q)
  --revision (-r) REV
@@ -1625,7 +1627,7 @@
              subdirectory:</para>

            <screen>
-$ svn cp bat.c baz.c qux.c src
+$ svn copy bat.c baz.c qux.c src
  A         src/bat.c
  A         src/baz.c
  A         src/qux.c
@@ -1635,7 +1637,7 @@
              working copy under a different name:</para>

            <screen>
-$ svn cp -r 8 bat.c ya-old-bat.c
+$ svn copy -r 8 bat.c ya-old-bat.c
  A         ya-old-bat.c
  </screen>

@@ -1754,13 +1756,13 @@
            <title>Options</title>

            <screen>
---editor-cmd EDITOR
+--editor-cmd CMD
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force
  --force-log
  --keep-local
---message (-m) TEXT
+--message (-m) MESSAGE
  --quiet (-q)
  --targets FILENAME
  --with-revprop ARG
@@ -1906,16 +1908,19 @@
              N[:M]] --old=URL1 --new=URL2</userinput>.</para>

            <para>If <replaceable>TARGET</replaceable> is a URL, then
-            revs <literal>N</literal> and <literal>M</literal> can be  
given either via the
-            <option>--revision</option> option or by using the
+            revs <literal>N</literal> and <literal>M</literal> can be
+            given either via the
+            <option>--revision</option> (<option>-r</option>) option
+            or by using the
              <quote>@</quote> notation as described earlier.</para>

            <para>If <replaceable>TARGET</replaceable> is a working copy
              path, the default behavior (when no
-            <option>--revision</option> option is provided) is to
-            display the differences between the base and working
-            copies of <replaceable>TARGET</replaceable>.  If a
-            <option>--revision</option> option is specified in this
+            <option>--revision</option> (<option>-r</option>) option
+            is provided) is to display the differences between the
+            base and working copies
+            of <replaceable>TARGET</replaceable>.  If a
+            <option>--revision</option> (<option>-r</option>) option is  
specified in this
              scenario, though, it means:</para>

            <variablelist>
@@ -1985,7 +1990,7 @@
  --changelist ARG
  --depth ARG
  --diff-cmd CMD
---extensions (-x) "ARGS"
+--extensions (-x) ARG
  --force
  --new ARG
  --no-diff-deleted
@@ -2291,9 +2296,7 @@

          <refsect1>
            <title>Options</title>
-
-          <screen>
-</screen>
+          <para>None</para>
          </refsect1>
        </refentry>

@@ -2349,12 +2352,12 @@
            <screen>
  --auto-props
  --depth ARG
---editor-cmd EDITOR
+--editor-cmd CMD
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force
  --force-log
---message (-m) TEXT
+--message (-m) MESSAGE
  --no-auto-props
  --no-ignore
  --quiet (-q)
@@ -2695,7 +2698,7 @@
              <command>ls -l</command>:</para>

            <screen>
-$ svn list --verbose file:///var/svn/repos
+$ svn list -v file:///var/svn/repos
       16 sally         28361 Jan 16 23:18 README.txt
       27 sally             0 Jan 18 15:27 INSTALL
       24 harry               Jan 18 11:27 examples/
@@ -2782,10 +2785,10 @@

            <screen>
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force
  --force-log
---message (-m) TEXT
+--message (-m) MESSAGE
  --targets FILENAME
  </screen>
          </refsect1>
@@ -3232,7 +3235,7 @@
            <title>Options</title>

            <screen>
---accept ARG
+--accept ACTION
  --change (-c) REV
  --depth ARG
  --diff3-cmd CMD
@@ -3337,6 +3340,7 @@

            <screen>
  --revision (-r) REV
+--show-revs ARG
  </screen>
          </refsect1>

@@ -3410,11 +3414,11 @@
            <title>Options</title>

            <screen>
---editor-cmd EDITOR
+--editor-cmd CMD
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force-log
---message (-m) TEXT
+--message (-m) MESSAGE
  --parents
  --quiet (-q)
  --with-revprop ARG
@@ -3522,12 +3526,12 @@
            <title>Options</title>

            <screen>
---editor-cmd EDITOR
+--editor-cmd CMD
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force
  --force-log
---message (-m) TEXT
+--message (-m) MESSAGE
  --parents
  --quiet (-q)
  --revision (-r) REV
@@ -3660,7 +3664,7 @@
          <refnamediv>
            <refname>svn propedit</refname>
            <refpurpose>Edit the property of one or more items under
-            version control. See <xref
+            version control.  See <xref
              linkend="svn.ref.svn.c.propset"/> later in this  
chapter.</refpurpose>
          </refnamediv>
          <refsect1>
@@ -3698,12 +3702,12 @@
            <title>Options</title>

            <screen>
---editor-cmd EDITOR
+--editor-cmd CMD
  --encoding ENC
---file (-F) ARG
+--file (-F) FILENAME
  --force
  --force-log
---message (-m) ARG
+--message (-m) MESSAGE
  --revision (-r) REV
  --revprop
  --with-revprop ARG
@@ -3782,6 +3786,7 @@
  --revision (-r) REV
  --revprop
  --strict
+--verbose (-v)
  --xml
  </screen>
          </refsect1>
@@ -3903,7 +3908,7 @@
              values for the properties:</para>

            <screen>
-$ svn proplist --verbose foo.c
+$ svn proplist -v foo.c
  Properties on 'foo.c':
    svn:mime-type : text/plain
    svn:keywords : Author Date Rev
@@ -3989,7 +3994,7 @@
  --changelist ARG
  --depth ARG
  --encoding ENC
---file (-F) FILE
+--file (-F) FILENAME
  --force
  --quiet (-q)
  --recursive (-R)
@@ -4166,7 +4171,7 @@
            <title>Options</title>

            <screen>
---accept ARG
+--accept ACTION
  --depth ARG
  --quiet (-q)
  --recursive (-R)
@@ -4183,7 +4188,7 @@
              file <filename>foo.c</filename> with your edits:</para>

            <screen>
-$ svn up
+$ svn update
  Conflict discovered in 'foo.c'.
  Select: (p) postpone, (df) diff-full, (e) edit,
          (h) help for more options: p
@@ -4776,7 +4781,7 @@
              copy:</para>

            <screen>
-$ svn status --show-updates wc
+$ svn status -u wc
   M           965    wc/bar.c
         *     965    wc/foo.c
  A  +         965    wc/qax.c
@@ -4799,7 +4804,7 @@
              the status subcommand is as follows:</para>

            <screen>
-$ svn status --show-updates --verbose wc
+$ svn status -u -v wc
   M           965       938 sally        wc/bar.c
         *     965       922 harry        wc/foo.c
  A  +         965       687 harry        wc/qax.c
@@ -4934,7 +4939,7 @@
            <title>Options</title>

            <screen>
---accept ARG
+--accept ACTION
  --depth ARG
  --diff3-cmd CMD
  --force
@@ -5153,15 +5158,15 @@
            <title>Description</title>

            <para><command>svn update</command> brings changes from the
-            repository into your working copy.  If no revision is given,
-            it brings your working copy up to date with the
+            repository into your working copy.  If no revision is
+            given, it brings your working copy up to date with the
              <literal>HEAD</literal> revision.  Otherwise, it
              synchronizes the working copy to the revision given by the
-            <option>--revision</option> option.  As part of the
-            synchronization, <command>svn update</command> also
-            removes any stale locks (see <xref
-            linkend="svn.tour.cleanup"/>) found in the
-            working copy.</para>
+            <option>--revision</option> (<option>-r</option>) option.
+            As part of the synchronization, <command>svn
+            update</command> also removes any stale locks (see
+            <xref linkend="svn.tour.cleanup"/>) found in the working
+            copy.</para>

            <para>For each updated item, it prints a line that starts
              with a character reporting the action taken.  These
@@ -5254,11 +5259,11 @@
            <title>Options</title>

            <screen>
---accept ARG
+--accept ACTION
  --changelist
  --depth ARG
  --diff3-cmd CMD
---editor-cmd ARG
+--editor-cmd CMD
  --force
  --ignore-externals
  --quiet (-q)
@@ -5599,6 +5604,7 @@
  --fs-type TYPE
  --pre-1.4-compatible
  --pre-1.5-compatible
+--pre-1.6-compatible
  </screen>
          </refsect1>

@@ -5748,7 +5754,7 @@
            <para>Dump your whole repository:</para>

            <screen>
-$ svnadmin dump /var/svn/repos > full.dump
+$ svnadmin dump /var/svn/repos > full.dump
  * Dumped revision 0.
  * Dumped revision 1.
  * Dumped revision 2.
@@ -5759,7 +5765,7 @@
              repository:</para>

            <screen>
-$ svnadmin dump /var/svn/repos -r 21 --incremental > incr.dump
+$ svnadmin dump /var/svn/repos -r 21 --incremental > incr.dump
  * Dumped revision 21.
  </screen>

@@ -6053,7 +6059,6 @@
        </refentry>

        <refentry id="svn.ref.svnadmin.c.lstxns">
-
          <indexterm>
            <primary>svnadmin</primary>
            <secondary>subcommands</secondary>
@@ -6092,6 +6097,36 @@
          </refsect1>
        </refentry>

+      <refentry id="svn.ref.svnadmin.c.pack">
+        <indexterm>
+          <primary>svnadmin</primary>
+          <secondary>subcommands</secondary>
+          <tertiary>pack</tertiary>
+        </indexterm>
+
+        <refnamediv>
+          <refname>svnadmin pack</refname>
+          <refpurpose>Possibly compact the repository into a more
+          efficient storage model.</refpurpose>
+        </refnamediv>
+        <refsect1>
+          <title>Synopsis</title>
+          <programlisting>svnadmin pack REPOS_PATH</programlisting>
+        </refsect1>
+        <refsect1>
+          <title>Description</title>
+
+          <para>See
+          <xref linkend="svn.reposadmin.maint.diskspace.fsfspacking"
+          /> for more information.</para>
+        </refsect1>
+        <refsect1>
+          <title>Options</title>
+          <para>None</para>
+        </refsect1>
+      </refentry>
+
+
        <refentry id="svn.ref.svnadmin.c.recover">

          <indexterm>
@@ -6357,7 +6392,7 @@

              <para>Set the property <replaceable>NAME</replaceable> on
                revision <replaceable>REVISION</replaceable> to the
-              contents of <replaceable>FILE</replaceable>. Use
+              contents of <replaceable>FILE</replaceable>.  Use
                <option>--use-pre-revprop-change-hook</option>
                or <option>--use-post-revprop-change-hook</option> to
                trigger the revision property-related hooks (e.g., if
@@ -6992,6 +7027,7 @@
  --no-diff-deleted
  --revision (-r) REV
  --transaction (-t) TXN
+--extensions (-x) ARG
  </screen>
          </refsect1>

@@ -7146,7 +7182,7 @@
            <title>Options</title>

            <screen>
---limit (-l) ARG
+--limit (-l) NUM
  --revision (-r) REV
  --show-ids
  </screen>
@@ -7422,6 +7458,7 @@
  --revprop
  --transaction (-t) TXN
  --verbose (-v)
+--xml
  </screen>
          </refsect1>

@@ -7442,7 +7479,7 @@
              but this time showing the property values as well:</para>

            <screen>
-$ svnlook --verbose proplist /var/svn/repos /trunk/README
+$ svnlook -v proplist /var/svn/repos /trunk/README
    original-author : harry
    svn:mime-type : text/plain
  </screen>
@@ -8637,15 +8674,15 @@
  </screen>

          <para>If the working copy contains modifications, a trailing
-          "M" is added:</para>
+          '<literal>M</literal>' is added:</para>

          <screen>
  $ svnversion
  4168M
  </screen>

-        <para>If the working copy is switched, a trailing "S" is
-          added:</para>
+        <para>If the working copy is switched, a trailing
+          '<literal>S</literal>' is added:</para>

          <screen>
  $ svnversion
@@ -8662,7 +8699,7 @@

          <para>If invoked on a directory that is not a working copy,
            <command>svnversion</command> assumes it is an exported
-          working copy and prints "exported":</para>
+          working copy and prints <quote>exported</quote>:</para>

          <screen>
  $ svnversion




More information about the svnbook-dev mailing list