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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Sun Oct 27 06:48:44 CDT 2019


Revision: 6006
          http://sourceforge.net/p/svnbook/source/6006
Author:   wuzhouhui
Date:     2019-10-27 11:48:39 +0000 (Sun, 27 Oct 2019)
Log Message:
-----------
1.8/zh: translation of index in progress, plus some review

Modified Paths:
--------------
    branches/1.8/zh/book/appc-webdav.xml
    branches/1.8/zh/book/ch00-preface.xml
    branches/1.8/zh/book/ch01-fundamental-concepts.xml
    branches/1.8/zh/book/ch02-basic-usage.xml
    branches/1.8/zh/book/ch03-advanced-topics.xml
    branches/1.8/zh/book/ch04-branching-and-merging.xml
    branches/1.8/zh/book/ch05-repository-admin.xml
    branches/1.8/zh/book/ref-svn.xml

Modified: branches/1.8/zh/book/appc-webdav.xml
===================================================================
--- branches/1.8/zh/book/appc-webdav.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/appc-webdav.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -211,7 +211,7 @@
     <para>
       <indexterm>
         <primary>WebDAV</primary>
-        <secondary>autoversioning</secondary>
+        <secondary>autoversioning (自动版本控制)</secondary>
       </indexterm>
       虽然 Subversion 客户端和服务器都不是一个完整的 DeltaV 客户端和服务器,
       但仍然存在值得人们高兴的 WebDAV 互操作性:
@@ -412,7 +412,7 @@
     <para>
       <indexterm>
         <primary>WebDAV</primary>
-        <secondary>client support</secondary>
+        <secondary>client support (客户端支持)</secondary>
       </indexterm>
       所有的 WebDAV 客户端实现都可以分为三类—独立的应用程序, 文件浏览器
       扩展和文件系统实现. 这三种类型基本上规定了用户可享受到的 WebDAV 功能

Modified: branches/1.8/zh/book/ch00-preface.xml
===================================================================
--- branches/1.8/zh/book/ch00-preface.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ch00-preface.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -25,11 +25,11 @@
 
   <para>
     <indexterm>
-      <primary>Concurrent Versions System</primary>
+      <primary>Concurrent Versions System (CVS 版本控制系统)</primary>
     </indexterm>
     <indexterm>
       <primary>CVS</primary>
-      <see>Concurrent Versions System</see>
+      <see>Concurrent Versions System (CVS 版本控制系统)</see>
     </indexterm>
     <!--
     In the world of open source software, the Concurrent
@@ -101,11 +101,11 @@
         <primary>Subversion</primary>
       </indexterm>
       <indexterm>
-        <primary>version control systems</primary>
+        <primary>version control systems (版本控制系统)</primary>
       </indexterm>
       <indexterm>
         <primary>VCS</primary>
-        <see>version control systems</see>
+        <see>version control systems (版本控制系统)</see>
         </indexterm>
     <!--
         Subversion is a free/open source <firstterm>version
@@ -142,11 +142,11 @@
 
     <para>
       <indexterm>
-        <primary>software configuration management</primary>
+        <primary>software configuration management (软件配置管理)</primary>
       </indexterm>
       <indexterm>
         <primary>SCM</primary>
-        <see>software configuration management</see>
+        <see>software configuration management (软件配置管理)</see>
       </indexterm>
     <!--
       Some version control systems are
@@ -265,8 +265,8 @@
 
       <para>
         <indexterm>
-          <primary>version control systems</primary>
-          <secondary>centralized</secondary>
+          <primary>version control systems (版本控制系统)</primary>
+          <secondary>centralized (中心化的)</secondary>
         </indexterm>
     <!--
         Once you've decided that you need a version
@@ -293,12 +293,12 @@
 
       <para>
         <indexterm>
-          <primary>version control systems</primary>
-          <secondary>distributed</secondary>
+          <primary>version control systems (版本控制系统)</primary>
+          <secondary>distributed (分布式的)</secondary>
         </indexterm>
         <indexterm>
           <primary>DVCS</primary>
-          <see>version control systems, distributed</see>
+          <see>version control systems, distributed (分布式的版本控制)</see>
         </indexterm>
     <!--
         Much has changed since that time, though.  In the
@@ -395,7 +395,7 @@
       <para>
         <indexterm>
           <primary>Subversion</primary>
-          <secondary>history of</secondary>
+          <secondary>history of (历史)</secondary>
         </indexterm>
         <indexterm>
           <primary>CollabNet</primary>
@@ -544,7 +544,7 @@
       <para>
         <indexterm>
           <primary>Subversion</primary>
-          <secondary>architecture</secondary>
+          <secondary>architecture (架构) </secondary>
     <!--
         </indexterm><xref linkend="svn.intro.architecture.dia-1"/>
         illustrates a <quote>mile-high</quote> view of Subversion's
@@ -588,7 +588,7 @@
       <para>
         <indexterm>
           <primary>Subversion</primary>
-          <secondary>components</secondary>
+          <secondary>components (组件)</secondary>
     <!--
         </indexterm>Subversion, once installed, has a number of
         different pieces.  The following is a quick overview of what
@@ -763,7 +763,7 @@
       <para>
         <indexterm>
           <primary>Subversion</primary>
-          <secondary>history of</secondary>
+          <secondary>history of (历史)</secondary>
     <!--
         </indexterm>The first edition of this book was published by
         O'Reilly Media in 2004, shortly after Subversion had reached

Modified: branches/1.8/zh/book/ch01-fundamental-concepts.xml
===================================================================
--- branches/1.8/zh/book/ch01-fundamental-concepts.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ch01-fundamental-concepts.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -38,7 +38,7 @@
 
     <para>
       <indexterm>
-        <primary>version control systems</primary>
+        <primary>version control systems (版本控制系统)</primary>
       </indexterm>
       版本控制系统用于跟踪文件和目录在时间上的增量版本. 当然, 仅仅跟踪一
       个用户或用户组不同版本的文件和目录并不会让版本控制系统显得多么高级,
@@ -78,15 +78,15 @@
 
       <para>
         <indexterm>
-          <primary>repositories</primary>
+          <primary>repositories (仓库)</primary>
         </indexterm>
         <indexterm>
-          <primary>repositories</primary>
-          <secondary>filesystem tree</secondary>
+          <primary>repositories (仓库)</primary>
+          <secondary>filesystem tree (文件系统树)</secondary>
         </indexterm>
         <indexterm>
