[svnbook] r5762 committed - branches/1.8/zh/book/ ch06-server-configuration.xml

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Tue Sep 4 09:17:47 CDT 2018


Revision: 5762
          http://sourceforge.net/p/svnbook/source/5762
Author:   wuzhouhui
Date:     2018-09-04 14:17:46 +0000 (Tue, 04 Sep 2018)
Log Message:
-----------
1.8/zh: translation of chapter 6 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch06-server-configuration.xml

Modified: branches/1.8/zh/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/zh/book/ch06-server-configuration.xml	2018-09-02 02:48:24 UTC (rev 5761)
+++ branches/1.8/zh/book/ch06-server-configuration.xml	2018-09-04 14:17:46 UTC (rev 5762)
@@ -5162,6 +5162,7 @@
 </programlisting>
           </informalexample>
 
+      <!--
           <para>The previous URL would display revision 21 of the
             object which, in revision 123, was located
             at <filename>/trunk/renamed-thing.txt</filename> in the
@@ -5169,7 +5170,14 @@
             detailed explanation of these <quote>peg revision</quote>
             and <quote>operative revision</quote> concepts.  They can
             be a bit tricky to wrap your head around.</para>
+      -->
+          <para>上面的 URL 将显示对象在版本号 21 时的内容, 这个对象在版本
+            号为 123 时, 位于 <filename>/trunk/renamed-thing.txt</filename>.
+            关于 <quote>挂勾版本号</quote> 和 <quote>实施版本号</quote> 的详细
+            介绍, 见 <xref linkend="svn.advanced.pegrevs" />, 理解它们可能会
+            让你感到有点头晕.</para>
 
+      <!--
           <para>Beginning with Subversion 1.8, <command>mod_dav_svn</command>
             has the ability to substitute keywords.  When 
             <command>mod_dav_svn</command>
@@ -5180,18 +5188,36 @@
             for that parameter will cause Subversion to use its
             default behavior, which is to deliver the file's content
             without any keywords expanded.</para>
+      -->
+          <para>从 Subversion 1.8 开始, <command>mod_dav_svn</command> 具有了
+            替换关键字的能力. 如果 <command>mod_dav_svn</command> 在文件的
+            URL 里发现了查询参数 <literal>kw=1</literal>, 它将在递送文件内容
+            时, 替换掉其中的关键字. 如果省略参数 <literal>kw</literal>, 或是
+            赋予了除 <literal>1</literal> 之外的其他值, 则 Subversion 将保持
+            默认行为, 即在递送文件内容时, 不替换其中的关键字.</para>
 
+      <!--
           <para>Because keyword substitution is typically performed by the
             Subversion client as part of its working copy administration
             and management, this is a handy way to get the server to deliver
             a keyword-expanded form of your versioned file without the use
             of a working copy.</para>
+      -->
+          <para>通常情况下, 关键字替换是作为工作副本管理工作的一部分, 在客户
+            端执行, 所以说在不使用工作副本的情况下, 让服务器递送一份关键字被
+            替换后的文件, 是一件非常方便的事件.</para>
 
+      <!--
           <para>For example, if you wish to see the latest version of a
             <filename>README.txt</filename> file located in your
             project's <filename>/trunk</filename> with keywords
             expanded, add the query argument <literal>kw=1</literal> to the
             URL:</para>
+      -->
+          <para>比如说, 你想查看位于项目目录 <filename>/trunk</filename> 内,
+            最新版本的 <filename>README.txt</filename>, 而且还要求替换文件
+            内的关键字, 则在 URL 的后面添加查询参数 <literal>kw=1</literal>:
+          </para>
 
           <informalexample>
             <programlisting>




More information about the svnbook-dev mailing list