[svnbook] r5496 committed - branches/1.8/zh
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Tue Nov 14 18:00:11 CST 2017
Revision: 5496
http://sourceforge.net/p/svnbook/source/5496
Author: wuzhouhui
Date: 2017-11-15 00:00:04 +0000 (Wed, 15 Nov 2017)
Log Message:
-----------
1.8/zh: merge trunk changes
Modified Paths:
--------------
branches/1.8/zh/book/ch03-advanced-topics.xml
branches/1.8/zh/book/ch04-branching-and-merging.xml
Property Changed:
----------------
branches/1.8/zh/
Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh 2017-11-14 18:20:39 UTC (rev 5495)
+++ branches/1.8/zh 2017-11-15 00:00:04 UTC (rev 5496)
Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-5443
\ No newline at end of property
+/trunk/en:5303-5495
\ No newline at end of property
Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml 2017-11-14 18:20:39 UTC (rev 5495)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml 2017-11-15 00:00:04 UTC (rev 5496)
@@ -6095,7 +6095,7 @@
<!--
Finally, there are <firstterm>svnrdump
locks</firstterm>. These are very much like svnsync locks, but
- are associated with the <command>svnrdump</command> command
+ are associated with the <command>svnrdump load</command> command
(described in <xref linkend="svn.reposadmin.maint.migrate.svnrdump"
/>) instead of <command>svnsync</command>.</para>
-->
Modified: branches/1.8/zh/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-11-14 18:20:39 UTC (rev 5495)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-11-15 00:00:04 UTC (rev 5496)
@@ -1361,7 +1361,8 @@
all. <command>svn diff</command> outputs only the limited
patch format, so there are some ideas it simply can't
express. Even Subversion's own <command>svn patch</command>
- subcommand, while more flexible than the patch program, still has
+ subcommand, while more flexible than the <command>patch</command>
+ program, still has
similar limitations.</para>
-->
<para>对于这个例子而言, <command>svn merge</command> 与 <command>
@@ -4273,7 +4274,7 @@
<para>The <command>svn blame</command> command also takes the
<option>- -use-merge-history</option> (<option>-g</option>)
option. If this option is neglected, somebody looking at
- a line-by-line annotation of <filename>Makefile</filename> may
+ a line-by-line annotation of <filename>src/button.c</filename> may
get the mistaken impression that you were responsible for a
particular change:</para>
-->
@@ -4673,7 +4674,7 @@
<!-- =============================================================== -->
<sect2 id="svn.branchmerge.advanced.pre1.5clients">
<!--
- <title>Blocking Merge Tracking Unaware Clients</title>
+ <title>Preventing Naïve Clients from Committing Merges</title>
-->
<title>禁止不支持合并跟踪的客户端</title>
More information about the svnbook-dev
mailing list