-          <primary>version control systems</primary>
-          <secondary>clients</secondary>
+          <primary>version control systems (版本控制系统)</primary>
+          <secondary>clients (客户端)</secondary>
         </indexterm>
         版本控制系统的核心是仓库, 它是存放系统数据的中央位置. 仓库通常以
         <firstterm>文件系统树</firstterm> (<firstterm>filesystem tree
@@ -160,7 +160,7 @@
 
       <para>
         <indexterm>
-          <primary>working copies</primary>
+          <primary>working copies (工作副本)</primary>
         </indexterm>
     <!--
         A version control system's value comes from the
@@ -307,9 +307,9 @@
 
         <para>
           <indexterm>
-            <primary>version control</primary>
-            <secondary>models</secondary>
-            <tertiary>lock-modify-unlock</tertiary>
+            <primary>version control (版本控制)</primary>
+            <secondary>models (模型)</secondary>
+            <tertiary>lock-modify-unlock (加锁-修改-解锁)</tertiary>
           </indexterm>
     <!--
           Many version control systems use a
@@ -438,9 +438,9 @@
 
         <para>
           <indexterm>
-            <primary>version control</primary>
-            <secondary>models</secondary>
-            <tertiary>copy-modify-merge</tertiary>
+            <primary>version control (版本控制)</primary>
+            <secondary>models (模型)</secondary>
+            <tertiary>copy-modify-merge (复制-修改-合并)</tertiary>
           </indexterm>
     <!--
           Subversion, CVS, and many other version control
@@ -464,7 +464,7 @@
 
         <para>
           <indexterm>
-            <primary>out of date</primary>
+            <primary>out of date (过时)</primary>
           </indexterm>
     <!--
           Here's an example.  Say that Harry and Sally
@@ -514,7 +514,7 @@
 
         <para>
           <indexterm>
-            <primary>conflicts</primary>
+            <primary>conflicts (冲突)</primary>
           </indexterm>
     <!--
           But what if Sally's changes
@@ -723,7 +723,7 @@
 
       <para>
         <indexterm>
-          <primary>revisions</primary>
+          <primary>revisions (版本号)</primary>
         </indexterm>
     <!--
         Each time the repository accepts a commit, this
@@ -769,8 +769,8 @@
 
         <para>
           <indexterm>
-            <primary>revisions</primary>
-            <secondary>global</secondary>
+            <primary>revisions (版本号)</primary>
+            <secondary>global (全局的)</secondary>
           </indexterm>
     <!--
           Unlike most version control systems,
@@ -813,7 +813,7 @@
 
       <para>
         <indexterm>
-          <primary>repository URL</primary>
+          <primary>repository URL (仓库 URL)</primary>
         </indexterm>
     <!--
         Subversion client programs use URLs to identify
@@ -1039,14 +1039,14 @@
 
       <para>
         <indexterm>
-          <primary>repository-relative URL</primary>
+          <primary>repository-relative URL (仓库的相对 URL)</primary>
         </indexterm>
         <indexterm>
-          <primary>caret syntax</primary>
+          <primary>caret syntax (脱字符语法)</primary>
         </indexterm>
         <indexterm>
           <primary>^</primary>
-          <see>caret syntax</see>
+          <see>caret syntax (脱字符语法)</see>
         </indexterm>
     <!--
         In Subversion 1.6, a new caret (<literal>^</literal>)
@@ -1093,7 +1093,7 @@
 
       <para>
         <indexterm>
-          <primary>working copies</primary>
+          <primary>working copies (工作副本)</primary>
         </indexterm>
     <!--
         A Subversion working copy is an ordinary directory
@@ -1136,11 +1136,11 @@
 
       <para>
         <indexterm>
-          <primary>administrative directory</primary>
+          <primary>administrative directory (管理目录)</primary>
         </indexterm>
         <indexterm>
           <primary>.svn</primary>
-          <see>administrative directory</see>
+          <see>administrative directory (管理目录)</see>
         </indexterm>
     <!--
         A working copy also contains some extra files,
@@ -1194,8 +1194,8 @@
 
         <itemizedlist>
           <indexterm>
-            <primary>revisions</primary>
-            <secondary>working</secondary>
+            <primary>revisions (版本号)</primary>
+            <secondary>working (工作版本号)</secondary>
           </indexterm>
 
           <listitem>
@@ -1365,12 +1365,12 @@
             <tertiary>checkout</tertiary>
           </indexterm>
           <indexterm>
-            <primary>checking out</primary>
+            <primary>checking out (检出)</primary>
           </indexterm>
           <indexterm>
-            <primary>working copies</primary>
-            <secondary>creating</secondary>
-            <see>checking out</see>
+            <primary>working copies (工作副本)</primary>
+            <secondary>creating (创建)</secondary>
+            <see>checking out (检出)</see>
             </indexterm>
     <!--
             To get a working copy, you must <firstterm>check
@@ -1417,11 +1417,11 @@
 
         <para>
           <indexterm>
-            <primary>committing</primary>
+            <primary>committing (提交)</primary>
           </indexterm>
           <indexterm>
-            <primary>checking in</primary>
-            <see>committing</see>
+            <primary>checking in (检入)</primary>
+            <see>committing (提交)</see>
           </indexterm>
       <!--
           Suppose you make changes
@@ -1449,7 +1449,7 @@
             <tertiary>commit</tertiary>
           </indexterm>
           <indexterm>
-            <primary>committing</primary>
+            <primary>committing (提交)</primary>
           </indexterm>
       <!--
           To publish your changes, you can use
@@ -1503,12 +1503,12 @@
             <tertiary>update</tertiary>
           </indexterm>
           <indexterm>
-            <primary>updating</primary>
+            <primary>updating (更新)</primary>
           </indexterm>
           <indexterm>
-            <primary>working copies</primary>
-            <secondary>updating</secondary>
-            <see>updating</see>
+            <primary>working copies (工作副本)</primary>
+            <secondary>updating (更新)</secondary>
+            <see>updating (更新)</see>
           </indexterm>
       <!--
           To bring her project up to date, Sally can ask
@@ -1563,8 +1563,8 @@
 
         <para>
           <indexterm>
-            <primary>working copies</primary>
-            <secondary>mixed-revision</secondary>
+            <primary>working copies (工作副本)</primary>
+            <secondary>mixed-revision (版本号混合的)</secondary>
           </indexterm>
       <!--
           As a general principle, Subversion tries to be
@@ -1796,7 +1796,7 @@
 
           <para>
             <indexterm>
-              <primary>backdating</primary>
+              <primary>backdating (回退)</primary>
             </indexterm>
       <!--
             If your project is sufficiently complex, you'll

Modified: branches/1.8/zh/book/ch02-basic-usage.xml
===================================================================
--- branches/1.8/zh/book/ch02-basic-usage.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ch02-basic-usage.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -158,7 +158,7 @@
         
       <indexterm>
         <primary>svn</primary>
-        <secondary>options</secondary>
+        <secondary>options (选项)</secondary>
       </indexterm>
 
       <!--
@@ -356,16 +356,16 @@
 
       <para>
         <indexterm>
-          <primary>trunk</primary>
+          <primary>trunk (主干)</primary>
         </indexterm>
         <indexterm>
-          <primary>tags</primary>
+          <primary>tags (标签)</primary>
         </indexterm>
         <indexterm>
-          <primary>branches</primary>
+          <primary>branches (分支)</primary>
         </indexterm>
         <indexterm>
-          <primary>project root</primary>
+          <primary>project root (项目根目录)</primary>
         </indexterm>为了避免这种问题, 我们推荐读者遵循传统的仓库布局 (这种布局
         出现在很久以前, 在 Subversion 项目早期阶段就已经开始使用), 传统布局的
         特点是, 仓库中的目录名可以向用户传达出与它们所存放的数据相关的信息.
@@ -781,7 +781,7 @@
           diff</command> commands are critical to reviewing the
           changes you've made in your working copy.</para>
       -->
-        <para><emphasis>审核修改.</emphasis> 用命令
+        <para><emphasis>审查修改.</emphasis> 用命令
           <command>svn status</command> 和 <command>svn diff</command>
           查看工作副本发生了哪些变化.</para>
       </listitem>
@@ -794,7 +794,7 @@
           The <command>svn revert</command> command restores a file
           or directory to its unmodified state.</para>
       -->
-        <para><emphasis>修正错误.</emphasis> 人无完人, 在审核修改时用户可
+        <para><emphasis>修正错误.</emphasis> 人无完人, 在审查修改时用户可
           能会发现某些修改是不正确的. 有时候修正错误最简单的方式是撤消所有的
           修改, 重新开始. 命令 <command>svn revert</command> 可以把文件或目
           录恢复到修改前的样子.</para>
@@ -922,10 +922,10 @@
 
       <para>
         <indexterm>
-          <primary>file changes</primary>
+          <primary>file changes (文件变化)</primary>
         </indexterm>
         <indexterm>
-          <primary>tree changes</primary>
+          <primary>tree changes (目录树变化)</primary>
         </indexterm>
       <!--
         Now you can get to work and make changes in your
@@ -966,11 +966,11 @@
 
         <para>
           <indexterm>
-            <primary>symlink</primary>
+            <primary>symlink (符号链接)</primary>
           </indexterm>
           <indexterm>
-            <primary>symbolic link</primary>
-            <see>symlink</see>
+            <primary>symbolic link (符号链接)</primary>
+            <see>symlink (符号链接)</see>
           </indexterm>
       <!--
           On non-Windows platforms, Subversion is able to
@@ -1216,11 +1216,11 @@
       <!--
       <title>Review Your Changes</title>
       -->
-      <title>审核修改</title>
+      <title>审查修改</title>
 
       <para>
         <indexterm>
-          <primary>log message</primary>
+          <primary>log message (日志消息)</primary>
         </indexterm>
       <!--
         Once you've finished making changes, you need to commit
@@ -1242,7 +1242,7 @@
         一下自己到底修改了哪些东西. 通过检查修改, 用户可以写出更准确的
         <firstterm>提交日志</firstterm> (<firstterm>log message</firstterm>,
         和修改一起存放到仓库中的一段文本, 该文本以人类可读的形式描述了本次
-        修改的相关信息). 在审核修改时, 用户可能会发现自己无意中修改了一个不相
+        修改的相关信息). 在审查修改时, 用户可能会发现自己无意中修改了一个不相
         关的文件, 因此在提交之前需要撤消它的修改. 用户可以使用命令
         <command>svn status</command> 查看修改的整体概述, 用命令
         <command>svn diff</command> 查看修改的细节. </para>
