[svnbook] r5879 committed - branches/1.8/zh
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Wed Feb 13 21:13:25 CST 2019
Revision: 5879
http://sourceforge.net/p/svnbook/source/5879
Author: wuzhouhui
Date: 2019-02-14 03:13:24 +0000 (Thu, 14 Feb 2019)
Log Message:
-----------
1.8/zh: merge changes from trunk. Translation of these changes
still needed.
Modified Paths:
--------------
branches/1.8/zh/book/appc-webdav.xml
branches/1.8/zh/book/ch06-server-configuration.xml
branches/1.8/zh/book/ch07-customizing-svn.xml
branches/1.8/zh/book/ch08-embedding-svn.xml
Property Changed:
----------------
branches/1.8/zh/
Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh 2019-02-13 15:01:12 UTC (rev 5878)
+++ branches/1.8/zh 2019-02-14 03:13:24 UTC (rev 5879)
Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-5749
\ No newline at end of property
+/trunk/en:5303-5878
\ No newline at end of property
Modified: branches/1.8/zh/book/appc-webdav.xml
===================================================================
--- branches/1.8/zh/book/appc-webdav.xml 2019-02-13 15:01:12 UTC (rev 5878)
+++ branches/1.8/zh/book/appc-webdav.xml 2019-02-14 03:13:24 UTC (rev 5879)
@@ -202,7 +202,7 @@
<para>Another feature that may be a useful complement for
Subversion's autoversioning comes from Apache's
- <literal>mod_mime</literal> module. If a WebDAV client adds a
+ <command>mod_mime</command> module. If a WebDAV client adds a
new file to the repository, there's no opportunity for the user
to set the the <literal>svn:mime-type</literal> property. This
might cause the file to appear as a generic icon when viewed
@@ -228,7 +228,7 @@
</programlisting>
</informalexample>
- <para>This directive allows <literal>mod_mime</literal> to attempt
+ <para>This directive allows <command>mod_mime</command> to attempt
automatic deduction of the MIME type on new files that enter the
repository via autoversioning. The module looks at the file's
named extension and possibly the contents as well; if the file
Modified: branches/1.8/zh/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/zh/book/ch06-server-configuration.xml 2019-02-13 15:01:12 UTC (rev 5878)
+++ branches/1.8/zh/book/ch06-server-configuration.xml 2019-02-14 03:13:24 UTC (rev 5879)
@@ -3707,9 +3707,9 @@
<!--
<para>Next, ensure that Apache has access to the modules which
provide the Basic authentication and related
- functionality: <literal>mod_auth_basic</literal>,
- <literal>mod_authn_file</literal>, and
- <literal>mod_authz_user</literal>. In many cases, these
+ functionality: <command>mod_auth_basic</command>,
+ <command>mod_authn_file</command>, and
+ <command>mod_authz_user</command>. In many cases, these
modules are compiled into <command>httpd</command> itself,
but if not, you might need to explicitly load one or more of
them using the <literal>LoadModule</literal> directive:</para>
@@ -3895,8 +3895,8 @@
<!--
<para>Configuring Apache to use Digest authentication is
straightforward. You'll need to ensure that
- the <literal>mod_auth_digest</literal> module is available
- (instead of <literal>mod_auth_basic</literal>), and then
+ the <command>mod_auth_digest</command> module is available
+ (instead of <command>mod_auth_basic</command>), and then
make a few small variations on our prior example:</para>
-->
<para>为 Apache 配置 Digest 认证非常简单, 首先你要确保模块
@@ -4459,12 +4459,13 @@
<title>存放在仓库内的访问权限配置文件</title>
<!--
- <para>Beginning with Subversion 1.8, access files can be stored
- inside a Subversion repository. It is possible to store the
- access file in the same repository to which the
- access rules are being applied to another repository. This
- approach enables versioning features of Subversion for
- the path-based authorization configuration.</para>
+ <para>Beginning with Subversion 1.8, access files can be
+ stored inside a Subversion repository. It is possible to
+ store the access file in the same repository to which the
+ access rules are being applied, or you can store it in an
+ entirely different repository. This approach enables
+ versioning features of Subversion for the path-based
+ authorization configuration.</para>
-->
<para>从 Subversion 1.8 开始, 访问权限配置文件可以存放在仓库内, 文件
内甚至可以包含针对其他仓库的访问规则. 这个功能为 Subversion 基于
@@ -5251,7 +5252,7 @@
third-party software packages which offer this. Some
examples include ViewVC (<ulink url="http://viewvc.org" />),
Trac (<ulink url="http://trac.edgewall.org" />) and WebSVN
- (<ulink url="http://websvn.info" />). These third-party
+ (<ulink url="http://websvnphp.github.io" />). These third-party
tools don't affect <command>mod_dav_svn</command>'s
built-in <quote>browseability</quote>, and generally offer
a much wider set of features, including the display of the
@@ -5396,7 +5397,7 @@
Subversion source distribution's
<filename>tools/xslt/</filename> directory.
Keep in mind that the path provided to the
- <literal>SVNIndexXSLT</literal> directory is actually a
+ <literal>SVNIndexXSLT</literal> directive is actually a
URL path—browsers need to be able to read your
stylesheets to make use of them!</para>
-->
@@ -5687,7 +5688,7 @@
<!--
<para>Apache HTTP Server's
- <literal>mod_setenvif</literal> module offers
+ <command>mod_setenvif</command> module offers
a <literal>SetEnvIf</literal> directive which is handy for
conditionally setting environment variables. And as it
turns out, the <literal>CustomLog</literal> directive can be
@@ -5732,7 +5733,7 @@
by a web browser as someone navigates the repository
directly. But <literal>GET</literal>
and <literal>PROPFIND</literal> requests aimed at so-called
- "private" Subversion URLs—which are the very sorts of
+ <quote>private</quote> Subversion URLs—which are the very sorts of
requests used to fetch each and every individual file during
a checkout operation—won't get logged.</para>
-->
@@ -6388,7 +6389,7 @@
<literal>Directory</literal> or <literal>Location</literal>
block for a Subversion repository. It
tells <command>httpd</command> to use the Subversion
- backend for <literal>mod_dav</literal> to handle all
+ backend for <command>mod_dav</command> to handle all
requests.</para>
-->
<para>必须被包含在 Subversion 仓库的 <literal>Directory</literal>
@@ -6566,10 +6567,10 @@
generic log message is auto-generated and attached to
each revision. If you enable autoversioning, you'll
likely want to set <literal>ModMimeUsePathInfo
- On</literal> so that <literal>mod_mime</literal> can
+ On</literal> so that <command>mod_mime</command> can
set <literal>svn:mime-type</literal> to the correct
MIME type automatically (as best as
- <literal>mod_mime</literal> is able to, of course).
+ <command>mod_mime</command> is able to, of course).
For more information, see <xref
linkend="svn.webdav"/>. The default value of this
directive is <literal>Off</literal>.</para>
@@ -7010,9 +7011,9 @@
<!--
<para>Beginning with Subversion 1.8,
<literal>AuthzSVNAccessFile</literal> accepts a URL to a file
- stored inside a Subversion repository. It is possible to store
- the file in the same repository to which the access rules are
- being applied or another repository.</para>
+ stored inside a Subversion repository—either the
+ same repository to which the access rules are
+ being applied, or an entirely different repository.</para>
-->
<para>从 Subversion 1.8 开始,
<literal>AuthzSVNAccessFile</literal> 接受一个 URL 作为参数,
@@ -7088,9 +7089,10 @@
Subversion repository. Unlike
<literal>AuthzSVNAccessFile</literal>, the path specified
for <literal>AuthzSVNReposRelativeAccessFile</literal> is
- relative from the /conf directory in the repository on
+ relative to the <filename>conf/</filename> directory in
+ the repository on
filesystem. In other words, the <replaceable>file-path</replaceable>
- specifies a per repository file that must by accessible by
+ specifies a per repository file that must be accessible by
the relative path for all repositories in a configuration block.
In a configuration block for a Subversion repository or a collection
of repositories either this directive or
@@ -7110,10 +7112,11 @@
<!--
<para>Beginning with Subversion 1.8,
- <literal>AuthzSVNAccessFile</literal> accepts a URL to a file
- stored inside a Subversion repository. It is possible to store
- the file in the same repository to which the access rules are
- being applied or another repository.</para>
+ <literal>AuthzSVNReposRelativeAccessFile</literal> accepts a
+ URL to a file
+ stored inside a Subversion repository—either the
+ same repository to which the access rules are
+ being applied, or an entirely different repository.</para>
-->
<para>从 Subversion 1.8 开始,
<literal>AuthzSVNReposRelativeAccessFile</literal> 接受一个
@@ -7417,7 +7420,7 @@
<!--
<para>The name of a repository as evaluated by the authorization
subsystem is derived directly from the repository's path.
- Exactly how this happens differs between to two server
+ Exactly how this happens differs between the two server
options. <command>mod_dav_svn</command> uses only the basename
of the repository's root URL<footnote><para>Any human-readable
name for a repository configured via
@@ -8539,7 +8542,7 @@
systems. If your repository is backed by Berkeley DB, for
example, it occasionally creates new log files to journal its
actions. Even if the Berkeley DB repository is wholly owned by
- the <command>svn</command> group, these newly created log files
+ the <literal>svn</literal> group, these newly created log files
won't necessarily be owned by that same group, which then
creates more permissions problems for your users. A good
workaround is to set the group SUID bit on the
Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml 2019-02-13 15:01:12 UTC (rev 5878)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml 2019-02-14 03:13:24 UTC (rev 5879)
@@ -1037,7 +1037,7 @@
several examples of auto-props usage in the
<filename>config</filename> file. Lastly, don't
forget to set <literal>enable-auto-props</literal> to
- <literal>yes</literal> in the <literal>miscellany</literal>
+ <literal>yes</literal> in the <literal>[miscellany]</literal>
section if you want to enable auto-props.</para>
-->
<para>如果一个文件匹配了多个模式, 它就会被设置上多个属性, 但 Subversion
@@ -1951,7 +1951,7 @@
<orderedlist>
<listitem>
<!--
- <para><literal>- -editor-cmd</literal> command-line option</para>
+ <para><option>- -editor-cmd</option> command-line option</para>
-->
<para>命令行选项 <option>--editor-cmd</option></para>
</listitem>
Modified: branches/1.8/zh/book/ch08-embedding-svn.xml
===================================================================
--- branches/1.8/zh/book/ch08-embedding-svn.xml 2019-02-13 15:01:12 UTC (rev 5878)
+++ branches/1.8/zh/book/ch08-embedding-svn.xml 2019-02-14 03:13:24 UTC (rev 5879)
@@ -1421,7 +1421,7 @@
Subversion development community at all. There
are a couple of popular ones we feel are especially
noteworthy. First, Barry Scott's PySVN bindings (<ulink
- url="http://pysvn.tigris.org/" />) are a popular option for
+ url="https://pysvn.sourceforge.io/" />) are a popular option for
binding with Python. PySVN boasts of a more Pythonic
interface than the more C-like APIs provided by Subversion's
own Python bindings. And if you're looking for a pure Java
More information about the svnbook-dev
mailing list