[svnbook] r5933 committed - branches/1.8/zh

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Thu Jun 13 08:52:55 CDT 2019


Revision: 5933
          http://sourceforge.net/p/svnbook/source/5933
Author:   wuzhouhui
Date:     2019-06-13 13:52:53 +0000 (Thu, 13 Jun 2019)
Log Message:
-----------
1.8/zh: merge changes from trunk

Modified Paths:
--------------
    branches/1.8/zh/book/ref-svn.xml
    branches/1.8/zh/book/ref-svnadmin.xml

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

Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh	2019-06-13 13:45:46 UTC (rev 5932)
+++ branches/1.8/zh	2019-06-13 13:52:53 UTC (rev 5933)

Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-5921
\ No newline at end of property
+/trunk/en:5303-5932
\ No newline at end of property
Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml	2019-06-13 13:45:46 UTC (rev 5932)
+++ branches/1.8/zh/book/ref-svn.xml	2019-06-13 13:52:53 UTC (rev 5933)
@@ -1225,7 +1225,8 @@
         <term><option>--reintegrate</option></term>
         <listitem>
       <!--
-          <para>Deprecated.  Used with the <command>svn merge</command>
+          <para><emphasis>Deprecated</emphasis>.  Used with the
+            <command>svn merge</command>
             subcommand to merge changes from a feature branch back into
             the feature branch's ancestor branch.  Since Subversion 1.8
             the <command>svn merge</command> subcommand automatically
@@ -1247,7 +1248,8 @@
         <term><option>--relocate</option></term>
         <listitem>
       <!--
-          <para>Deprecated.  When used with the <command>svn
+          <para><emphasis>Deprecated</emphasis>.  When used with the
+            <command>svn
             switch</command> subcommand, changes the location of the
             repository that your working copy references.  The
             preferred approach as of Subversion 1.7, however, is to

Modified: branches/1.8/zh/book/ref-svnadmin.xml
===================================================================
--- branches/1.8/zh/book/ref-svnadmin.xml	2019-06-13 13:45:46 UTC (rev 5932)
+++ branches/1.8/zh/book/ref-svnadmin.xml	2019-06-13 13:52:53 UTC (rev 5933)
@@ -162,7 +162,7 @@
       <!--
           <para>When creating a repository,
             use <replaceable>ARG</replaceable> as the requested
-            filesyste type.  <replaceable>ARG</replaceable> may be
+            filesystem type.  <replaceable>ARG</replaceable> may be
             either <literal>bdb</literal>
             or <literal>fsfs</literal>.</para>
       -->
@@ -316,7 +316,7 @@
         <listitem>
       <!--
           <para>When loading a dump file, runs the repository's
-            <literal>post-commit</literal> hook after finalizing each newly loaded
+            post-commit hook after finalizing each newly loaded
             revision.</para>
       -->
           <para>加载一个转储文件时, 每完成一个版本号的提交, 就执行一次仓库
@@ -329,7 +329,7 @@
         <listitem>
       <!--
           <para>When changing a revision property, runs the
-            repository's <literal>post-revprop-change</literal> hook after changing the
+            repository's post-revprop-change hook after changing the
             revision property.</para>
       -->
           <para>修改一个版本号属性时, 在修改完后执行仓库的
@@ -342,7 +342,7 @@
         <listitem>
       <!--
           <para>When loading a dump file, runs the repository's
-            <literal>pre-commit</literal> hook before finalizing each newly loaded
+            pre-commit hook before finalizing each newly loaded
             revision.  If the hook fails, aborts the commit and
             terminates the load process.</para>
       -->
@@ -357,7 +357,7 @@
         <listitem>
       <!--
           <para>When changing a revision property, runs the
-            repository's <literal>pre-revprop-change</literal> hook before changing the
+            repository's pre-revprop-change hook before changing the
             revision property.  If the hook fails, aborts the
             modification and terminates.</para>
       -->
@@ -706,8 +706,8 @@
       <para>Dump the contents of the filesystem to <filename>stdout</filename> in a
         <quote>dump file</quote> portable format, sending feedback
         to <filename>stderr</filename>.  Dump revisions
-        <replaceable>LOWER</replaceable> rev through
-        <replaceable>UPPER</replaceable> rev.  If no revisions are
+        <replaceable>LOWER</replaceable> revision through
+        <replaceable>UPPER</replaceable> revision.  If no revisions are
         given, dump all revision trees.  If only
         <replaceable>LOWER</replaceable> is given, dump that one
         revision tree.  See <xref linkend="svn.reposadmin.maint.migrate"/>
@@ -1265,9 +1265,10 @@
         into the repository's filesystem.  Progress
         feedback is sent to <filename>stdout</filename>.  If
         no revisions are given, read and commit all revisions.  But
-        if <option>- -revision</option> is provided, read and commit
-        revisions <replaceable>LOWER</replaceable> rev through
-        <replaceable>UPPER</replaceable> rev only.  If only
+        if <option>- -revision</option> (<option>-r</option>) is provided,
+        read and commit
+        revisions <replaceable>LOWER</replaceable> revision through
+        <replaceable>UPPER</replaceable> revision only.  If only
         <replaceable>LOWER</replaceable> is given, load that one
         revision.</para>
       -->
@@ -1284,7 +1285,8 @@
       <para>Prior to Subversion 1.8, <command>svnadmin load</command>
         was limited to reading all revisions that the dump stream
         contains, but now <command>svnadmin load</command> accepts
-        <option>- -revision</option> option that acts as a filter for
+        <option>- -revision</option> (<option>-r</option>) option that acts
+        as a filter for
         dump stream revisions.  This allows you to incrementally load
         only a range of revisions from a single dump stream making
         some repository maintenance and reorganization tasks much
@@ -1367,7 +1369,7 @@
         older versions of Subversion wouldn't have benefitted from
         that strictness, and as such might be improperly
         formatted.  Dump streams carry property values as-is, so
-        using Subversion 1.7 to load dump streams created from
+        using Subversion 1.8 to load dump streams created from
         repositories with ill-formatted property values will, by
         default, trigger a validation error.  There are several
         workaround for this problem.  First, you can manually
@@ -1666,7 +1668,7 @@
       consistent state (applies only to repositories using the
       <literal>bdb</literal> backend).  In addition, if
       <filename>repos/conf/passwd</filename> does not exist, it
-      will create a default passwordfile .</refpurpose>
+      will create a default password file .</refpurpose>
       -->
     <refpurpose>把仓库数据库恢复到一个一致的状态 (该命令只适用于以
       <literal>bdb</literal> 作为后端存储的仓库). 另外, 如果
@@ -1990,7 +1992,7 @@
         <option>- -bypass-hooks</option> to avoid running any pre-
         or post-commit hooks, which is useful if the modification
         of revision properties has not been enabled in
-        the <literal>pre-revprop-change</literal> hook.</para>
+        the pre-revprop-change hook.</para>
       -->
       <para>这个命令类似于用带有选项 <option>--revprop</option> 的命令
         <command>svn propset</command> 设置版本号的 <literal>svn:log</literal>
@@ -2086,7 +2088,8 @@
           <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
-          you want an email notification sent from your <literal>post-revprop-change-hook</literal>).</para>
+          you want an email notification sent from your post-revprop-change
+          hook).</para>
       -->
         <para>把版本号 <replaceable>REVISION</replaceable> 的属性
           <replaceable>NAME</replaceable> 的值设置成文件




More information about the svnbook-dev mailing list