@@ -1265,11 +1265,11 @@
         <para>如果仓库是通过网络访问的, 那么即使没有网络连接, 用户也可以执行
           <command>svn status</command>, <command>svn diff</command> 和
           <command>svn revert</command>, 这就方便用户在离线的情况下管理和
-          审核未完成的修改.</para>
+          审查未完成的修改.</para>
 
         <para>
           <indexterm>
-            <primary>text-base</primary>
+            <primary>text-base (基于文本的)</primary>
           </indexterm>
           <indexterm>
             <primary>delta</primary>
@@ -1592,8 +1592,8 @@
             <tertiary>diff</tertiary>
           </indexterm>
           <indexterm>
-            <primary>differences</primary>
-            <secondary>unified diff</secondary>
+            <primary>differences (差异)</primary>
+            <secondary>unified diff (标准差异)</secondary>
           </indexterm>
       <!--
           Another way to examine your changes is with the
@@ -1681,11 +1681,11 @@
             <tertiary>patch</tertiary>
           </indexterm>
           <indexterm>
-            <primary>patches</primary>
+            <primary>patches (补丁)</primary>
           </indexterm>
           <indexterm>
-            <primary>patch file</primary>
-            <see>patches</see>
+            <primary>patch file (补丁文件)</primary>
+            <see>patches (补丁)</see>
           </indexterm>
       <!--
           The <command>svn diff</command> command produces this
@@ -1885,8 +1885,8 @@
 
       <para>
         <indexterm>
-          <primary>conflicts</primary>
-          <secondary>resolution</secondary>
+          <primary>conflicts (冲突)</primary>
+          <secondary>resolution (解决)</secondary>
           </indexterm>
       <!--
           We've already seen how <userinput>svn status
@@ -2178,8 +2178,8 @@
 
         <para>
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>reviewing</secondary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>reviewing (审查)</secondary>
           </indexterm>
       <!--
           Before deciding how to attack a conflict
@@ -2249,7 +2249,7 @@
         <para>After reviewing the information provided by these
           commands, you're ready to move on to the next action.</para>
       -->
-        <para>审核完这些命令提供的信息之后, 用户就可以采取下一步动作.</para>
+        <para>审查完这些命令提供的信息之后, 用户就可以采取下一步动作.</para>
 
       </sect3>
 
@@ -2263,9 +2263,9 @@
 
         <para>
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>resolution</secondary>
-            <tertiary>interactive</tertiary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>resolution (解决)</secondary>
+            <tertiary>interactive (交互式地)</tertiary>
           </indexterm>
       <!--
           The main way to resolve conflicts interactively
@@ -2415,9 +2415,9 @@
 
         <para>
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>resolution</secondary>
-            <tertiary>postponing</tertiary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>resolution (解决)</secondary>
+            <tertiary>postponing (推迟)</tertiary>
           </indexterm>
       <!--
           This may sound like an appropriate section for avoiding
@@ -2470,8 +2470,8 @@
         <itemizedlist>
 
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>conflict markers</secondary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>conflict markers (冲突标记)</secondary>
           </indexterm>
 
           <listitem>
@@ -2732,9 +2732,9 @@
 
         <para>
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>resolution</secondary>
-            <tertiary>manual</tertiary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>resolution (解决)</secondary>
+            <tertiary>manual (手动地)</tertiary>
           </indexterm>
       <!--
           Manually resolving conflicts can be quite intimidating the
@@ -2900,9 +2900,9 @@
   
         <para>
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>resolution</secondary>
-            <tertiary>discarding local changes</tertiary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>resolution (解决)</secondary>
+            <tertiary>discarding local changes (丢弃本地修改)</tertiary>
           </indexterm>
       <!--
           If you get a conflict and decide that you want
@@ -2948,9 +2948,9 @@
 
         <para>
           <indexterm>
-            <primary>conflicts</primary>
-            <secondary>resolution</secondary>
-            <tertiary>discarding local changes</tertiary>
+            <primary>conflicts (冲突)</primary>
+            <secondary>resolution (解决)</secondary>
+            <tertiary>discarding local changes (丢弃本地修改)</tertiary>
           </indexterm>
       <!--
           If you decide that you want to throw out your changes
@@ -4320,12 +4320,12 @@
         
     <para>
       <indexterm>
-        <primary>tree conflicts</primary>
+        <primary>tree conflicts (目录冲突)</primary>
       </indexterm>
       <indexterm>
-        <primary>conflicts</primary>
-        <secondary>tree</secondary>
-        <see>tree conflicts</see>
+        <primary>conflicts (冲突)</primary>
+        <secondary>tree (目录)</secondary>
+        <see>tree conflicts (目录冲突)</see>
       </indexterm>
     <!--
       But what happens if your collaborators move or

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -103,8 +103,8 @@
 
     <para>
       <indexterm>
-        <primary>revisions</primary>
-        <secondary>keywords</secondary>
+        <primary>revisions (版本号)</primary>
+        <secondary>keywords (关键字)</secondary>
       </indexterm>
     <!--
       TODO
@@ -151,8 +151,8 @@
       <title>版本号关键字</title>
        
       <indexterm>
-        <primary>revisions</primary>
-        <secondary>keywords</secondary>
+        <primary>revisions (版本号)</primary>
+        <secondary>keywords (关键字)</secondary>
       </indexterm>
 
     <!--
@@ -175,8 +175,8 @@
               <primary>HEAD</primary>
             </indexterm>
             <indexterm>
-              <primary>revisions</primary>
-              <secondary>keywords</secondary>
+              <primary>revisions (版本号)</primary>
+              <secondary>keywords (关键字)</secondary>
               <tertiary>HEAD</tertiary>
             </indexterm>
     <!--
@@ -194,8 +194,8 @@
               <primary>BASE</primary>
             </indexterm>
             <indexterm>
-              <primary>revisions</primary>
-              <secondary>keywords</secondary>
+              <primary>revisions (版本号)</primary>
+              <secondary>keywords (关键字)</secondary>
               <tertiary>BASE</tertiary>
             </indexterm>
     <!--
@@ -216,8 +216,8 @@
               <primary>COMMITTED</primary>
             </indexterm>
             <indexterm>
-              <primary>revisions</primary>
-              <secondary>keywords</secondary>
+              <primary>revisions (版本号)</primary>
+              <secondary>keywords (关键字)</secondary>
               <tertiary>COMMITTED</tertiary>
             </indexterm>
     <!--
