[svnbook] r4145 committed - * en/book/appb-svn-for-cvs-users.xml,...

svnbook at googlecode.com svnbook at googlecode.com
Thu Nov 3 14:48:39 CDT 2011

Revision: 4145
Author:   cmpilato at gmail.com
Date:     Thu Nov  3 12:47:55 2011
Log:      * en/book/appb-svn-for-cvs-users.xml,
* en/book/ch03-advanced-topics.xml,
* en/book/ch04-branching-and-merging.xml,
* en/book/ch06-server-configuration.xml,
* en/book/ch07-customizing-svn.xml,
* en/book/ch09-reference.xml,
   Remove undesired whitespace before closing </para> tags.


--- /trunk/en/book/appb-svn-for-cvs-users.xml	Fri Jul 29 13:11:52 2011
+++ /trunk/en/book/appb-svn-for-cvs-users.xml	Thu Nov  3 12:47:55 2011
@@ -190,9 +190,7 @@
        changes, but also unschedule operations such as adds and
        deletes.  Although deleting the file and then running <userinput>svn
        update</userinput> will still work, doing so distorts the true
-      purpose of updating.  And, while we're on this subject…
-    </para>
+      purpose of updating.  And, while we're on this subject…</para>


--- /trunk/en/book/ch03-advanced-topics.xml	Wed Nov  2 15:45:47 2011
+++ /trunk/en/book/ch03-advanced-topics.xml	Thu Nov  3 12:47:55 2011
@@ -2172,8 +2172,7 @@
              of the item, identical to <literal>HeadURL</literal>.
              Its substitution looks something like <literal>$Header:
-            148 2006-07-28 21:30:43Z sally $</literal>.
-          </para>
+            148 2006-07-28 21:30:43Z sally $</literal>.</para>
@@ -3925,8 +3924,7 @@
        must always be in the same repository as the URL that the file
        external will be inserted into. Also, file externals cannot be
        moved or deleted. The <literal>svn:externals</literal> property
-      must be modified instead. However, file externals can be copied.
-    </para>
+      must be modified instead. However, file externals can be  

      <para>Perhaps most disappointingly, the working copies created via the
        externals definition support are still disconnected from the primary
@@ -4425,8 +4423,7 @@
          (see <xref linkend="svn.ref.properties"/>).  If
          the client was not authenticated (i.e., if the server
          never issued an authentication challenge), the revision's
-        <literal>svn:author</literal> property is empty.
-      </para>
+        <literal>svn:author</literal> property is empty.</para>


--- /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 12:21:54 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 12:47:55 2011
@@ -144,8 +144,7 @@
        development, in the repository.  This allows you to save your
        half-broken work frequently without interfering with others, yet
        you can still selectively share information with your
-      collaborators.  You'll see exactly how this works as we go.
-      </para>
+      collaborators.  You'll see exactly how this works as we go.</para>

      <!-- ===============================================================  
      <sect2 id="svn.branchmerge.using.create">
@@ -586,8 +585,7 @@
            In this book and elsewhere (Subversion mailing lists, articles
            on merge tracking, etc.) you will frequently come across the
            term <firstterm>mergeinfo</firstterm>. This is simply shorthand
-          for the <literal>svn:mergeinfo</literal> property.
-        </para>
+          for the <literal>svn:mergeinfo</literal> property.</para>

        <para>After running the prior example, your branch working copy
@@ -974,8 +972,7 @@
          <command>svn merge</command> options. You'll get an error if you
          use any non-global options but these: <option>--accept</option>,
          <option>--dry-run</option>, <option>--diff3-cmd</option>,
-        <option>--extensions</option>, or <option>--quiet</option>.
-        </para>
+        <option>--extensions</option>, or <option>--quiet</option>.</para>

        <para>Now that your private branch is merged to trunk, you may
          wish to remove it from the repository:</para>
@@ -1140,8 +1137,7 @@
            mergeinfo.  This explicit mergeinfo describes not only what
            changes were merged into that particular directory, but also
            all the children of that directory (because those children
-          inherit the mergeinfo of their parent path).  For example:
-        </para>
+          inherit the mergeinfo of their parent path).  For example:</para>

@@ -1393,7 +1389,7 @@
          can be defined by a specific coordinate pair.  (Remember the
          <quote>peg revision</quote>
          syntax—foo.c at 224—mentioned back in
-        <xref linkend="svn.advanced.pegrevs"/>.) </para>
+        <xref linkend="svn.advanced.pegrevs"/>.)</para>

        <para>First, you might need to use <command>svn log</command> to
          discover the exact coordinate pair you wish to resurrect.  A
@@ -2143,8 +2139,7 @@
          a new revision <emphasis>X</emphasis> which changes the trunk.
          The changes made to trunk in this revision <emphasis>X</emphasis>
          are semantically equivalent to the changes you made to your branch
-        between revisions <emphasis>A</emphasis> and  
-        </para>
+        between revisions <emphasis>A</emphasis> and  

        <para>If you now try to merge outstanding changes from trunk to your
          branch, Subversion will consider changes made in revision
