[svnbook] r5553 committed - branches/1.8/zh/book/ch05-repository-admin.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5553
          http://sourceforge.net/p/svnbook/source/5553
Author:   wuzhouhui
Date:     2017-12-26 12:07:24 +0000 (Tue, 26 Dec 2017)
Log Message:
-----------
1.8/zh: translation of chapter 5 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch05-repository-admin.xml

Modified: branches/1.8/zh/book/ch05-repository-admin.xml
===================================================================
--- branches/1.8/zh/book/ch05-repository-admin.xml	2017-12-25 12:11:54 UTC (rev 5552)
+++ branches/1.8/zh/book/ch05-repository-admin.xml	2017-12-26 12:07:24 UTC (rev 5553)
@@ -602,6 +602,7 @@
         并没有特殊的要求—在它看来, 一个目录只是个目录而已. 总而言之,
         仓库的布局应该满足项目及其开发人员的需求.</para>
 
+      <!--
       <para>In the name of full disclosure, though, we'll mention
         another very common layout.  In this layout, the
         <filename>trunk</filename>, <filename>tags</filename>, and
@@ -608,6 +609,11 @@
         <filename>branches</filename> directories live in the root
         directory of your repository, and your projects are in
         subdirectories beneath those, like so:</para>
+      -->
+      <para>为了使讨论更加完整, 再介绍一种非常常见的仓库布局. 在这种布局里,
+        <filename>trunk</filename>, <filename>tags</filename> 和
+        <filename>branches</filename> 位于仓库的根目录, 而各个项目是它们各
+        自的子目录, 例如:</para>
 
       <informalexample>
         <literallayout>
@@ -630,6 +636,7 @@
 </literallayout>
       </informalexample>
 
+      <!--
       <para>There's nothing particularly incorrect about such a
         layout, but it may or may not seem as intuitive for your
         users.  Especially in large, multiproject situations with
@@ -644,13 +651,26 @@
         a single repository path that holds the entire
         history—past, present, tagged, and branched—for
         that project and that project alone.</para>
+      -->
+      <para>这种布局并没有什么错误的地方, 但是对用户来说可能不够直观. 如果项
+        目很多, 并且每个项目都比较复杂, 开发人员也很多, 那么开发人员可能更希
+        望每个仓库只包含一两个项目. 但上面的做法倾向于弱化项目的独特性, 更
+        希望把整个项目集合看作一个单一的实体. 尽管这只是一个社交问题, 但我们
+        更希望读者使用一开始就推荐的仓库布局, 因为如果在一个单一的仓库路径上
+        单独记录了一个项目的整个历史, 那么查询 (修改或迁移) 单个项目的整个历
+        史—过去的, 现在的, 打过标签的和创建过分支的—就更加方便.
+      </para>
 
     </sect2>
 
     <!-- =============================================================== -->
     <sect2 id="svn.reposadmin.basics.hosting">
+      <!--
       <title>Deciding Where and How to Host Your Repository</title>
+      -->
+      <title>确定仓库的托管方式和位置</title>
 
+      <!--
       <para>Before creating your Subversion repository, an obvious
         question you'll need to answer is where the thing is going to
         live.  This is strongly connected to myriad other
@@ -661,6 +681,12 @@
         Subversion (repository browsing interfaces, email-based
         commit notification, etc.), your data backup strategy, and so
         on.</para>
+      -->
+      <para>在创建你的 Subversion 仓库之前, 需要回答的一个问题是仓库应该放在
+        哪里. 这个问题关系到很多其他的选择, 例如仓库的访问方式 (是通过
+        Subversion 服务器进行访问, 还是直接访问), 哪些用户可以访问 (是只允许
+        公司的内部员工, 还是开放给整个互联网), 围绕着 Subversion 还提供了哪
+        些服务 (仓库浏览接口, 基于邮件的提交通知等), 数据的备份策略等.</para>
 
       <para>We cover server choice and configuration in
         <xref linkend="svn.serverconfig" />, but the point we'd like