@@ -236,8 +236,8 @@
               <primary>PREV</primary>
             </indexterm>
             <indexterm>
-              <primary>revisions</primary>
-              <secondary>keywords</secondary>
+              <primary>revisions (版本号)</primary>
+              <secondary>keywords (关键字)</secondary>
               <tertiary>PREV</tertiary>
             </indexterm>
     <!--
@@ -312,8 +312,8 @@
       <title>版本号日期</title>
       
       <indexterm>
-        <primary>revisions</primary>
-        <secondary>as dates</secondary>
+        <primary>revisions (版本号)</primary>
+        <secondary>as dates (日期)</secondary>
       </indexterm>
 
     <!--
@@ -614,15 +614,15 @@
 
     <para>
       <indexterm>
-        <primary>revisions</primary>
-        <secondary>peg revisions</secondary>
+        <primary>revisions (版本号)</primary>
+        <secondary>peg revisions (限定版本号)</secondary>
       </indexterm>
       <indexterm>
-        <primary>at syntax</primary>
+        <primary>at syntax (at 语法)</primary>
       </indexterm>
       <indexterm>
         <primary>@</primary>
-        <see>at syntax</see>
+        <see>at syntax (at 语法)</see>
       </indexterm>
     <!--
       Fortunately, Subversion allows you to tell it
@@ -651,12 +651,12 @@
 
     <para>
       <indexterm>
-        <primary>revisions</primary>
-        <secondary>operative revisions</secondary>
+        <primary>revisions (版本号)</primary>
+        <secondary>operative revisions (实施版本号)</secondary>
       </indexterm>
       <indexterm>
-        <primary>revisions</primary>
-        <secondary>operative revision range</secondary>
+        <primary>revisions (版本号)</primary>
+        <secondary>operative revision range (实施版本号范围)</secondary>
       </indexterm>
     <!--
       But what of the <option>- -revision</option>
@@ -1072,7 +1072,7 @@
 
     <para>
       <indexterm>
-        <primary>properties</primary>
+        <primary>properties (属性)</primary>
       </indexterm>
     <!--
       In addition to versioning your directories and files,
@@ -3597,11 +3597,11 @@
       
       <para>
         <indexterm>
-          <primary>line endings</primary>
+          <primary>line endings (行结束标记)</primary>
         </indexterm>
         <indexterm>
-          <primary>end-of-line (EOL) markers</primary>
-          <see>line endings</see>
+          <primary>end-of-line (EOL) markers (EOL 标记)</primary>
+          <see>line endings (行结束标记)</see>
     <!--
         </indexterm>This means that by default, Subversion doesn't pay
         any attention to the type of <firstterm>end-of-line (EOL)
@@ -3625,8 +3625,8 @@
 
       <para>
         <indexterm>
-          <primary>line endings</primary>
-          <secondary>native</secondary>
+          <primary>line endings (行结束标记)</primary>
+          <secondary>native (本地的)</secondary>
     <!--
         </indexterm>Not all of the various tools on these operating
         systems understand files that contain line endings in a format
@@ -3843,15 +3843,15 @@
 
     <para>
       <indexterm>
-        <primary>file patterns</primary>
+        <primary>file patterns (文件名模式)</primary>
       </indexterm>
       <indexterm>
-        <primary>globs</primary>
-        <see>file patterns</see>
+        <primary>globs </primary>
+        <see>file patterns (文件名模式)</see>
       </indexterm>
       <indexterm>
-        <primary>shell wildcard patterns</primary>
-        <see>file patterns</see>
+        <primary>shell wildcard patterns (shell 通配符模式)</primary>
+        <see>file patterns (文件名模式)</see>
       </indexterm>
       于是, Subversion 提供了几种方式告诉 Subversion 哪些文件是可以忽略的.
       其中一种要用到 Subversion 的运行时配置系统 (见
@@ -4426,7 +4426,7 @@
 
     <para>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
       </indexterm>
       Subversion 支持把 <firstterm>关键字</firstterm> (<firstterm>keywords
       </firstterm>)—跟文件有关的一段有用的动态信息—替换成文件
@@ -4633,52 +4633,52 @@
 
     <variablelist>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>Date</secondary>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>LastChangedDate</secondary>
-        <see>keywords, Date</see>
+        <see>keywords (关键字), Date</see>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>Revision</secondary>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>LastChangedRevision</secondary>
-        <see>keywords, Revision</see>
+        <see>keywords (关键字), Revision</see>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>Rev</secondary>
-        <see>keywords, Revision</see>
+        <see>keywords (关键字), Revision</see>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>Author</secondary>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>LastChangedBy</secondary>
-        <see>keywords, Author</see>
+        <see>keywords (关键字), Author</see>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>HeadURL</secondary>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>URL</secondary>
-        <see>keywords, HeadURL</see>
+        <see>keywords (关键字), HeadURL</see>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>Id</secondary>
       </indexterm>
       <indexterm>
-        <primary>keywords</primary>
+        <primary>keywords (关键字)</primary>
         <secondary>Header</secondary>
       </indexterm>
 
@@ -5223,12 +5223,12 @@
 
     <para>
       <indexterm>
-        <primary>sparse directories</primary>
+        <primary>sparse directories (稀疏目录)</primary>
       </indexterm>
       <indexterm>
-        <primary>checkouts</primary>
-        <secondary>shallow</secondary>
-        <see>sparse directories</see>
+        <primary>checkouts (检出)</primary>
+        <secondary>shallow (浅检出)</secondary>
+        <see>sparse directories (稀疏目录)</see>
       </indexterm>
       默认情况下, 大多数 Subversion 操作在处理目录时会采用递归的方式, 比如说,
       <command>svn checkout</command> 会检出仓库指定区域内的所有文件与目录.
@@ -5324,19 +5324,19 @@
     <variablelist>
 
       <indexterm>
-        <primary>depth</primary>
+        <primary>depth (深度)</primary>
         <secondary>empty</secondary>
       </indexterm>
       <indexterm>
-        <primary>depth</primary>
+        <primary>depth (深度)</primary>
         <secondary>files</secondary>
       </indexterm>
       <indexterm>
-        <primary>depth</primary>
+        <primary>depth (深度)</primary>
         <secondary>immediates</secondary>
       </indexterm>
       <indexterm>
-        <primary>depth</primary>
+        <primary>depth (深度)</primary>
         <secondary>infinity</secondary>
       </indexterm>
 
@@ -5392,7 +5392,7 @@
 
     <para>
       <indexterm>
-        <primary>depth</primary>
+        <primary>depth (深度)</primary>
         <secondary>ambient</secondary>
       </indexterm>
       当然, 如果仅仅是把两个选项合并成一个选项, 那就没必要花费整整一节的笔墨
@@ -5928,12 +5928,12 @@
 
     <para>
       <indexterm>
-        <primary>locks</primary>
+        <primary>locks (锁)</primary>
       </indexterm>
       <indexterm>
-        <primary>checkouts</primary>
-        <secondary>reserved</secondary>
-        <see>locking</see>
+        <primary>checkouts (检出)</primary>
+        <secondary>reserved (保留地)</secondary>
+        <see>locking (加锁)</see>
       </indexterm>
       如果 Harry 和 Sally 是串行地修改图片, 那事情就会顺利很多—比如 Sally
       修改车身颜色并提交后, Harry 再去添加裂痕, 或者是 Sally 等到 Harry 添加裂
@@ -6025,8 +6025,8 @@
 
       <para>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>administrative</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>administrative (管理锁)</secondary>
           </indexterm>
           <firstterm>管理锁</firstterm> (<firstterm>administrative
             locks</firstterm>), 由 Subversion 内部使用, 用于防止多个客户端在
@@ -6047,8 +6047,8 @@
 
       <para>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>database</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>database (数据库锁)</secondary>
           </indexterm>
           使用老的 Berkeley DB 作为仓库后端的管理员需要了解 <firstterm>数据库锁
           </firstterm>, 它由 Berkeley DB 数据库内部使用, 防止多个程序在访问数
@@ -6067,7 +6067,7 @@
 
       <para>
         <indexterm>
-          <primary>locks</primary>
+          <primary>locks (锁)</primary>
           <secondary>svnsync</secondary>
         </indexterm>
         另外, <firstterm>svnsync 锁</firstterm> 可以让命令
@@ -6087,7 +6087,7 @@
 
       <para>
         <indexterm>
-          <primary>locks</primary>
+          <primary>locks (锁)</primary>
           <secondary>svnrdump</secondary>
         </indexterm>
         最后还有一个 <firstterm>svnrdump 锁</firstterm>. 它和 svnsync 锁非常
@@ -6124,18 +6124,20 @@
       
       <para>
         <indexterm>
-          <primary>locks</primary>
+          <primary>locks (锁)</primary>
         </indexterm>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>lock token</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>lock token (锁令牌)</secondary>
         </indexterm>
         <indexterm>
-          <primary>locking</primary>
-          <secondary>lock owner</secondary>
+          <primary>locking (加锁)</primary>
+          <secondary>lock owner (锁的持有者)</secondary>
         </indexterm>
         在 Subversion 仓库里, 一个 <firstterm>锁</firstterm> (<firstterm>lock
-        </firstterm>) 就是一段元数据, 它赋予了一个用户独占修改文件的权利. 仓库
+        </firstterm>) 就是一段元数据, 它赋予了一个用户独占修改文件的权利, 该
+        用户被认为是 <firstterm>锁的持有者</firstterm> (<firstterm>lock
+          owner</firstterm>). 仓库
         负责管理锁, 具体来说就是锁的创建, 实施和删除. 如果有一个提交试图修改或
         删除被锁定了的文件 (或删除文件的某个父目录), 仓库就会要求客户端提供 2
         项信息—一是执行提交操作的客户端已被授权为锁的所有者, 二是提供了