@@ -3039,8 +3034,7 @@
          When the user next runs <command>svn update</command>, she will
          be told that her working copy represents a path that no
          longer exists, and the user will be forced to <command>svn
-        switch</command> to the new location.
-        </para>
+        switch</command> to the new location.</para>


--- /trunk/en/book/ch06-server-configuration.xml	Thu Nov  3 12:21:54 2011
+++ /trunk/en/book/ch06-server-configuration.xml	Thu Nov  3 12:47:55 2011
@@ -640,7 +640,7 @@
            indefinitely.  A Windows service, however, runs in the
            background, can start at boot time automatically, and can be
            started and stopped using the same consistent administration
-          interface as other Windows services. </para>
+          interface as other Windows services.</para>

          <para>You'll need to define the new service using the
            command-line tool <command>SC.EXE</command>.  Much like
@@ -2361,8 +2361,7 @@
            you can disable all of this path checking.  In your
            <filename>httpd.conf</filename> file, use the
            <literal>SVNPathAuthz</literal> directive as shown in
-          <xref linkend="svn.serverconfig.httpd.authz.pathauthzoff.ex-1"/>.
-        </para>
+          <xref  

          <example id="svn.serverconfig.httpd.authz.pathauthzoff.ex-1">
            <title>Disabling path checks altogether</title>
@@ -3676,8 +3675,7 @@

      <para>All of the above examples use directories, because defining
        access rules on them is the most common case.  But is similarly
-      able to restrict access on file paths, too.
-    </para>
+      able to restrict access on file paths, too.</para>

@@ -4147,8 +4145,7 @@
            <para>Make the repository wholly owned by that group.</para>
-          <para>Set the group permissions to
-            read/write.</para>
+          <para>Set the group permissions to read/write.</para>
            <para>Your users need to use a sane umask when accessing the
--- /trunk/en/book/ch07-customizing-svn.xml	Fri Sep  9 08:01:33 2011
+++ /trunk/en/book/ch07-customizing-svn.xml	Thu Nov  3 12:47:55 2011
@@ -136,8 +136,7 @@
          <filename>config</filename> file, would be found at
          Per-user configuration values should be stored under
-      </para>

        <para>Registry-based configuration options are parsed
          <emphasis>before</emphasis> their file-based counterparts, so
@@ -534,8 +533,7 @@
                  The default setting is <literal>ask</literal>, which causes
                  the Subversion client to ask you each time a
                  <emphasis>new</emphasis> password is about to be added to
-                the <filename>~/.subversion/auth/</filename> caching area.
-              </para>
+                the <filename>~/.subversion/auth/</filename> caching  
--- /trunk/en/book/ch09-reference.xml	Wed Nov  2 12:10:07 2011
+++ /trunk/en/book/ch09-reference.xml	Thu Nov  3 12:47:55 2011
@@ -338,8 +338,7 @@
                the <option>--extension</option> (<option>-x</option>)
                option isn't restricted to the previously mentioned
                options, but may be <emphasis>any</emphasis> additional
-              arguments which Subversion should pass to that command.
-              </para>
+              arguments which Subversion should pass to that  

@@ -751,8 +750,7 @@
                which files in your working copy are out of date.
                This doesn't actually update any of your
                files—it just shows you which files will be
-              updated if you then use <command>svn update</command>.
-            </para>
+              updated if you then use <command>svn update</command>.</para>

@@ -920,8 +918,7 @@
              uploaded and added to the repository on your next commit.
              If you add something and change your mind before
              committing, you can unschedule the addition using
-            <command>svn revert</command>.
-          </para>
+            <command>svn revert</command>.</para>

@@ -983,8 +980,7 @@
              every unversioned object in your working copy, including
              those hiding deeper.  Passing the
              <option>--force</option> option makes <command>svn
-            add</command> recurse into versioned directories:
-          </para>
+            add</command> recurse into versioned directories:</para>

@@ -1062,8 +1058,7 @@
              5, you'll have to examine exactly what the revision
              changed to be sure that Harry changed
              the <emphasis>context</emphasis> of the line—he may
-            have adjusted just the whitespace.
-          </para>
+            have adjusted just the whitespace.</para>

            <para>If you use the <option>--xml</option> option, you can
              get XML output describing the blame annotations, but not
@@ -10026,8 +10021,7 @@
                find yourself
                typing <literal>svnserve --tunnel</literal> on the
                command line and wondering what to do next, see
-              <xref linkend="svn.serverconfig.svnserve.sshauth"/>.
-              </para>
+              <xref linkend="svn.serverconfig.svnserve.sshauth"/>.</para>

@@ -10141,8 +10135,7 @@
                This is especially useful for complex filtering
                operations which require more prefixes than the
                operating system allows to be specified on a single
-              command line.
-            </para>
+              command line.</para>

@@ -11108,7 +11101,7 @@
                perform during updates, and can also affect how the
                file behaves when fetched via a web browser.  See
-              linkend="svn.advanced.props.special.mime-type"/>. </para>
+              linkend="svn.advanced.props.special.mime-type"/>.</para>


More information about the svnbook-dev mailing list