[svnbook] r5702 committed - branches/1.8/zh
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sun May 27 09:41:39 CDT 2018
Revision: 5702
http://sourceforge.net/p/svnbook/source/5702
Author: wuzhouhui
Date: 2018-05-27 14:41:35 +0000 (Sun, 27 May 2018)
Log Message:
-----------
1.8/zh: merge from trunk
Modified Paths:
--------------
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/ch06-server-configuration.xml
branches/1.8/zh/book/ref-svn.xml
Property Changed:
----------------
branches/1.8/zh/
Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh 2018-05-27 14:41:35 UTC (rev 5702)
Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-5495
\ No newline at end of property
+/trunk/en:5303-5701
\ No newline at end of property
Modified: branches/1.8/zh/book/ch02-basic-usage.xml
===================================================================
--- branches/1.8/zh/book/ch02-basic-usage.xml 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh/book/ch02-basic-usage.xml 2018-05-27 14:41:35 UTC (rev 5702)
@@ -1057,19 +1057,14 @@
<!--
<para>Use this to schedule the file, directory, or
symbolic link <filename>FOO</filename> to be deleted
- from the repository. If <filename>FOO</filename> is a
- file or link, it is immediately deleted from your
- working copy. If <filename>FOO</filename> is a
- directory, it is not deleted, but Subversion schedules
- it for deletion. When you commit your
- changes, <filename>FOO</filename> will be entirely
- removed from your working copy and the
- repository.<footnote><para>Of course, nothing is ever
- totally deleted from the repository—just from
- its <literal>HEAD</literal> revision. You may continue
- to access the deleted item in previous revisions.
- Should you desire to resurrect the item so that it is
- again present in <literal>HEAD</literal>, see
+ from the repository. <filename>FOO</filename> is
+ immediately deleted from your working copy.
+ (Of course, nothing is ever totally deleted from the
+ repository—just from its <literal>HEAD</literal> revision.
+ You may continue to access the deleted item in previous
+ revisions).
+ <footnote><para>Should you desire to resurrect the item
+ so that it is again present in <literal>HEAD</literal>, see
<xref linkend="svn.branchmerge.basicmerging.resurrect"
/>.</para></footnote></para>
-->
@@ -1944,7 +1939,7 @@
repository. One marked with
<computeroutput>G</computeroutput> had local changes to begin
with, but the changes coming from the repository didn't
- overlap with those local changes.</para>
+ conflict with those local changes.</para>
-->
<para>不用担心左边有 <computeroutput>U</computeroutput> (Updated, 更新)
或 <computeroutput>G</computeroutput> (merGed, 合并) 的文件, 这表示
@@ -2449,8 +2444,8 @@
<!--
<para>Beginning with Subversion 1.8, an internal file merge
tool allows you to postpone conflict resolution for certain
- conflicts, but resolve other confilcts. Therefore, you can
- postpone conflict resolution area-by-area, not just on
+ conflicts, but resolve other conflicts. Therefore, you can
+ postpone conflict resolution area-by-area, not just on a
file-to-file basis.</para>
-->
<para>从 Subversion 1.8 开始, 内部的文件合并工具允许用户推迟解决
@@ -2642,7 +2637,7 @@
the <option>- -accept</option> option, which allows you
specify your desired approach for resolving the conflict.
Prior to Subversion 1.8, the <command>svn resolve</command>
- <emphasis>required</emphasis> the use of this option.
+ command <emphasis>required</emphasis> the use of this option.
Subversion now allows you to run the <command>svn
resolve</command> command without that option. When you do
so, Subversion cranks up its interactive conflict resolution
@@ -3117,7 +3112,7 @@
<!--
<para>At this point, you need to run <userinput>svn
update</userinput>, deal with any merges or conflicts that
- result, and attempt your commit again.</para>
+ result, and then attempt your commit again.</para>
-->
<para>此时用户需要执行 <userinput>svn update</userinput>, 解决可能
的冲突, 然后再次尝试提交.</para>
Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml 2018-05-27 14:41:35 UTC (rev 5702)
@@ -6813,14 +6813,13 @@
<para>Subversion defaults to the <quote>softer</quote>
approach, but still allows administrators to create stricter
enforcement policies through the use of hook scripts. In
- particular, the <filename>pre-lock</filename> and
- <filename>pre-unlock</filename> hooks allow administrators
+ particular, the pre-lock and
+ pre-unlock hooks allow administrators
to decide when lock creation and lock releases are allowed
to happen. Depending on whether a lock already exists,
these two hooks can decide whether to allow a certain user
to break or steal a lock. The
- <filename>post-lock</filename> and
- <filename>post-unlock</filename> hooks are also available,
+ post-lock and post-unlock hooks are also available,
and can be used to send email after locking actions. To
learn more about repository hooks, see
<xref linkend="svn.reposadmin.hooks" />.</para>
Modified: branches/1.8/zh/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.8/zh/book/ch04-branching-and-merging.xml 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2018-05-27 14:41:35 UTC (rev 5702)
@@ -4720,7 +4720,7 @@
repository to prevent older clients from committing changes.
The easy way to do this is by inspecting
the <quote>capabilities</quote> parameter in
- the <literal>start-commit</literal> hook script. If the
+ the start-commit hook script. If the
client reports itself as having <literal>mergeinfo</literal>
capabilities, the hook script can allow the commit to start.
If the client doesn't report that capability, have the hook
Modified: branches/1.8/zh/book/ch05-repository-admin.xml
===================================================================
--- branches/1.8/zh/book/ch05-repository-admin.xml 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh/book/ch05-repository-admin.xml 2018-05-27 14:41:35 UTC (rev 5702)
@@ -1117,7 +1117,7 @@
<para>The syntax of the <filename>hooks-env</filename> file is
pretty straightforward: each section name is the name of a
hook script (such as <literal>pre-commit</literal>
- or <literal>post-revprop-change</literal>, and the
+ or <literal>post-revprop-change</literal>), and the
configuration items inside that section are treated as
mappings of environment variable names to desired values.
Additionally, there is a
@@ -1493,7 +1493,7 @@
about a commit transaction should be considered read-only.
Instead of modifying a transaction to polish its payload,
simply <emphasis>validate</emphasis> the transaction in
- the <filename>pre-commit</filename> hook and reject the
+ the pre-commit hook and reject the
commit if it does not meet the desired requirements. As a
bonus, your users will learn the value of careful,
compliance-minded work habits.</para>
@@ -1664,8 +1664,8 @@
attempts to change the repository. <command>svnlook</command>
is typically used by the repository hooks for reporting the
changes that are about to be committed (in the case of the
- <command>pre-commit</command> hook) or that were just
- committed (in the case of the <command>post-commit</command>
+ pre-commit hook) or that were just
+ committed (in the case of the post-commit
hook) to the repository. A repository administrator may use
this tool for diagnostic purposes.</para>
-->
@@ -2114,7 +2114,7 @@
<para>Sometimes a user will have an error in her log message (a
misspelling or some misinformation, perhaps). If the
repository is configured (using the
- <literal>pre-revprop-change</literal> hook; see
+ pre-revprop-change hook; see
<xref linkend="svn.reposadmin.hooks" />) to accept changes to
this log message after the commit is finished, the user
can <quote>fix</quote> her log message remotely using
@@ -2157,8 +2157,8 @@
<para>The <command>svnadmin setlog</command> command, by
default, is still bound by the same protections against
modifying unversioned properties as a remote client
- is—the <literal>pre-revprop-change</literal> and
- <literal>post-revprop-change</literal> hooks are still
+ is—the pre-revprop-change and
+ post-revprop-change hooks are still
triggered, and therefore must be set up to accept changes of
this nature. But an administrator can get around these
protections by passing the <option>- -bypass-hooks</option>
@@ -3015,7 +3015,7 @@
<para>Another neat trick you can perform with this
<option>- -incremental</option> option involves appending to an
existing dump file a new range of dumped revisions. For
- example, you might have a <literal>post-commit</literal> hook
+ example, you might have a post-commit hook
that simply appends the repository dump of the single revision
that triggered the hook. Or you might have a script that runs
nightly to append dump file data for all the revisions that
@@ -3891,7 +3891,7 @@
that only it is doing those things. We accomplish this by
implementing two of the repository event
hooks—pre-revprop-change and start-commit. Our
- <filename>pre-revprop-change</filename> hook script is found
+ pre-revprop-change hook script is found
in <xref
linkend="svn.reposadmin.maint.replication.pre-revprop-change"
/>, and basically verifies that the user attempting the
@@ -3927,7 +3927,7 @@
<para>That covers revision property changes. Now we need to
ensure that only the <literal>syncuser</literal> user is
permitted to commit new revisions to the repository. We do
- this using a <filename>start-commit</filename> hook script
+ this using a start-commit hook script
such as the one in <xref
linkend="svn.reposadmin.maint.replication.start-commit"
/>.</para>
Modified: branches/1.8/zh/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/zh/book/ch06-server-configuration.xml 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh/book/ch06-server-configuration.xml 2018-05-27 14:41:35 UTC (rev 5702)
@@ -1087,7 +1087,7 @@
<para>Be sure that your <filename>/etc/services</filename>
configuration file contains the definition of the port used
for the <literal>svn</literal> protocol (as described in
- <xref linkend="svn.serverconfig.svnserve.invoking.xinetd"
+ <xref linkend="svn.serverconfig.svnserve.invoking.inetd"
/>), otherwise the daemon will not start correctly.</para>
-->
<para>要确保 <filename>/etc/services</filename> 包含了
@@ -1656,15 +1656,19 @@
<!--
<para>As you've already guessed, a repository's
<filename>svnserve.conf</filename> file is the central
- mechanism for controlling authentication and authorization
- policies. The file has the same format as other configuration
- files (see <xref linkend="svn.advanced.confarea"/>):
- section names are marked by square brackets
- (<literal>[</literal> and <literal>]</literal>), comments
- begin with hashes (<literal>#</literal>), and each section
- contains specific variables that can be set (<literal>variable
- = value</literal>). Let's walk through these files and learn
- how to use them.</para>
+ mechanism for controlling access to the repository. When used
+ in conjunction with other supplemental files described in this
+ section, this configuration file offers an administrator a
+ complete solution for governing user authentication and
+ authorization policies. Each of the files we'll discuss uses
+ the format common to other configuration files (see
+ <xref linkend="svn.advanced.confarea"/>): section names are
+ marked by square brackets (<literal>[</literal>
+ and <literal>]</literal>), comments begin with hashes
+ (<literal>#</literal>), and each section contains specific
+ variables that can be set (<literal>variable =
+ value</literal>). Let's walk through these files now and
+ learn how to use them.</para>
-->
<para>读者可能已经猜到了, 仓库里的 <filename>svnserve.conf</filename>
正是控制认证和授权策略的关键. 该文件的格式和其他配置文件相同 (见
@@ -2055,8 +2059,7 @@
how to configure the server appropriately for each. For the
purposes of this discussion, we'll just demonstrate a simple
example of configuring the DIGEST-MD5 mechanism. For
- example, if your <filename>subversion.conf</filename>
- (or <filename>svn.conf</filename>) file contains the
+ example, if your <filename>svn.conf</filename> file contains the
following:</para>
-->
<para>因为 SASL 提供了多种不同的认证机制, 描述每一种可能的服务器端
@@ -2670,17 +2673,6 @@
the <filename>svnserve.conf</filename> configuration
file.</para>
- <para>You may also specify the location of a groups file
- which is versioned inside a Subversion repository.
- Use a local URL (one which begins
- with <literal>file://</literal>) to refer to an
- absolute Subversion-versioned file. Alternatively,
- you may use a repository relative URL (one which
- begins with <literal>^/</literal>) to cause
- <command>svnserve</command> to consult for each
- repository the group file stored at the specified
- relative URL within that repository.</para>
-
<para>See
<xref linkend="svn.reposadmin.hooks.configuration" />
for detailed information regarding the hook script
@@ -3103,7 +3095,7 @@
</itemizedlist>
<para>Of course, you might have already set up
- a <filename>pre-commit</filename> hook script to prevent
+ a pre-commit hook script to prevent
commits (see <xref linkend="svn.reposadmin.hooks" />).
But as you read on, you'll see that it's also possible to use
Apache's built-in methods to restrict access in specific
@@ -4609,7 +4601,7 @@
/>.</para>
<para>First, make sure that each slave repository has a
- <filename>pre-revprop-change</filename> hook script which
+ pre-revprop-change hook script which
allows remote revision property changes. (This is
standard procedure for being on the receiving end of
<command>svnsync</command>.) Then log into the master
@@ -4664,7 +4656,7 @@
</informalexample>
<para>After this is done, we configure the master server's
- <literal>post-commit</literal> hook script to invoke
+ post-commit hook script to invoke
<command>svnsync</command> on each slave server:</para>
<informalexample>
@@ -4686,8 +4678,8 @@
commands to run in the background so that the Subversion
client isn't left waiting forever for the commit to
finish. In addition to this
- <literal>post-commit</literal> hook, you'll need a
- <literal>post-revprop-change</literal> hook as well so
+ post-commit hook, you'll need a
+ post-revprop-change hook as well so
that when a user, say, modifies a log message, the slave
servers get that change also:</para>
@@ -4955,29 +4947,39 @@
</varlistentry>
<varlistentry>
- <term><literal>SVNAllowBulkUpdates On|Off</literal></term>
+ <term><literal>SVNAllowBulkUpdates On|Off|Prefer</literal></term>
<listitem>
- <para>Toggles support for all-inclusive
- responses to update-style <literal>REPORT</literal>
- requests. Subversion clients use
+ <para>Toggles support for all-inclusive responses to
+ update-style requests. Subversion clients use
<literal>REPORT</literal> requests to get information
about directory tree checkouts and updates from
<command>mod_dav_svn</command>. They can ask the
server to send that information in one of two ways:
with the entirety of the tree's information in one
- massive response, or with a
+ massive (bulk) response, or with a
<firstterm>skelta</firstterm> (a skeletal
representation of a tree delta) which contains just
enough information for the client to know what
- <emphasis>additional</emphasis> data to request from
- the server. When this directive is included with a
- value of <literal>Off</literal>,
+ <emphasis>additional</emphasis> data to fetch from the
+ server using subsequent requests. When this directive
+ is included with a value of <literal>Off</literal>,
<command>mod_dav_svn</command> will only ever respond
to these <literal>REPORT</literal> requests with
skelta responses, regardless of the type of responses
requested by the client.</para>
+ <para>The default value of this directive is
+ <literal>On</literal>, which permits the server to
+ reply to update requests using the style of response
+ (bulk or skelta) requested by the client. Beginning
+ in Subversion 1.8, this directive also accepts a value
+ of <literal>Prefer</literal>, which is similar
+ to <literal>On</literal> but additionally causes the
+ server to announce to clients that it
+ <emphasis>prefers</emphasis> to handle bulk update
+ requests.</para>
+
<para>Most folks won't need to use this directive at
all. It primarily exists for administrators who
wish—for security or auditing reasons—to
@@ -4985,8 +4987,7 @@
files and directories needed for updates and
checkouts, thus leaving an audit trail of
<literal>GET</literal> and <literal>PROPFIND</literal>
- requests in Apache's logs. The default value of this
- directive is <literal>On</literal>.</para>
+ requests in Apache's logs.</para>
</listitem>
</varlistentry>
Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml 2018-05-27 14:35:06 UTC (rev 5701)
+++ branches/1.8/zh/book/ref-svn.xml 2018-05-27 14:41:35 UTC (rev 5702)
@@ -2358,7 +2358,9 @@
<option>--keep-local</option> option is given. The
command will not remove any unversioned or modified items;
use the <option>--force</option> option to override this
- behavior.</para>
+ behavior. A directory that contains unversioned or modified
+ items will not be deleted, unless the <option>--force</option>
+ is used.</para>
<para>Items specified by URL are deleted from
the repository via an immediate commit. Multiple URLs are
More information about the svnbook-dev
mailing list