@@ -6165,8 +6167,8 @@
           <tertiary>lock</tertiary>
         </indexterm>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>creation</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>creation (创建)</secondary>
         </indexterm>
         为了演示锁的创建, 我们再以海报设计作为例子. Harry 决定修改一个 JPEG
         图片, 为了防止其他用户在他完成修改之前向该文件提交修改, 他使用命令
@@ -6315,8 +6317,8 @@
 
         <para>
           <indexterm>
-            <primary>locks</primary>
-            <secondary>breaking</secondary>
+            <primary>locks (锁)</primary>
+            <secondary>breaking (破坏)</secondary>
           </indexterm>
           比如说, 你在办公室的电脑上锁定了一个文件, 但是还没有提交修改就下
           班回家了, 如果你想在家里完成提交就会失败, 因为仅仅被授权为锁的所有
@@ -6437,8 +6439,8 @@
           <tertiary>unlock</tertiary>
         </indexterm>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>releasing</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>releasing (释放)</secondary>
         </indexterm>
         当然, 锁定文件后并不要求一定要向该文件提交修改才能释放锁, 用户可以在
         任何时候用命令 <command>svn unlock</command> 释放文件上的锁:</para>
@@ -6471,8 +6473,8 @@
           <tertiary>status</tertiary>
         </indexterm>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>discovery</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>discovery (发现)</secondary>
         </indexterm>
         如果由于其他用户锁定了文件而导致提交失败, 获取有关锁的信息非常方便,
         最简单的方式是执行 <userinput>svn status -u</userinput>:</para>
@@ -6593,8 +6595,8 @@
 
       <para>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>breaking</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>breaking (破坏)</secondary>
         </indexterm>
         锁并非是不可侵犯的—在 Subversion 的默认配置状态下, 除了创建锁的
         用户可以释放锁之外, 任意一个用户也可以释放锁. 如果释放锁的用户不是锁
@@ -6697,8 +6699,8 @@
         
       <para>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>stealing</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>stealing (窃取)</secondary>
         </indexterm>
         仅仅把锁破坏掉可能还不够. Sally 除了要打开 Harry 忘记打开的锁之外, 她
         还想重新锁定文件, 以便自己对文件进行编辑. 她可以先用带上选项 <option>
@@ -6735,8 +6737,8 @@
 
       <para>
         <indexterm>
-          <primary>locks</primary>
-          <secondary>defunct</secondary>
+          <primary>locks (锁)</primary>
+          <secondary>defunct (失效的)</secondary>
         </indexterm>
         无论锁是被破坏还是被窃取, Harry 都会感到惊讶. Harry 的工作副本仍然包
         含原来的锁令牌, 但是锁却不存在了, 此时把锁令牌称为 <firstterm>失效的
@@ -7010,14 +7012,14 @@
 
     <para>
       <indexterm>
-        <primary>externals definitions</primary>
+        <primary>externals definitions (外部定义)</primary>
       </indexterm>
       <indexterm>
-        <primary>externals</primary>
-        <see>externals definitions</see>
+        <primary>externals (外部定义)</primary>
+        <see>externals definitions (外部定义)</see>
       </indexterm>
       <indexterm>
