[svnbook] r6034 committed - branches/1.8/zh/book

[wuzhouhui at users.sourceforge.net]

Revision: 6034
          http://sourceforge.net/p/svnbook/source/6034
Author:   wuzhouhui
Date:     2020-03-28 06:44:58 +0000 (Sat, 28 Mar 2020)
Log Message:
-----------
1.8/zh: resolve some TODO

Modified Paths:
--------------
    branches/1.8/zh/book/ch00-preface.xml
    branches/1.8/zh/book/ch05-repository-admin.xml
    branches/1.8/zh/book/ref-svn.xml

Modified: branches/1.8/zh/book/ch00-preface.xml
===================================================================
--- branches/1.8/zh/book/ch00-preface.xml	2020-03-21 11:42:08 UTC (rev 6033)
+++ branches/1.8/zh/book/ch00-preface.xml	2020-03-28 06:44:58 UTC (rev 6034)
@@ -319,7 +319,7 @@
         data stores.  Collaboration still occurs, but is accomplished
         by trading collections of changes made to versioned items
         directly between users' local data stores, not via a
-        centralized master data store.  TODO: In fact, any semblance of a
+        centralized master data store.  In fact, any semblance of a
         canonical <quote>master</quote> source of a project's
         versioned data is by convention only, a status imputed by
         the various collaborators on that project.</para>

Modified: branches/1.8/zh/book/ch05-repository-admin.xml
===================================================================
--- branches/1.8/zh/book/ch05-repository-admin.xml	2020-03-21 11:42:08 UTC (rev 6033)
+++ branches/1.8/zh/book/ch05-repository-admin.xml	2020-03-28 06:44:58 UTC (rev 6034)
@@ -459,7 +459,6 @@
         their project lately, the youngest revision number for the
         repository keeps climbing because other projects are actively
         adding new revisions.<footnote><para>Whether founded in
-            ### TODO
         ignorance or in poorly considered concepts about how to derive
         legitimate software development metrics, global revision
         numbers are a silly thing to fear,
@@ -473,7 +472,11 @@
     仓库只和单独的一组人有关系. 另外还要注意 Subversion 版本号的作用域是整个
     仓库, 虽然这些数字并没有任何特殊的魔力, 但还是有人不喜欢看到这样一种情况:
     虽然他们的项目最近都没有提交什么修改, 但是由于其他项目的活动, 他们自己的
-    项目的版本号仍然在不断增长.</para>
+    项目的版本号仍然在不断增长.<footnote><para>在考虑如何实现合理的软件开发
+        标准时, 无论是完全没有重视, 还是考虑不周, 全局的版本号数字都不应该
+        成为需要担心的事情, 而且在决定如何管理项目与仓库时, 也
+        <emphasis>没必要</emphasis> 去顾虑虑全局版本号.</para></footnote>
+  </para>
 
       <!--
       <para>A middle-ground approach can be taken, too.  For example,

Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml	2020-03-21 11:42:08 UTC (rev 6033)
+++ branches/1.8/zh/book/ref-svn.xml	2020-03-28 06:44:58 UTC (rev 6034)
@@ -8097,7 +8097,6 @@
         directories.  With no arguments, it prints only locally
         modified items (no repository access).  With
         <option>- -show-updates</option> (<option>-u</option>), it
-                                  ### TODO
         adds working revision and server out-of-date information.
         With <option>- -verbose</option> (<option>-v</option>), it
         prints full revision information on every item.
@@ -8107,8 +8106,9 @@
       -->
       <para>打印工作副本中文件或目录的状态. 如果没有指定任何选项, <command>svn
           status</command> 将只打印本地已修改的项目 (不会访问仓库). 如果添加了
-        <option>--show-updates</option> (<option>-u</option>), 命令除了会打印
-        工作副本内的版本号外, 还会打印服务器上最新的信息. 如果添加了选项
+        选项 <option>--show-updates</option> (<option>-u</option>), 命令还会
+        打印与服务器上的最新数据相比, 工作副本中已过时的项目及其版本号.
+        如果添加了选项
         <option>--verbose</option> (<option>-v</option>), 它将打印每一项的
         完整的版本号信息. 如果添加了选项 <option>--quiet</option>
         (<option>-q</option>), 它就只打印与本地已修改项目有关的总结信息.</para>