[svnbook] r5843 committed - branches/1.8/zh/book/ch07-customizing-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Fri Dec 7 22:00:26 CST 2018
Revision: 5843
http://sourceforge.net/p/svnbook/source/5843
Author: wuzhouhui
Date: 2018-12-08 04:00:22 +0000 (Sat, 08 Dec 2018)
Log Message:
-----------
1.8/zh: translation of chapter 7 in progress
Modified Paths:
--------------
branches/1.8/zh/book/ch07-customizing-svn.xml
Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml 2018-12-05 13:32:57 UTC (rev 5842)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml 2018-12-08 04:00:22 UTC (rev 5843)
@@ -658,22 +658,33 @@
</varlistentry>
</variablelist>
+ <!--
<para>The <literal>[tunnels]</literal> section allows you to
define new tunnel schemes for use with
<command>svnserve</command> and <literal>svn://</literal>
client connections. For more details, see <xref
linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
+ -->
+ <para><literal>[tunnels]</literal> 节允许用户定义新的隧道方案, 用
+ 于 <command>svnserve</command> 和 <literal>svn://</literal> 的
+ 客户端连接, 更多的细节见 <xref
+ linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
+ <!--
<para>The <literal>[miscellany]</literal> section is where
everything that doesn't belong elsewhere winds
up.<footnote><para>Anyone for potluck
dinner?</para></footnote> In this section, you can
find:</para>
+ -->
+ <para><literal>[miscellany]</literal> 节则包含了不属于其他地方的
+ 所有选项, 在 <literal>[miscellany]</literal> 里, 你可以找到:</para>
<variablelist>
<varlistentry>
<term><literal>enable-auto-props</literal></term>
<listitem>
+ <!--
<para>This instructs Subversion to automatically set
properties on newly added or imported files. The
default value is <literal>no</literal>, so set this to
@@ -680,11 +691,18 @@
<literal>yes</literal> to enable this feature.
The <literal>[auto-props]</literal> section of this file
specifies which properties are to be set on which files.</para>
+ -->
+ <para>指示 Subversion 为新增和导入的文件自动设置属性. 选项的默认
+ 值是 <literal>no</literal>, 将其设置成 <literal>yes</literal>
+ 将开启自动属性设置. 配置文件内的
+ <literal>[auto-props]</literal> 节用于指定哪些文件应该设置什么
+ 样的属性.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>global-ignores</literal></term>
<listitem>
+ <!--
<para>When running the <command>svn status</command>
command, Subversion lists unversioned files and
directories along with the versioned ones, annotating
@@ -700,7 +718,20 @@
is <literal>*.o *.lo *.la *.al .libs *.so *.so.[0-9]*
*.a *.pyc *.pyo *.rej *~ #*# .#* .*.swp
.DS_Store</literal>.</para>
+ -->
+ <para>执行命令 <command>svn status</command> 时, 除了被版本控制
+ 的文件外, Subversion 同时还会列出未被版本控制的文件, 但是这些
+ 文件的名字前会出现一个 <literal>?</literal> 字符 (见 <xref
+ linkend="svn.tour.cycle.examine.status" />). 列出这些未被版本
+ 控制的项目有时候会让人感到讨厌—例如编译过程中生成的目标
+ 文件就没必要列出来. 选项 <literal>global-ignores</literal> 包含
+ 了由空白字符分隔的文件名匹配表达式, 如果某个文件的名字与这些表
+ 达式的一个或多个相匹配, <command>svn status</command> 就不会显
+ 示这个文件名, 除非它是被版本控制的文件. 选项的默认值是
+ <literal>*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc
+ *.pyo *.rej *~ #*# .#* .*.swp .DS_Store</literal>.</para>
+ <!--
<para>As well as <command>svn status</command>, the
<command>svn add</command> and <command>svn import</command>
commands also ignore files that match the list
@@ -707,16 +738,27 @@
when they are scanning a directory. You can override this
behavior for a single instance of any of these commands
by explicitly specifying the filename, or by using
- the <option>--no-ignore</option> command-line flag.</para>
+ the <option>- -no-ignore</option> command-line flag.</para>
+ -->
+ <para>和 <command>svn status</command> 一样, 命令 <command>svn
+ add</command> 和 <command>svn import</command> 也会忽略与
+ <literal>global-ignores</literal> 匹配的文件. 为了显式地表示
+ 不想忽略某个文件, 可以在执行这三个命令时, 显式地指定文件名,
+ 或使用命令行参数 <option>--no-ignore</option>.</para>
+ <!--
<para>For information on finer-grained control of
ignored items, see
<xref linkend="svn.advanced.props.special.ignore" />.</para>
+ -->
+ <para>关于如何更加精细地忽略文件, 见 <xref
+ linkend="svn.advanced.props.special.ignore" />.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>interactive-conflicts</literal></term>
<listitem>
+ <!--
<para>This is a Boolean option that specifies whether
Subversion should try to resolve conflicts
interactively. If its value is <literal>yes</literal>
@@ -726,14 +768,21 @@
/>. Otherwise, it will simply flag the conflict and
continue its operation, postponing resolution to a later
time.</para>
+ -->
+ <para>指示 Subversion 是否应该尝试交互地解决冲突. 如果它的值是
+ <literal>yes</literal> (默认值), 在冲突发生时, Subversion
+ 将按照 <xref linkend="svn.tour.cycle.resolve"/> 介绍的方式,
+ 询问用户如何处理冲突; 否则的话, Subversion 只会给文件设置冲突
+ 标记, 然后继续往下操作, 从而推迟解决冲突.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>log-encoding</literal></term>
<listitem>
+ <!--
<para>This variable sets the default character set
encoding for commit log messages. It's a permanent
- form of the <option>--encoding</option> option (see
+ form of the <option>- -encoding</option> option (see
<xref linkend="svn.ref.svn.sw"/>). The Subversion
repository stores log messages in UTF-8 and assumes
that your log message is written using your operating
@@ -740,6 +789,14 @@
system's native locale. You should specify a
different encoding if your commit messages are written
in any other encoding.</para>
+ -->
+ <para>该选项用于设置日志消息的默认字符编码, 它是命令行参数
+ <option>--encoding</option> (见 <xref
+ linkend="svn.ref.svn.sw"/>) 的等效选项. Subversion 仓库
+ 使用 UTF-8 编码存放日志消息, 并且假设用户使用的是操作系统
+ 的默认编码来编写日志消息, 如果你不是用的操作系统的默认编码
+ 来编写日志消息的话, 那你就应该把字符编码的名字写到
+ <literal>log-encoding</literal> 里.</para>
</listitem>
</varlistentry>
<varlistentry>
More information about the svnbook-dev
mailing list