-        <primary>properties</primary>
+        <primary>properties (属性)</primary>
         <secondary>svn:externals</secondary>
       </indexterm>
       幸运的是, Subversion 支持 <firstterm>外部定义</firstterm> (<firstterm>
@@ -7346,7 +7348,7 @@
 
     <variablelist id="svn.advanced.externals.urlmagic">
       <indexterm>
-        <primary>caret syntax</primary>
+        <primary>caret syntax (脱字符语法)</primary>
       </indexterm>
 
       <varlistentry>
@@ -7452,8 +7454,8 @@
 
     <para>
       <indexterm>
-        <primary>externals</primary>
-        <secondary>file</secondary>
+        <primary>externals (外部定义)</primary>
+        <secondary>file (文件)</secondary>
       </indexterm>
       Subversion 1.6 还支持为文件设置外部定义. <firstterm>外部文件</firstterm>
       (<firstterm>file externals</firstterm>) 的配置方式与目录相同, 外部文件
@@ -7697,17 +7699,20 @@
 
     <para>
       <indexterm>
-        <primary>working copies</primary>
-        <secondary>disjoint</secondary>
+        <primary>working copies (工作副本)</primary>
+        <secondary>disjoint (不相交的)</secondary>
         </indexterm>
         <command>svn checkout</command>, <command>svn update</command>,
         <command>svn switch</command> 和 <command>svn export</command> 这些
-        命令在管理不同子目录内的工作副本时是分开进行的, 但 <command>svn status
-        </command> 可以识别外部工作副本. <command>svn status</command> 为外部
+        命令实际上管理的是 <firstterm>不相交的</firstterm>
+        (<firstterm>disjoint</firstterm>), 检出了外部定义的子目录, 但
+        <command>svn status</command> 可以识别外部工作副本.
+        <command>svn status</command> 为外部
         工作副本所在的子目录显示字符 <literal>X</literal>, 然后递归地显示外部
-        工作副本内的各个项目的状态. 为子命令添加选项 <command>--ignore-externals
-      </command> 将会禁止子命令处理外部定义.</para>
+        工作副本内的各个项目的状态. 为子命令添加选项
+        <option>--ignore-externals</option> 将会禁止子命令处理外部定义.</para>
     <!--
+      ### TODO
         Besides the <command>svn checkout</command>, <command>svn
       update</command>, <command>svn switch</command>, and
       <command>svn export</command> commands which actually manage the
@@ -7777,7 +7782,7 @@
 
     <para>
       <indexterm>
-        <primary>changelists</primary>
+        <primary>changelists (变更列表)</primary>
       </indexterm>
       Subversion 提供了一种新方法: <firstterm>变更列表</firstterm> (<firstterm>
         changelists</firstterm>). 变更列表基本上就是一些应用到工作副本文件上
@@ -7842,8 +7847,8 @@
           <tertiary>changelist</tertiary>
         </indexterm>        
         <indexterm>
-          <primary>changelists</primary>
-          <secondary>creating</secondary>
+          <primary>changelists (变更列表)</primary>
+          <secondary>creating (创建)</secondary>
         </indexterm>
         命令 <command>svn changelist</command> 用于创建, 修改和删除变更列表,
         更准确地说这个命令可以设置或清除某个特定的工作副本文件上的变更列表关
@@ -7957,8 +7962,8 @@
           <tertiary>changelist</tertiary>
         </indexterm>        
         <indexterm>
-          <primary>changelists</primary>
-          <secondary>removing</secondary>
+          <primary>changelists (变更列表)</primary>
+          <secondary>removing (删除)</secondary>
         </indexterm>
         幸好 Harry 很快就发现了错误, 现在他有两个选择, 一是删除与 <filename>
           button.c</filename> 关联的变更列表, 然后分配一个新的变更列表:</para>
@@ -7986,8 +7991,8 @@
           <tertiary>changelist</tertiary>
         </indexterm>        
         <indexterm>
-          <primary>changelists</primary>
-          <secondary>reassigning</secondary>
+          <primary>changelists (变更列表)</primary>
+          <secondary>reassigning (重新分配)</secondary>
         </indexterm>
         二是直接向 <filename>button.c</filename> 分配一个新的变更列表, 此时
         Subversion 会先移除 <filename>button.c</filename> 原来的变更列表:</para>
@@ -8343,12 +8348,12 @@
 
       <para>
         <indexterm>
-          <primary>authentication</primary>
-          <secondary>credentials</secondary>
+          <primary>authentication (认证)</primary>
+          <secondary>credentials (证书)</secondary>
         </indexterm>
         当服务器接收到客户端发来的请求时, 它经常会要求客户端阐明自己的身份.
         服务器向客户端发送一个认证消息, 客户端提供 <firstterm>证书</firstterm>
-        (<firstterm> credentials</firstterm>) 进行响应, 认证一旦完成, 服务器便
+        (<firstterm>credentials</firstterm>) 进行响应, 认证一旦完成, 服务器便
         向客户端返回它所请求的信息. 这与 CVS 系统不同, CVS 系统的客户端先向服
         务器提供证书 (<quote>登录</quote>), 然后再发送请求. 而在 Subversion
         中, 服务器在适当的时候向客户端索要证书, 在此之前客户端不会主动向服务

Modified: branches/1.8/zh/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.8/zh/book/ch04-branching-and-merging.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -74,7 +74,7 @@
 
     <para>
       <indexterm>
-        <primary>branches</primary>
+        <primary>branches (分支)</primary>
       </indexterm>
       这是分支的基本概念—顾名思义, 它是一条独立存在的开发线, 如果回溯地
       足够深, 将会看到它和其他分支共享相同的历史. 一个分支的生命总是开始于复
@@ -221,7 +221,7 @@
       你的工作副本或机器遭到破坏, 之前所有的工作都会白费. 第二, 不够灵活, 除非
       你手动地把你的修改复制到其他工作副本或机器中, 否则的话你就只能在一个固定
       的工作副本上工作, 如果要把半成员品分享给其他人也很麻烦. 一种比较良好的
-      软件工程做法是允许团队中的其他成员审核你的修改, 如果别人不能看到你在中间
+      软件工程做法是允许团队中的其他成员审查你的修改, 如果别人不能看到你在中间
       阶段的提交, 你将得不到别人的反馈, 甚至在错误的方向上努力多日, 直到别人
       注意到你的工作. 最后, 当你完成所有的修改时, 你可能会发现很难把你的修改
       合并到仓库里. Sally (或其他人) 可能在你工作的过程中向仓库提交了很多修改,
@@ -290,8 +290,8 @@
 
       <para>
         <indexterm>
-          <primary>copying</primary>
-          <secondary>remote copies</secondary>
+          <primary>copying (复制)</primary>
+          <secondary>remote copies (远程复制)</secondary>
         </indexterm>
         <indexterm>
           <primary>svn</primary>
@@ -299,8 +299,8 @@
           <tertiary>copy</tertiary>
         </indexterm>
         <indexterm>
-          <primary>branches</primary>
-          <secondary>creating</secondary>
+          <primary>branches (分支)</primary>
+          <secondary>creating (创建)</secondary>
           </indexterm>
           读者应该已经见过如何在工作副本中用命令 <command>svn copy</command>
           复制出一个新文件或目录, 除了工作副本, 它还可以完成 <firstterm>远程复制
@@ -768,7 +768,7 @@
 
     <para>
       <indexterm>
-        <primary>merging</primary>
+        <primary>merging (合并)</primary>
       </indexterm>
       因此在工作的过程中, 你和 Sally 会继续分享修改, 哪些修改值得分享完全由你
       来决定, Subversion 允许用户有选择地在分支之间 <quote>复制</quote> 修改.
@@ -820,7 +820,7 @@
       <title>合并跟踪</title>
       <para>
         <indexterm>
-          <primary>merge tracking</primary>
+          <primary>merge tracking (合并跟踪)</primary>
         </indexterm>
         Subversion 1.5 增加了 <firstterm>合并跟踪</firstterm> (<firstterm>
           merge tracking</firstterm>) 特性, 在引入这个特性之前, 为了跟踪合并,
@@ -854,7 +854,7 @@
 
       <para>
         <indexterm>
-          <primary>changesets</primary>
+          <primary>changesets (变更集)</primary>
         </indexterm>
         在继续之前, 我们需要提醒读者后面的内容会经常讨论到 <quote>修改</quote>.
         对版本控制系统有经验的用户经常混用 <quote>修改</quote> (change) 和
@@ -938,8 +938,8 @@
 
       <para>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>sync merges</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>sync merges (同步合并)</secondary>
         </indexterm>
         <indexterm>
           <primary>svn</primary>
@@ -954,8 +954,8 @@
           sync merge</firstterm>) 完成, 自动同步合并的目的是为了让分支与祖先
         分支上的修改保持同步.
         <indexterm>
-          <primary>merging</primary>
-          <secondary>automatic</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>automatic (自动的)</secondary>
         </indexterm> <quote>自动</quote> 合并的意思是用户只需要提供
         合并所需的最小信息 (也就是合并的源以及被合并的工作副本目标), 至于哪些
         修改需要合并则交由 Subversion 决定—在自动合并中, 不需要通过
@@ -976,7 +976,7 @@
         any changes made to its ancestral parent branch since your
         branch was created.
         <indexterm>
-          <primary>merging</primary>
+          <primary>merging (合并)</primary>
           <secondary>automatic</secondary>
         </indexterm> An <quote>automatic</quote> merge is simply
         one in which you provide the bare minimum of information required
@@ -1029,7 +1029,7 @@
 
       <para>
         <indexterm>
-          <primary>properties</primary>
+          <primary>properties (属性)</primary>
           <secondary>svn:mergeinfo</secondary>
           </indexterm>
           命令 <userinput>svn merge <replaceable>URL</replaceable></userinput>
@@ -1064,7 +1064,7 @@
       <tip>
         <para>
           <indexterm>
-            <primary>mergeinfo</primary>
+            <primary>mergeinfo (合并信息)</primary>
           </indexterm>
           在本书及其他地方 (包括 Subversion 邮件列表, 讨论合并跟踪的文章等),
           你会经常听到一个术语 <firstterm>合并信息</firstterm>
