[svnbook] r5922 committed - branches/1.8/zh

[wuzhouhui at users.sourceforge.net]

Revision: 5922
          http://sourceforge.net/p/svnbook/source/5922
Author:   wuzhouhui
Date:     2019-05-20 13:08:19 +0000 (Mon, 20 May 2019)
Log Message:
-----------
1.8/zh: merge changes from trunk

Modified Paths:
--------------
    branches/1.8/zh/book/ch02-basic-usage.xml
    branches/1.8/zh/book/ref-svn.xml

Property Changed:
----------------
    branches/1.8/zh/

Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh	2019-05-20 12:57:11 UTC (rev 5921)
+++ branches/1.8/zh	2019-05-20 13:08:19 UTC (rev 5922)

Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-5893
\ No newline at end of property
+/trunk/en:5303-5921
\ No newline at end of property
Modified: branches/1.8/zh/book/ch02-basic-usage.xml
===================================================================
--- branches/1.8/zh/book/ch02-basic-usage.xml	2019-05-20 12:57:11 UTC (rev 5921)
+++ branches/1.8/zh/book/ch02-basic-usage.xml	2019-05-20 13:08:19 UTC (rev 5922)
@@ -3210,7 +3210,7 @@
             <para>Retrieves a human-readable file as it existed in a
               particular revision number, displaying its contents in a
               tabular form with last-changed information attributed to
-              each line of the file.</para>
+              each line of the file</para>
       -->
             <para>根据给定的版本号, 查看该版本下的文件的每一行的最后一
               次修改信息.</para>

Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml	2019-05-20 12:57:11 UTC (rev 5921)
+++ branches/1.8/zh/book/ref-svn.xml	2019-05-20 13:08:19 UTC (rev 5922)
@@ -2615,7 +2615,7 @@
       </informalexample>
 
       <!--
-      <para>As in another other working copy, you have the choices
+      <para>As in any other working copy, you have the choices
         typically available:  reverting some or all of those
         local <quote>modifications</quote>, committing them, or
         continuing to modify your working copy.</para>
@@ -3055,7 +3055,8 @@
 
       <!--
       <para>If no peg revision (i.e.,
-        <replaceable>@REV</replaceable>) is supplied, by default
+        <literal>@<replaceable>REV</replaceable></literal>) is supplied,
+        by default
         the <literal>BASE</literal> revision will be used for
         files copied from the working copy, while the
         <literal>HEAD</literal> revision will be used for files
@@ -3125,8 +3126,7 @@
       </informalexample>
 
       <!--
-      <para>Copy several files in a working copy into a
-        subdirectory:</para>
+      <para>Copy several files in a working copy into a directory:</para>
       -->
       <para>把工作副本里的多个文件复制到一个目录内:</para>
 
@@ -3376,7 +3376,7 @@
 
       <!--
       <para>Here's an example of how to force deletion of a file
-        that has local mods:</para>
+        that has local modifications:</para>
       -->
       <para>下面的例子展示了如何强制删除含有本地修改的文件:</para>
 
@@ -3577,7 +3577,7 @@
       <para><userinput>svn diff OLD-URL[@OLDREV]
         NEW-URL[@NEWREV]</userinput> is shorthand for <userinput>svn
         diff - -old=OLD-URL[@OLDREV]
-        - -new=NEW-URL[@NEWREV].</userinput></para>
+        - -new=NEW-URL[@NEWREV]</userinput>.</para>
       -->
       <para><userinput>svn diff OLD-URL[@OLDREV]
         NEW-URL[@NEWREV]</userinput> 是 <userinput>svn
@@ -3604,7 +3604,8 @@
 
       <!--
       <para>If <replaceable>TARGET</replaceable> is a URL, then
-        revs <literal>N</literal> and <literal>M</literal> can be
+        revisions <replaceable>N</replaceable> and <replaceable>M</replaceable>
+        can be
         given either via the
         <option>- -revision</option> (<option>-r</option>) option
         or by using the
@@ -5552,8 +5553,8 @@
             (<replaceable>SOURCE</replaceable>).
             <quote>Eligible</quote> changes are defined as those that
             were not previously merged from
-            (<replaceable>SOURCE</replaceable>) to
-            (<replaceable>TARGET_WCPATH</replaceable>).  See
+            <replaceable>SOURCE</replaceable> to
+            <replaceable>TARGET_WCPATH</replaceable>.  See
             <xref linkend="svn.branchmerge.basicmerging.stayinsync"/>.
             <quote>Reintegrate</quote> merges merge changes from a
             feature branch (<replaceable>SOURCE</replaceable>)
@@ -8761,7 +8762,7 @@
 
     <refsynopsisdiv>
       <para><literal>svn switch URL[@PEGREV] [PATH]</literal></para>
-      <para><literal>switch --relocate FROM TO [PATH...]</literal></para>
+      <para><literal>svn switch --relocate FROM TO [PATH...]</literal></para>
     </refsynopsisdiv>
 
     <!-- =============================================================== -->