[svnbook] r5750 committed - branches/1.8/zh

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Sat Aug 18 08:48:42 CDT 2018


Revision: 5750
          http://sourceforge.net/p/svnbook/source/5750
Author:   wuzhouhui
Date:     2018-08-18 13:48:34 +0000 (Sat, 18 Aug 2018)
Log Message:
-----------
1.8/zh: merge from trunk

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

Property Changed:
----------------
    branches/1.8/zh/

Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh	2018-08-18 02:35:52 UTC (rev 5749)
+++ branches/1.8/zh	2018-08-18 13:48:34 UTC (rev 5750)

Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-5701
\ No newline at end of property
+/trunk/en:5303-5749
\ No newline at end of property
Modified: branches/1.8/zh/book/ch00-preface.xml
===================================================================
--- branches/1.8/zh/book/ch00-preface.xml	2018-08-18 02:35:52 UTC (rev 5749)
+++ branches/1.8/zh/book/ch00-preface.xml	2018-08-18 13:48:34 UTC (rev 5750)
@@ -111,7 +111,7 @@
         Subversion is a free/open source <firstterm>version
       control system</firstterm> (VCS).  That is, Subversion manages
       files and directories, and the changes made to them, over time.
-      This allows you to recover older versions of your data or
+      This allows you to recover older versions of your data, or
       examine the history of how your data changed.  In this regard,
       many people think of a version control system as a sort
       of <quote>time machine.</quote></para>
@@ -515,7 +515,7 @@
         fit for the ASF, many of whose members were already active
         Subversion contributors.  In early 2010, Subversion was fully
         adopted into the ASF's family of top-level projects, moved its
-        project web presence to
+        web presence to
         <ulink url="http://subversion.apache.org"/>, and was
         rechristened <quote>Apache Subversion</quote>.</para>
     -->

Modified: branches/1.8/zh/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/zh/book/ch06-server-configuration.xml	2018-08-18 02:35:52 UTC (rev 5749)
+++ branches/1.8/zh/book/ch06-server-configuration.xml	2018-08-18 13:48:34 UTC (rev 5750)
@@ -3942,7 +3942,7 @@
 
         <note>
       <!--
-          <para>For digest authentication, the authentication provider
+          <para>For Digest authentication, the authentication provider
             is selected using the <literal>AuthDigestProvider</literal>
             as shown in the previous example.  As was the case with
             the <literal>AuthBasicProvider</literal> directive,
@@ -4458,7 +4458,7 @@
         <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 another repository.  This
+          access rules are being applied to another repository.  This
           approach enables versioning features of Subversion for
           the path-based authorization configuration.</para>
       -->
@@ -4471,7 +4471,8 @@
           <literal>AuthzSVNReposRelativeAccessFile</literal> configuration
           directives allow to specify in-repository access file's location.
           The directives accept absolute <literal>file://</literal> URLs
-          and repository relative URLs (one which begins with ^/).</para>
+          and repository relative URLs (one which begins with
+          <literal>^/</literal>).</para>
       -->
         <para>配置指令 <literal>AuthzSVNAccessFile</literal> 和
           <literal>AuthzSVNReposRelativeAccessFile</literal> 都可以用来指定




More information about the svnbook-dev mailing list