@@ -1500,12 +1500,12 @@
       <title>子目录合并与子目录合并信息</title>
       <para>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>subtree merge</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>subtree merge (子目录合并)</secondary>
         </indexterm>
         <indexterm>
-          <primary>mergeinfo</primary>
-          <secondary>subtree mergeinfo</secondary>
+          <primary>mergeinfo (合并信息)</primary>
+          <secondary>subtree mergeinfo (子目录合并信息)</secondary>
         </indexterm>
         在本章的大部分例子中, 被合并的目标都是分支 (见
         <xref linkend="svn.branchmerge.whatis"/>) 的根目录, 虽然这是最常见的
@@ -1592,8 +1592,8 @@
 
       <para>
         <indexterm>
-          <primary>mergeinfo</primary>
-          <secondary>elision</secondary>
+          <primary>mergeinfo (合并信息)</primary>
+          <secondary>elision (省略)</secondary>
         </indexterm>
         你可能会感到奇怪, 为什么上面的例子里我们只合并了 r958, 但
         <filename>INSTALL</filename> 却含有 r651-652 的合并信息, 这是由于合并
@@ -1708,8 +1708,8 @@
       <para>现在, 使用 <command>svn merge</command> 把分支上的修改合并到主干
         上, 这种类型的合并称为
         <indexterm>
-          <primary>merging</primary>
-          <secondary>reintegrate merges</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>reintegrate merges (自动再整合合并)</secondary>
         </indexterm> <quote>自动再整合</quote> (automatic reintegrate) 合并,
         在执行合并之前, 用户需要一份 <filename>/calc/trunk</filename> 的工作
         副本, 可以用 <command>svn checkout</command> 或
@@ -1720,7 +1720,7 @@
         replicate your branch changes back into the trunk.  This type of
         merge is called an
         <indexterm>
-          <primary>merging</primary>
+          <primary>merging (合并)</primary>
           <secondary>reintegrate merges</secondary>
         </indexterm> <quote>automatic reintegrate</quote> merge.  You'll need
         a working copy of <filename>/calc/trunk</filename>.  You can get one
@@ -1898,7 +1898,7 @@
         <xref linkend="svn.branchmerge.basicmerging.resurrect"/>).</para>
       -->
       <para>不过, 分支的历史不是很重要吗? 如果有人想查看分支的每一次修改,
-        审核特性的演变怎么办? 不用担心, 虽然你的分支在
+        审查特性的演变怎么办? 不用担心, 虽然你的分支在
         <filename>/calc/branches</filename> 再也看不到了, 但是它在仓库的历史
         里依然存在. 在 <filename>/calc/branches</filename> 的 URL 上执行
         一个简单的 <command>svn log</command>, 就可以看到分支的全部历史.
@@ -1936,8 +1936,8 @@
 
       <para>
         <indexterm>
-          <primary>mergeinfo</primary>
-          <secondary>property</secondary>
+          <primary>mergeinfo (合并信息)</primary>
+          <secondary>property (属性)</secondary>
         </indexterm>
         Subversion 跟踪变更集的基本机制—也就是判断哪些修改已经合并到哪些
         分支上—是在版本化的属性中记录数据. 更确切地说, 与合并相关的数据
@@ -2220,12 +2220,12 @@
 
         <para>
           <indexterm>
-            <primary>mergeinfo</primary>
-            <secondary>inheritance</secondary>
+            <primary>mergeinfo (合并信息)</primary>
+            <secondary>inheritance (继承)</secondary>
           </indexterm>
           <indexterm>
-            <primary>mergeinfo</primary>
-            <secondary>explicit</secondary>
+            <primary>mergeinfo (合并信息)</primary>
+            <secondary>explicit (显式的)</secondary>
           </indexterm>
           如果某个路径具有属性 <literal>svn:mergeinfo</literal>, 我们就说它
           含有 <firstterm>显式的合并信息</firstterm> (<firstterm>explicit
@@ -2915,8 +2915,8 @@
 
       <para>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>cherrypicking</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>cherrypicking (精选)</secondary>
         </indexterm>
         和术语 <quote>变更集</quote> 一样, 术语 <firstterm>精选</firstterm>
         (<firstterm>cherrypicking</firstterm>) 也经常出现在版本控制系统中.
@@ -3125,8 +3125,8 @@
 
       <para>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>backporting</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>backporting (回植)</secondary>
         </indexterm>
         将一个新版本上的修改 <firstterm>回植</firstterm> (<firstterm>
           backporting</firstterm>) 到另一个分支可能是精选修改最常见的需求,
@@ -3309,16 +3309,16 @@
 
       <orderedlist>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>left side</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>left side (左侧)</secondary>
         </indexterm>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>right side</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>right side (右侧)</secondary>
         </indexterm>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>target</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>target (目标)</secondary>
         </indexterm>
 
         <listitem>
@@ -3394,7 +3394,7 @@
         as a shorthand for situations when you're comparing two
         different revisions of the same URL.
         <indexterm>
-          <primary>merging</primary>
+          <primary>merging (合并)</primary>
           <secondary>2-URL</secondary>
         </indexterm> This type of merge is referred to (for obvious
         reasons) as a <quote>2-URL</quote> merge. The last syntax shows
@@ -3404,8 +3404,8 @@
         <para>第一种语法显式地指定了三个参数; 如果被比较的是同一 URL 的两个不同
         版本号, 可以像第二种语法那样简写,
         <indexterm>
-          <primary>merging</primary>
-          <secondary>2-URL</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>2-URL (二路 URL)</secondary>
         </indexterm>
         这种类型的合并称为 <quote>二路 URL
         </quote> 合并 (原因显而易见); 第三种语法说明工作副本参数是可选的,
@@ -3564,12 +3564,12 @@
 
         <para>
           <indexterm>
-            <primary>mergeinfo</primary>
-            <secondary>implicit</secondary>
+            <primary>mergeinfo (合并信息)</primary>
+            <secondary>implicit (隐式的)</secondary>
           </indexterm>
           <indexterm>
-            <primary>natural history</primary>
-            <see>mergeinfo, implicit</see>
+            <primary>natural history (自动历史)</primary>
+            <see>mergeinfo (合并信息), implicit (隐式的)</see>
           </indexterm>
           在讨论
           <xref linkend="svn.branchmerge.basicmerging.mergeinfo.inheritance"/>
@@ -4342,7 +4342,7 @@
 
       <para>
         <indexterm>
-          <primary>ancestry</primary>
+          <primary>ancestry (祖先)</primary>
         </indexterm>
         如果与 Subversion 开发人员交谈, 你可能会经常听到一个术语: <firstterm>
           祖先</firstterm> (<firstterm>ancestry</firstterm>). 这个术语描述了
@@ -4447,8 +4447,8 @@
       <tip>
         <para>
         <indexterm>
-          <primary>merge tracking</primary>
-          <secondary>disabling</secondary>
+          <primary>merge tracking (合并跟踪)</primary>
+          <secondary>disabling (禁止)</secondary>
         </indexterm>
         属性 <option>--ignore-ancestry</option> 还会禁止
         <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>, 这就
@@ -5248,7 +5248,7 @@
 
     <para>
       <indexterm>
-        <primary>tags</primary>
+        <primary>tags (标签)</primary>
       </indexterm>
       另一个常见的版本控制概念是标签. 标签是项目的一个 <quote>快照</quote>,
       它在 Subversion 中到处都是, 因为每一个版本号都对应着提交后, 文件系统的
@@ -5465,7 +5465,7 @@
         your exact changes.</para>
       -->
       <para>有些用户已经发现了这个特性的其他一些用法. 有时候用户的工作副本
-        可能包含了一堆本地修改, 他想让其他用户审核一下, 但这次不是用
+        可能包含了一堆本地修改, 他想让其他用户审查一下, 但这次不是用
         <command>svn diff</command> 生成并发送补丁 (<command>svn diff</command>
         无法体现目录或符号链接的变化), 而是用 <command>svn copy</command> 把
         当前状态下的工作副本 <quote>上传</quote> 到仓库中的适当位置, 例如你的
@@ -5942,8 +5942,8 @@
 
       <para>
         <indexterm>
-          <primary>branches</primary>
-          <secondary>feature branches</secondary>
+          <primary>branches (分支)</primary>
+          <secondary>feature branches (特性分支)</secondary>
         </indexterm>
         <firstterm>特性分支</firstterm> (<firstterm>feature branch</firstterm>)
         是分支的一种类型, 它曾是本章的主要例子 (在这个例子中, 你在分支上工作,
@@ -5985,7 +5985,7 @@
           /trunk</filename> 的提交就是一场大混战. 不使用特性分支的好处是操作
         简单—开发人员不用了解分支或合并. 缺点是主干上的代码会经常处于不
         可用状态. 还有些项目过度使用分支: 没有一个修改是直接提交到主干上的,
-        即使是非常简单的修改, 也要创建一个短期分支, 认真地审核修改后再合并到
+        即使是非常简单的修改, 也要创建一个短期分支, 认真地审查修改后再合并到
         主干, 然后再删除分支. 这样做保证了主干上的代码总是可用的, 但代价就是
         极大的过程开销.</para>
 
@@ -6008,7 +6008,7 @@
         代码应该总是可编译的, 而且通过了所有的回归测试. 只有当修改含有大量不
         稳定的提交时, 才会创建特性分支. 一条很好的经验法则是: 让一个程序员
         单独工作几天, 然后一次性提交所有修改 (于是 <filename>/trunk</filename>
-        总是可用的), 如果这个提交所包含的修改过于庞大, 以致于无法审核, 那就
+        总是可用的), 如果这个提交所包含的修改过于庞大, 以致于无法审查, 那就
         应该在特性分支中完成开发, 然后再合并到主干上. 因为每次提交到分支上的
         修改相对较小, 它们可以轻易地被同行审议.</para>
 
@@ -6097,13 +6097,9 @@
 
     <para>
       <indexterm>
-        <primary>branches</primary>
-        <secondary>vendor branches</secondary>
+        <primary>branches (分支)</primary>
+        <secondary>vendor branches (供方分支)</secondary>
       </indexterm>
-      <indexterm>
-        <primary>branches</primary>
-        <secondary>vendor branches</secondary>
-      </indexterm>
       软件开发过程中可能会遇到这样一种情况, 用户所维护的代码依赖其他人的数据,
       通常来说, 项目会要求所依赖的数据尽量处于最新状态, 但不能影响稳定性.
       只要某个团队所维护的数据会对另一个团队产生直接的影响, 这种场景就会一直
@@ -6196,7 +6192,7 @@
 
     <para>
       <indexterm>
-        <primary>vendor drop</primary>
+        <primary>vendor drop (供方物资)</primary>
       </indexterm>
       解决办法是使用 <firstterm>供方分支</firstterm> (<firstterm>vendor
         branches</firstterm>). 供方分支是一个存在于你自己的版本控制系统中的
@@ -6353,20 +6349,20 @@
 
       <para>
         <indexterm>
-          <primary>merging</primary>
-          <secondary>foreign repository merges</secondary>
+          <primary>merging (合并)</primary>
+          <secondary>foreign repository merges (外部仓库合并)</secondary>
         </indexterm>
         <indexterm>
-          <primary>foreign repository merges</primary>
-          <see>merging, foreign repository merges</see>
+          <primary>foreign repository merges (外部仓库合并)</primary>
+          <see>merging (合并), foreign repository merges (外部仓库合并)</see>
         </indexterm>
         <indexterm>
-          <primary>copying</primary>
-          <secondary>foreign repository copies</secondary>
+          <primary>copying (复制)</primary>
+          <secondary>foreign repository copies (外部仓库复制)</secondary>
         </indexterm>
         <indexterm>
-          <primary>foreign repository copies</primary>
-          <see>copying, foreign repository copies</see>
+          <primary>foreign repository copies (外部仓库复制)</primary>
+          <see>copying (复制), foreign repository copies (外部仓库复制)</see>
         </indexterm>
         从 Subversion 1.5 开始, <command>svn merge</command> 支持
         <firstterm>外部仓库合并</firstterm> (<firstterm>foreign repository
@@ -6540,7 +6536,7 @@
         testing or review we need, we can commit the changes to our
         vendor branch.</para>
       -->
-      <para>冲突一旦解决, 并且测试和审核都没有问题后, 就可以提交到供方分支上.
+      <para>冲突一旦解决, 并且测试和审查都没有问题后, 就可以提交到供方分支上.
       </para>
 
       <informalexample>
@@ -6930,7 +6926,7 @@
         上, 并将修改区域重叠的文件标记为冲突. Subversion 检测到冲突后, 将允许
         用户解决冲突 (使用 <xref linkend="svn.tour.cycle.resolve" /> 介绍的方
         法), 使得我们的定制化修改在 libcomplex 1.0.1 中仍能正常工作. 冲突一旦
-        解决, 并且审核与测试后都没出现什么问题, 就可以提交了.</para>
+        解决, 并且审查与测试后都没出现什么问题, 就可以提交了.</para>
 
       <informalexample>
         <screen>
@@ -7057,13 +7053,13 @@
       -->
     <para>然而, 使用分支的缺点是它的隔离性 <emphasis>会</emphasis> 与团队的
       协作需求相抵触. 取决于同事的工作习惯, 提交到分支上的修改可能不像主线上
-      的修改那样, 得到非常充分的讨论, 审核与测试. 分支的隔离性会鼓励用户抛弃
-      版本控制的 <quote>最佳做法</quote>, 导致版本历史难以在事后进行审核.
+      的修改那样, 得到非常充分的讨论, 审查与测试. 分支的隔离性会鼓励用户抛弃
+      版本控制的 <quote>最佳做法</quote>, 导致版本历史难以在事后进行审查.
       在长期存在的分支上工作的开发人员有时候需要付出额外的努力, 以确保分支的
       演化方向与同事的保持一致. 对于有些分支而言, 这些缺点都不算是问题, 因为
       它们只是试探性的分支, 仅仅是在尝试代码库未来的发展方向, 将来不会被整合
       到主线上. 但是有一个简单的
-      事实不容忽视, 那就是代码及其修改如果能得到更多人的审核与理解, 那么对项目
+      事实不容忽视, 那就是代码及其修改如果能得到更多人的审查与理解, 那么对项目
       而言通常是有好处的.</para>
 
       <!--

Modified: branches/1.8/zh/book/ch05-repository-admin.xml
===================================================================
--- branches/1.8/zh/book/ch05-repository-admin.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ch05-repository-admin.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -1315,7 +1315,7 @@
         
         <para>
           <indexterm>
-            <primary>properties</primary>
+            <primary>properties (属性)</primary>
             <secondary>ephemeral transaction properties</secondary>
           </indexterm>
           从 Subversion 1.8 开始, 向 Subversion 1.8 服务器提交修改的客户端,

Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml	2019-10-20 11:36:26 UTC (rev 6005)
+++ branches/1.8/zh/book/ref-svn.xml	2019-10-27 11:48:39 UTC (rev 6006)
@@ -6384,7 +6384,7 @@
       -->
       <para>如果修改是在调整了偏移后应用的, 或者是被模糊应用的, 那么 Subversion
         将报告这一情况, 相关的信息在输出时以字符 <literal>></literal> 开始,
-        用户应该认真审核这些修改.</para>
+        用户应该认真审查这些修改.</para>
 
       <!--
       <para>If the patch removes all content from a file, that




More information about the svnbook-dev mailing list