[svnbook commit] r3536 - * src/zh/po/svnbook.po:
codesite-noreply at google.com
codesite-noreply at google.com
Sun May 31 01:35:34 CDT 2009
Author: songdongsheng at live.cn
Date: Sat May 30 23:34:35 2009
New Revision: 3536
Modified:
trunk/src/zh/po/svnbook.po
Log:
* src/zh/po/svnbook.po:
Sync with source files, no translation change.
Modified: trunk/src/zh/po/svnbook.po
==============================================================================
--- trunk/src/zh/po/svnbook.po (original)
+++ trunk/src/zh/po/svnbook.po Sat May 30 23:34:35 2009
@@ -36,7 +36,7 @@
msgid ""
msgstr ""
"Project-Id-Version: svnbook 1.6\n"
-"POT-Creation-Date: 2009-05-28 08:02+0800\n"
+"POT-Creation-Date: 2009-05-31 14:23+0800\n"
"PO-Revision-Date: 2009-05-04 11:28+0800\n"
"Last-Translator: 宋冬生 <songdonogsheng at live.cn>\n"
"Language-Team: Simplified Chinese <i18n-zh at googlegroups.com >\n"
@@ -678,7 +678,7 @@
#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><term>
#: ../../en/book/appb-svn-for-cvs-users.xml:168
#: ../../en/book/ch02-basic-usage.xml:430
-#: ../../en/book/ch02-basic-usage.xml:1748
+#: ../../en/book/ch02-basic-usage.xml:1749
msgid "<command>svn diff</command>"
msgstr "<command>svn diff</command>"
@@ -771,7 +771,7 @@
#. type: Content of: <book><appendix><sect1><sect2><title>
#: ../../en/book/appb-svn-for-cvs-users.xml:228
-#: ../../en/book/ch09-reference.xml:9076
+#: ../../en/book/ch09-reference.xml:9118
msgid "Status"
msgstr "状态"
@@ -874,7 +874,7 @@
#. type: Content of: <book><appendix><sect1><sect2><title>
#: ../../en/book/appb-svn-for-cvs-users.xml:326
-#: ../../en/book/ch09-reference.xml:9098
+#: ../../en/book/ch09-reference.xml:9140
msgid "Update"
msgstr "更新"
@@ -1606,47 +1606,47 @@
#: ../../en/book/ch09-reference.xml:841 ../../en/book/ch09-reference.xml:977
#: ../../en/book/ch09-reference.xml:1058 ../../en/book/ch09-reference.xml:1152
#: ../../en/book/ch09-reference.xml:1299 ../../en/book/ch09-reference.xml:1376
-#: ../../en/book/ch09-reference.xml:1517 ../../en/book/ch09-reference.xml:1723
-#: ../../en/book/ch09-reference.xml:1837 ../../en/book/ch09-reference.xml:2159
-#: ../../en/book/ch09-reference.xml:2273 ../../en/book/ch09-reference.xml:2321
-#: ../../en/book/ch09-reference.xml:2428 ../../en/book/ch09-reference.xml:2614
-#: ../../en/book/ch09-reference.xml:2757 ../../en/book/ch09-reference.xml:2851
-#: ../../en/book/ch09-reference.xml:3164 ../../en/book/ch09-reference.xml:3310
-#: ../../en/book/ch09-reference.xml:3384 ../../en/book/ch09-reference.xml:3467
-#: ../../en/book/ch09-reference.xml:3597 ../../en/book/ch09-reference.xml:3676
-#: ../../en/book/ch09-reference.xml:3753 ../../en/book/ch09-reference.xml:3852
-#: ../../en/book/ch09-reference.xml:3959 ../../en/book/ch09-reference.xml:4095
-#: ../../en/book/ch09-reference.xml:4227 ../../en/book/ch09-reference.xml:4321
-#: ../../en/book/ch09-reference.xml:4433 ../../en/book/ch09-reference.xml:4880
-#: ../../en/book/ch09-reference.xml:5073 ../../en/book/ch09-reference.xml:5161
-#: ../../en/book/ch09-reference.xml:5525 ../../en/book/ch09-reference.xml:5573
-#: ../../en/book/ch09-reference.xml:5653 ../../en/book/ch09-reference.xml:5693
-#: ../../en/book/ch09-reference.xml:5795 ../../en/book/ch09-reference.xml:5827
-#: ../../en/book/ch09-reference.xml:5880 ../../en/book/ch09-reference.xml:5913
-#: ../../en/book/ch09-reference.xml:5961 ../../en/book/ch09-reference.xml:6027
-#: ../../en/book/ch09-reference.xml:6080 ../../en/book/ch09-reference.xml:6120
-#: ../../en/book/ch09-reference.xml:6156 ../../en/book/ch09-reference.xml:6233
-#: ../../en/book/ch09-reference.xml:6278 ../../en/book/ch09-reference.xml:6333
-#: ../../en/book/ch09-reference.xml:6394 ../../en/book/ch09-reference.xml:6450
-#: ../../en/book/ch09-reference.xml:6505 ../../en/book/ch09-reference.xml:6572
-#: ../../en/book/ch09-reference.xml:6744 ../../en/book/ch09-reference.xml:6790
-#: ../../en/book/ch09-reference.xml:6848 ../../en/book/ch09-reference.xml:6972
-#: ../../en/book/ch09-reference.xml:7018 ../../en/book/ch09-reference.xml:7091
-#: ../../en/book/ch09-reference.xml:7137 ../../en/book/ch09-reference.xml:7177
-#: ../../en/book/ch09-reference.xml:7240 ../../en/book/ch09-reference.xml:7291
-#: ../../en/book/ch09-reference.xml:7343 ../../en/book/ch09-reference.xml:7389
-#: ../../en/book/ch09-reference.xml:7444 ../../en/book/ch09-reference.xml:7509
-#: ../../en/book/ch09-reference.xml:7569 ../../en/book/ch09-reference.xml:7612
-#: ../../en/book/ch09-reference.xml:7803 ../../en/book/ch09-reference.xml:7872
-#: ../../en/book/ch09-reference.xml:7913 ../../en/book/ch09-reference.xml:7975
-#: ../../en/book/ch09-reference.xml:8053 ../../en/book/ch09-reference.xml:8410
-#: ../../en/book/ch09-reference.xml:8474 ../../en/book/ch09-reference.xml:8538
-#: ../../en/book/ch09-reference.xml:8582 ../../en/book/ch09-reference.xml:8735
-#: ../../en/book/ch09-reference.xml:9129 ../../en/book/ch09-reference.xml:9434
-#: ../../en/book/ch09-reference.xml:9497 ../../en/book/ch09-reference.xml:9552
-#: ../../en/book/ch09-reference.xml:9609 ../../en/book/ch09-reference.xml:9681
-#: ../../en/book/ch09-reference.xml:9755 ../../en/book/ch09-reference.xml:9814
-#: ../../en/book/ch09-reference.xml:9872 ../../en/book/ch09-reference.xml:9932
+#: ../../en/book/ch09-reference.xml:1518 ../../en/book/ch09-reference.xml:1724
+#: ../../en/book/ch09-reference.xml:1838 ../../en/book/ch09-reference.xml:2160
+#: ../../en/book/ch09-reference.xml:2274 ../../en/book/ch09-reference.xml:2322
+#: ../../en/book/ch09-reference.xml:2429 ../../en/book/ch09-reference.xml:2615
+#: ../../en/book/ch09-reference.xml:2759 ../../en/book/ch09-reference.xml:2853
+#: ../../en/book/ch09-reference.xml:3171 ../../en/book/ch09-reference.xml:3317
+#: ../../en/book/ch09-reference.xml:3391 ../../en/book/ch09-reference.xml:3474
+#: ../../en/book/ch09-reference.xml:3604 ../../en/book/ch09-reference.xml:3683
+#: ../../en/book/ch09-reference.xml:3760 ../../en/book/ch09-reference.xml:3859
+#: ../../en/book/ch09-reference.xml:3967 ../../en/book/ch09-reference.xml:4103
+#: ../../en/book/ch09-reference.xml:4235 ../../en/book/ch09-reference.xml:4329
+#: ../../en/book/ch09-reference.xml:4441 ../../en/book/ch09-reference.xml:4918
+#: ../../en/book/ch09-reference.xml:5111 ../../en/book/ch09-reference.xml:5199
+#: ../../en/book/ch09-reference.xml:5563 ../../en/book/ch09-reference.xml:5611
+#: ../../en/book/ch09-reference.xml:5691 ../../en/book/ch09-reference.xml:5731
+#: ../../en/book/ch09-reference.xml:5833 ../../en/book/ch09-reference.xml:5865
+#: ../../en/book/ch09-reference.xml:5918 ../../en/book/ch09-reference.xml:5951
+#: ../../en/book/ch09-reference.xml:5999 ../../en/book/ch09-reference.xml:6065
+#: ../../en/book/ch09-reference.xml:6118 ../../en/book/ch09-reference.xml:6158
+#: ../../en/book/ch09-reference.xml:6194 ../../en/book/ch09-reference.xml:6271
+#: ../../en/book/ch09-reference.xml:6316 ../../en/book/ch09-reference.xml:6371
+#: ../../en/book/ch09-reference.xml:6432 ../../en/book/ch09-reference.xml:6488
+#: ../../en/book/ch09-reference.xml:6543 ../../en/book/ch09-reference.xml:6610
+#: ../../en/book/ch09-reference.xml:6782 ../../en/book/ch09-reference.xml:6828
+#: ../../en/book/ch09-reference.xml:6886 ../../en/book/ch09-reference.xml:7010
+#: ../../en/book/ch09-reference.xml:7056 ../../en/book/ch09-reference.xml:7129
+#: ../../en/book/ch09-reference.xml:7175 ../../en/book/ch09-reference.xml:7215
+#: ../../en/book/ch09-reference.xml:7278 ../../en/book/ch09-reference.xml:7329
+#: ../../en/book/ch09-reference.xml:7381 ../../en/book/ch09-reference.xml:7427
+#: ../../en/book/ch09-reference.xml:7482 ../../en/book/ch09-reference.xml:7548
+#: ../../en/book/ch09-reference.xml:7608 ../../en/book/ch09-reference.xml:7651
+#: ../../en/book/ch09-reference.xml:7842 ../../en/book/ch09-reference.xml:7911
+#: ../../en/book/ch09-reference.xml:7952 ../../en/book/ch09-reference.xml:8014
+#: ../../en/book/ch09-reference.xml:8092 ../../en/book/ch09-reference.xml:8452
+#: ../../en/book/ch09-reference.xml:8516 ../../en/book/ch09-reference.xml:8580
+#: ../../en/book/ch09-reference.xml:8624 ../../en/book/ch09-reference.xml:8777
+#: ../../en/book/ch09-reference.xml:9171 ../../en/book/ch09-reference.xml:9476
+#: ../../en/book/ch09-reference.xml:9539 ../../en/book/ch09-reference.xml:9594
+#: ../../en/book/ch09-reference.xml:9651 ../../en/book/ch09-reference.xml:9723
+#: ../../en/book/ch09-reference.xml:9797 ../../en/book/ch09-reference.xml:9856
+#: ../../en/book/ch09-reference.xml:9914 ../../en/book/ch09-reference.xml:9974
msgid "Description"
msgstr "描述"
@@ -3485,19 +3485,19 @@
#: ../../en/book/ch09-reference.xml:826 ../../en/book/ch09-reference.xml:962
#: ../../en/book/ch09-reference.xml:1042 ../../en/book/ch09-reference.xml:1138
#: ../../en/book/ch09-reference.xml:1285 ../../en/book/ch09-reference.xml:1362
-#: ../../en/book/ch09-reference.xml:1500 ../../en/book/ch09-reference.xml:1707
-#: ../../en/book/ch09-reference.xml:1820 ../../en/book/ch09-reference.xml:2144
-#: ../../en/book/ch09-reference.xml:2259 ../../en/book/ch09-reference.xml:2306
-#: ../../en/book/ch09-reference.xml:2413 ../../en/book/ch09-reference.xml:2600
-#: ../../en/book/ch09-reference.xml:2741 ../../en/book/ch09-reference.xml:2836
-#: ../../en/book/ch09-reference.xml:3147 ../../en/book/ch09-reference.xml:3293
-#: ../../en/book/ch09-reference.xml:3369 ../../en/book/ch09-reference.xml:3453
-#: ../../en/book/ch09-reference.xml:3582 ../../en/book/ch09-reference.xml:3659
-#: ../../en/book/ch09-reference.xml:3738 ../../en/book/ch09-reference.xml:3837
-#: ../../en/book/ch09-reference.xml:3943 ../../en/book/ch09-reference.xml:4080
-#: ../../en/book/ch09-reference.xml:4211 ../../en/book/ch09-reference.xml:4307
-#: ../../en/book/ch09-reference.xml:4419 ../../en/book/ch09-reference.xml:4862
-#: ../../en/book/ch09-reference.xml:5059 ../../en/book/ch09-reference.xml:5147
+#: ../../en/book/ch09-reference.xml:1501 ../../en/book/ch09-reference.xml:1708
+#: ../../en/book/ch09-reference.xml:1821 ../../en/book/ch09-reference.xml:2145
+#: ../../en/book/ch09-reference.xml:2260 ../../en/book/ch09-reference.xml:2307
+#: ../../en/book/ch09-reference.xml:2414 ../../en/book/ch09-reference.xml:2601
+#: ../../en/book/ch09-reference.xml:2743 ../../en/book/ch09-reference.xml:2838
+#: ../../en/book/ch09-reference.xml:3154 ../../en/book/ch09-reference.xml:3300
+#: ../../en/book/ch09-reference.xml:3376 ../../en/book/ch09-reference.xml:3460
+#: ../../en/book/ch09-reference.xml:3589 ../../en/book/ch09-reference.xml:3666
+#: ../../en/book/ch09-reference.xml:3745 ../../en/book/ch09-reference.xml:3844
+#: ../../en/book/ch09-reference.xml:3951 ../../en/book/ch09-reference.xml:4088
+#: ../../en/book/ch09-reference.xml:4219 ../../en/book/ch09-reference.xml:4315
+#: ../../en/book/ch09-reference.xml:4427 ../../en/book/ch09-reference.xml:4900
+#: ../../en/book/ch09-reference.xml:5097 ../../en/book/ch09-reference.xml:5185
msgid "svn"
msgstr "svn"
@@ -3507,8 +3507,8 @@
msgstr "命令行客户端程序"
#. type: Content of: <book><chapter><sect1><refentry><refnamediv><refname>
-#: ../../en/book/ch00-preface.xml:944 ../../en/book/ch09-reference.xml:8562
-#: ../../en/book/ch09-reference.xml:8567 ../../en/book/ch09-reference.xml:8571
+#: ../../en/book/ch00-preface.xml:944 ../../en/book/ch09-reference.xml:8604
+#: ../../en/book/ch09-reference.xml:8609 ../../en/book/ch09-reference.xml:8613
msgid "svnversion"
msgstr "svnversion"
@@ -3522,15 +3522,15 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:952
#: ../../en/book/ch05-repository-admin.xml:1122
-#: ../../en/book/ch09-reference.xml:6618 ../../en/book/ch09-reference.xml:6730
-#: ../../en/book/ch09-reference.xml:6776 ../../en/book/ch09-reference.xml:6834
-#: ../../en/book/ch09-reference.xml:6958 ../../en/book/ch09-reference.xml:7004
-#: ../../en/book/ch09-reference.xml:7077 ../../en/book/ch09-reference.xml:7124
-#: ../../en/book/ch09-reference.xml:7161 ../../en/book/ch09-reference.xml:7225
-#: ../../en/book/ch09-reference.xml:7276 ../../en/book/ch09-reference.xml:7328
-#: ../../en/book/ch09-reference.xml:7374 ../../en/book/ch09-reference.xml:7429
-#: ../../en/book/ch09-reference.xml:7495 ../../en/book/ch09-reference.xml:7554
-#: ../../en/book/ch09-reference.xml:7598
+#: ../../en/book/ch09-reference.xml:6656 ../../en/book/ch09-reference.xml:6768
+#: ../../en/book/ch09-reference.xml:6814 ../../en/book/ch09-reference.xml:6872
+#: ../../en/book/ch09-reference.xml:6996 ../../en/book/ch09-reference.xml:7042
+#: ../../en/book/ch09-reference.xml:7115 ../../en/book/ch09-reference.xml:7162
+#: ../../en/book/ch09-reference.xml:7199 ../../en/book/ch09-reference.xml:7263
+#: ../../en/book/ch09-reference.xml:7314 ../../en/book/ch09-reference.xml:7366
+#: ../../en/book/ch09-reference.xml:7412 ../../en/book/ch09-reference.xml:7467
+#: ../../en/book/ch09-reference.xml:7534 ../../en/book/ch09-reference.xml:7593
+#: ../../en/book/ch09-reference.xml:7637
msgid "svnlook"
msgstr "svnlook"
@@ -3542,17 +3542,17 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:959
#: ../../en/book/ch05-repository-admin.xml:1087
-#: ../../en/book/ch09-reference.xml:5325 ../../en/book/ch09-reference.xml:5511
-#: ../../en/book/ch09-reference.xml:5559 ../../en/book/ch09-reference.xml:5639
-#: ../../en/book/ch09-reference.xml:5679 ../../en/book/ch09-reference.xml:5781
-#: ../../en/book/ch09-reference.xml:5812 ../../en/book/ch09-reference.xml:5864
-#: ../../en/book/ch09-reference.xml:5897 ../../en/book/ch09-reference.xml:5946
-#: ../../en/book/ch09-reference.xml:6013 ../../en/book/ch09-reference.xml:6066
-#: ../../en/book/ch09-reference.xml:6105 ../../en/book/ch09-reference.xml:6136
-#: ../../en/book/ch09-reference.xml:6218 ../../en/book/ch09-reference.xml:6264
-#: ../../en/book/ch09-reference.xml:6319 ../../en/book/ch09-reference.xml:6380
-#: ../../en/book/ch09-reference.xml:6436 ../../en/book/ch09-reference.xml:6490
-#: ../../en/book/ch09-reference.xml:6558
+#: ../../en/book/ch09-reference.xml:5363 ../../en/book/ch09-reference.xml:5549
+#: ../../en/book/ch09-reference.xml:5597 ../../en/book/ch09-reference.xml:5677
+#: ../../en/book/ch09-reference.xml:5717 ../../en/book/ch09-reference.xml:5819
+#: ../../en/book/ch09-reference.xml:5850 ../../en/book/ch09-reference.xml:5902
+#: ../../en/book/ch09-reference.xml:5935 ../../en/book/ch09-reference.xml:5984
+#: ../../en/book/ch09-reference.xml:6051 ../../en/book/ch09-reference.xml:6104
+#: ../../en/book/ch09-reference.xml:6143 ../../en/book/ch09-reference.xml:6174
+#: ../../en/book/ch09-reference.xml:6256 ../../en/book/ch09-reference.xml:6302
+#: ../../en/book/ch09-reference.xml:6357 ../../en/book/ch09-reference.xml:6418
+#: ../../en/book/ch09-reference.xml:6474 ../../en/book/ch09-reference.xml:6528
+#: ../../en/book/ch09-reference.xml:6596
msgid "svnadmin"
msgstr "svnadmin"
@@ -3563,7 +3563,7 @@
#. type: Content of: <book><chapter><sect1><title>
#: ../../en/book/ch00-preface.xml:967 ../../en/book/ch08-embedding-svn.xml:118
-#: ../../en/book/ch09-reference.xml:8722
+#: ../../en/book/ch09-reference.xml:8764
msgid "mod_dav_svn"
msgstr "mod_dav_svn"
@@ -3577,7 +3577,7 @@
#. type: Content of: <book><chapter><sect1><title>
#: ../../en/book/ch00-preface.xml:976
#: ../../en/book/ch06-server-configuration.xml:82
-#: ../../en/book/ch09-reference.xml:8129
+#: ../../en/book/ch09-reference.xml:8168
msgid "svnserve"
msgstr "svnserve"
@@ -3594,8 +3594,8 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:985
#: ../../en/book/ch05-repository-admin.xml:1253
-#: ../../en/book/ch09-reference.xml:8314 ../../en/book/ch09-reference.xml:8396
-#: ../../en/book/ch09-reference.xml:8459 ../../en/book/ch09-reference.xml:8524
+#: ../../en/book/ch09-reference.xml:8356 ../../en/book/ch09-reference.xml:8438
+#: ../../en/book/ch09-reference.xml:8501 ../../en/book/ch09-reference.xml:8566
msgid "svndumpfilter"
msgstr "svndumpfilter"
@@ -3607,9 +3607,9 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:993
#: ../../en/book/ch05-repository-admin.xml:1290
-#: ../../en/book/ch09-reference.xml:7644 ../../en/book/ch09-reference.xml:7787
-#: ../../en/book/ch09-reference.xml:7858 ../../en/book/ch09-reference.xml:7898
-#: ../../en/book/ch09-reference.xml:7960 ../../en/book/ch09-reference.xml:8038
+#: ../../en/book/ch09-reference.xml:7683 ../../en/book/ch09-reference.xml:7826
+#: ../../en/book/ch09-reference.xml:7897 ../../en/book/ch09-reference.xml:7937
+#: ../../en/book/ch09-reference.xml:7999 ../../en/book/ch09-reference.xml:8077
msgid "svnsync"
msgstr "svnsync"
@@ -4960,6 +4960,7 @@
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch01-fundamental-concepts.xml:870
+#, fuzzy
msgid ""
"The fact is, <emphasis>every time</emphasis> you run <command>svn
commit</"
"command> your working copy ends up with some mixture of revisions. The "
@@ -4968,8 +4969,9 @@
"working copy will contain a whole mixture of revisions. Even if you're
the "
"only person using the repository, you will still see this phenomenon.
To "
"examine your mixture of working revisions, use the <command>svn status</"
-"command> command with the <option>--verbose</option> option (see <xref "
-"linkend=\"svn.tour.cycle.examine.status\"/> for more information)."
+"command> command with the <option>--verbose</option>
(<option>-v</option>) "
+"option (see <xref linkend=\"svn.tour.cycle.examine.status\"/> for more "
+"information)."
msgstr ""
"事实上，<emphasis>每次</emphasis>运行 <command>svn commit</command>，你的
工作"
"拷贝都会进入混合多个修订版本的状态，刚刚提交的文件会比其他文件有更高的修订
版本"
@@ -4979,7 +4981,7 @@
"tour.cycle.examine.status\"/>)。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:883
+#: ../../en/book/ch01-fundamental-concepts.xml:884
msgid ""
"Often, new users are completely unaware that their working copy contains "
"mixed revisions. This can be confusing, because many client commands
are "
@@ -5000,12 +5002,12 @@
"command>)，此时会显示比这个对象<emphasis>更老的</emphasis>历史。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch01-fundamental-concepts.xml:901
+#: ../../en/book/ch01-fundamental-concepts.xml:902
msgid "Mixed revisions are useful"
msgstr "混合版本很有用"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:903
+#: ../../en/book/ch01-fundamental-concepts.xml:904
msgid ""
"If your project is sufficiently complex, you'll discover that it's
sometimes "
"nice to forcibly <firstterm>backdate</firstterm> (or update to a
revision "
@@ -5024,19 +5026,19 @@
"这个特性允许工作副本的任何一个部分在历史中前进或后退。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch01-fundamental-concepts.xml:921
+#: ../../en/book/ch01-fundamental-concepts.xml:922
msgid "Mixed revisions have limitations"
msgstr "混合版本有限制"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:923
+#: ../../en/book/ch01-fundamental-concepts.xml:924
msgid ""
"However you make use of mixed revisions in your working copy, there are "
"limitations to this flexibility."
msgstr "无论你如何在工作副本中利用混合修订版本，这种灵活性还是有限制的。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:926
+#: ../../en/book/ch01-fundamental-concepts.xml:927
msgid ""
"First, you cannot commit the deletion of a file or directory that isn't
fully "
"up to date. If a newer version of the item exists in the repository,
your "
@@ -5047,7 +5049,7 @@
"你的删除操作会被拒绝，这防止你不小心破坏你没有见到的东西。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:932
+#: ../../en/book/ch01-fundamental-concepts.xml:933
msgid ""
"Second, you cannot commit a metadata change to a directory unless it's
fully "
"up to date. You'll learn about attaching <quote>properties</quote> to
items "
@@ -5060,8 +5062,8 @@
"定义了许多条目和属性，因而对一个过期的版本提交属性会破坏一些你没有见到的属
性。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch01-fundamental-concepts.xml:950
-#: ../../en/book/ch02-basic-usage.xml:2628
+#: ../../en/book/ch01-fundamental-concepts.xml:951
+#: ../../en/book/ch02-basic-usage.xml:2631
#: ../../en/book/ch03-advanced-topics.xml:4080
#: ../../en/book/ch04-branching-and-merging.xml:3128
#: ../../en/book/ch05-repository-admin.xml:3324
@@ -5071,19 +5073,19 @@
msgstr "总结"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:952
+#: ../../en/book/ch01-fundamental-concepts.xml:953
msgid "We covered a number of fundamental Subversion concepts in this
chapter:"
msgstr "我们在这一章里学习了许多 Subversion 的基本概念："
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:957
+#: ../../en/book/ch01-fundamental-concepts.xml:958
msgid ""
"We introduced the notions of the central repository, the client working
copy, "
"and the array of repository revision trees."
msgstr "我们介绍了中央版本库, 客户工作副本和版本库修订树的概念。"
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:963
+#: ../../en/book/ch01-fundamental-concepts.xml:964
msgid ""
"We saw some simple examples of how two collaborators can use Subversion
to "
"publish and receive changes from one another, using the
<quote>copy-modify-"
@@ -5093,14 +5095,14 @@
"发布和获得对方的修改。"
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:970
+#: ../../en/book/ch01-fundamental-concepts.xml:971
msgid ""
"We talked a bit about the way Subversion tracks and manages information
in a "
"working copy."
msgstr "我们讨论了一些 Subversion 跟踪和管理工作副本信息的方式。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch01-fundamental-concepts.xml:976
+#: ../../en/book/ch01-fundamental-concepts.xml:977
msgid ""
"At this point, you should have a good idea of how Subversion works in
the "
"most general sense. Armed with this knowledge, you should now be ready
to "
@@ -5147,9 +5149,9 @@
"的模型，如果想查看所有命令的参考，见<xref linkend=\"svn.ref\"/>。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refpurpose>
-#: ../../en/book/ch02-basic-usage.xml:27 ../../en/book/ch09-reference.xml:2266
-#: ../../en/book/ch09-reference.xml:5787 ../../en/book/ch09-reference.xml:7130
-#: ../../en/book/ch09-reference.xml:7864
+#: ../../en/book/ch02-basic-usage.xml:27 ../../en/book/ch09-reference.xml:2267
+#: ../../en/book/ch09-reference.xml:5825 ../../en/book/ch09-reference.xml:7168
+#: ../../en/book/ch09-reference.xml:7903
msgid "Help!"
msgstr "求助！"
@@ -5214,7 +5216,7 @@
"command>，而会在回顾 Subversion 的典型一天时讨论 <command>svn
add</command>。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refname>
-#: ../../en/book/ch02-basic-usage.xml:95 ../../en/book/ch09-reference.xml:2312
+#: ../../en/book/ch02-basic-usage.xml:95 ../../en/book/ch09-reference.xml:2313
msgid "svn import"
msgstr "svn import"
@@ -5585,7 +5587,7 @@
msgstr "典型的工作周期是这样的："
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refpurpose>
-#: ../../en/book/ch02-basic-usage.xml:396 ../../en/book/ch09-reference.xml:5154
+#: ../../en/book/ch02-basic-usage.xml:396 ../../en/book/ch09-reference.xml:5192
msgid "Update your working copy."
msgstr "更新你的工作副本。"
@@ -7033,17 +7035,18 @@
#: ../../en/book/ch02-basic-usage.xml:1657
#, fuzzy
msgid ""
-"If you fail to specify either the <option>--message</option> or
<option>--"
-"file</option> option, Subversion will automatically launch your favorite "
-"editor (see the information on <literal>editor-cmd</literal> in <xref
linkend="
-"\"svn.advanced.confarea.opts.config\"/>) for composing a log message."
+"If you fail to specify either the <option>--message</option>
(<option>-m</"
+"option>) or <option>--file</option> (<option>-F</option>) option,
Subversion "
+"will automatically launch your favorite editor (see the information on "
+"<literal>editor-cmd</literal> in <xref
linkend=\"svn.advanced.confarea.opts."
+"config\"/>) for composing a log message."
msgstr ""
"如果你没有指定<option>--message</option>或者<option>--file</option>选项，"
"Subversion会自动地启动你最喜欢的编辑器(见<xref linkend=\"svn.advanced."
"confarea.opts.config\"/>的<literal>editor-cmd</literal>部分)来编辑日志信
息。"
#. type: Content of: <book><chapter><sect1><sect2><tip><para>
-#: ../../en/book/ch02-basic-usage.xml:1665
+#: ../../en/book/ch02-basic-usage.xml:1666
#, fuzzy
msgid ""
"If you're in your editor writing a commit message and decide that you
want to "
@@ -7055,7 +7058,7 @@
"果你已经做过保存，只要简单的删掉所有的文本并再次保存，然后退出。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1682
+#: ../../en/book/ch02-basic-usage.xml:1683
#, fuzzy
msgid ""
"The repository doesn't know or care whether your changes make any sense
as a "
@@ -7069,7 +7072,7 @@
"且提示你一个或多个文件已经过时了："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1697
+#: ../../en/book/ch02-basic-usage.xml:1698
msgid ""
"(The exact wording of this error message depends on the network protocol
and "
"server you're using, but the idea is the same in all cases.)"
@@ -7078,7 +7081,7 @@
"全一样。)"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1701
+#: ../../en/book/ch02-basic-usage.xml:1702
#, fuzzy
msgid ""
"At this point, you need to run <userinput>svn update</userinput>, deal
with "
@@ -7088,7 +7091,7 @@
"试提交。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1705
+#: ../../en/book/ch02-basic-usage.xml:1706
#, fuzzy
msgid ""
"That covers the basic work cycle for using Subversion. Subversion
offers "
@@ -7102,12 +7105,12 @@
"还算频繁的命令。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch02-basic-usage.xml:1721
+#: ../../en/book/ch02-basic-usage.xml:1722
msgid "Examining History"
msgstr "检验历史"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:1723
+#: ../../en/book/ch02-basic-usage.xml:1724
#, fuzzy
msgid ""
"Your Subversion repository is like a time machine. It keeps a record of "
@@ -7125,18 +7128,18 @@
"史而不想<emphasis>回到</emphasis>历史。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:1733
+#: ../../en/book/ch02-basic-usage.xml:1734
msgid ""
"Several commands can provide you with historical data from the
repository:"
msgstr "有多个命令可以从版本库为你提供历史数据："
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch02-basic-usage.xml:1739
+#: ../../en/book/ch02-basic-usage.xml:1740
msgid "<command>svn log</command>"
msgstr "<command>svn log</command>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:1741
+#: ../../en/book/ch02-basic-usage.xml:1742
#, fuzzy
msgid ""
"Shows you broad information: log messages with date and author
information "
@@ -7144,17 +7147,17 @@
msgstr "展示给你主要信息：每个版本附加在版本上的作者与日期信息和所有路径修
改。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:1750
+#: ../../en/book/ch02-basic-usage.xml:1751
msgid "Shows line-level details of a particular change"
msgstr "显示特定修改的行级详细信息"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch02-basic-usage.xml:1755
+#: ../../en/book/ch02-basic-usage.xml:1756
msgid "<command>svn cat</command>"
msgstr "<command>svn cat</command>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:1757
+#: ../../en/book/ch02-basic-usage.xml:1758
#, fuzzy
msgid ""
"Retrieves a file as it existed in a particular revision number and
displays "
@@ -7162,22 +7165,22 @@
msgstr "取得在特定版本的某一个文件显示在当前屏幕。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch02-basic-usage.xml:1763
+#: ../../en/book/ch02-basic-usage.xml:1764
msgid "<command>svn list</command>"
msgstr "<command>svn list</command>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:1765
+#: ../../en/book/ch02-basic-usage.xml:1766
msgid "Displays the files in a directory for any given revision"
msgstr "显示指定版本的目录中的文件"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:1775
+#: ../../en/book/ch02-basic-usage.xml:1776
msgid "Generating a List of Historical Changes"
msgstr "产生历史修改列表"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1777
+#: ../../en/book/ch02-basic-usage.xml:1778
#, fuzzy
msgid ""
"To find information about the history of a file or directory, use the "
@@ -7192,7 +7195,7 @@
"示。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1802
+#: ../../en/book/ch02-basic-usage.xml:1803
#, fuzzy
msgid ""
"Note that the log messages are printed in <emphasis>reverse
chronological "
@@ -7205,7 +7208,7 @@
"option>)选项："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1817
+#: ../../en/book/ch02-basic-usage.xml:1818
#, fuzzy
msgid ""
"You can also examine the log history of a single file or directory. For "
@@ -7213,7 +7216,7 @@
msgstr "你也可以检查单个文件或目录的日志历史，举个例子："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1827
+#: ../../en/book/ch02-basic-usage.xml:1828
#, fuzzy
msgid ""
"These will display log messages <emphasis>only</emphasis> for those
revisions "
@@ -7223,12 +7226,12 @@
"息。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch02-basic-usage.xml:1833
+#: ../../en/book/ch02-basic-usage.xml:1834
msgid "Why Does svn log Not Show Me What I Just Committed?"
msgstr "为什么 <command>svn log</command> 不会显示我刚刚提交的内容？"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch02-basic-usage.xml:1836
+#: ../../en/book/ch02-basic-usage.xml:1837
#, fuzzy
msgid ""
"If you make a commit and immediately type <userinput>svn log</userinput>
with "
@@ -7255,7 +7258,7 @@
"option> (<option>-r</option>)选项的<command>svn log</command>来解决这个问
题。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1857
+#: ../../en/book/ch02-basic-usage.xml:1858
#, fuzzy
msgid ""
"If you want even more information about a file or directory,
<command>svn "
@@ -7271,31 +7274,32 @@
"command> 输出中会包括一个路径修改的历史："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1881
+#: ../../en/book/ch02-basic-usage.xml:1882
#, fuzzy
msgid ""
"<command>svn log</command> also takes a <option>--quiet</option>
(<option>-q</"
"option>) option, which suppresses the body of the log message. When
combined "
-"with <option>--verbose</option>, it gives just the names of the changed
files."
+"with <option>--verbose</option> (<option>-v</option>), it gives just the "
+"names of the changed files."
msgstr ""
"<command>svn log</command>也有一个<option>--quiet</option> (<option>-q</"
"option>)选项，会禁止日志信息的主要部分，当与<option>--verbose</option>结合
使"
"用，仅会显示修改的文件名。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch02-basic-usage.xml:1887
+#: ../../en/book/ch02-basic-usage.xml:1889
msgid "Why Does svn log Give Me an Empty Response?"
msgstr "为什么 <command>svn log</command> 给我一个空的回应？"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch02-basic-usage.xml:1890
+#: ../../en/book/ch02-basic-usage.xml:1892
msgid ""
"After working with Subversion for a bit, most users will come across "
"something like this:"
msgstr "当使用Subversion一些时间后，许多用户会遇到这种情况："
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch02-basic-usage.xml:1899
+#: ../../en/book/ch02-basic-usage.xml:1901
#, fuzzy
msgid ""
"At first glance, this seems like an error. But recall that while
revisions "
@@ -7317,12 +7321,12 @@
"r 2 http://svn.collab.net/repos/svn</command>。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:1918
+#: ../../en/book/ch02-basic-usage.xml:1920
msgid "Examining the Details of Historical Changes"
msgstr "检查历史修改详情"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1920
+#: ../../en/book/ch02-basic-usage.xml:1922
#, fuzzy
msgid ""
"We've already seen <command>svn diff</command> before—it displays
file "
@@ -7333,7 +7337,7 @@
"前用来显示本地工作副本与版本库的区别。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:1925
+#: ../../en/book/ch02-basic-usage.xml:1927
msgid ""
"In fact, it turns out that there are <emphasis>three</emphasis> distinct
uses "
"of <command>svn diff</command>:"
@@ -7341,24 +7345,24 @@
"事实上，<command>svn diff</command>有<emphasis>三</emphasis>种不同的用
法："
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch02-basic-usage.xml:1932
-#: ../../en/book/ch02-basic-usage.xml:1947
+#: ../../en/book/ch02-basic-usage.xml:1934
+#: ../../en/book/ch02-basic-usage.xml:1949
msgid "Examining local changes"
msgstr "检查本地修改"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:1936
+#: ../../en/book/ch02-basic-usage.xml:1938
msgid "Comparing your working copy to the repository"
msgstr "比较工作副本与版本库"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch02-basic-usage.xml:1940
-#: ../../en/book/ch02-basic-usage.xml:2001
+#: ../../en/book/ch02-basic-usage.xml:1942
+#: ../../en/book/ch02-basic-usage.xml:2003
msgid "Comparing repository revisions"
msgstr "比较版本库中的版本"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:1949
+#: ../../en/book/ch02-basic-usage.xml:1951
msgid ""
"As we've seen, invoking <userinput>svn diff</userinput> with no options
will "
"compare your working files to the cached <quote>pristine</quote> copies
in "
@@ -7368,12 +7372,12 @@
"的工作文件与缓存在 <filename>.svn</filename> 的<quote>原始</quote>副本："
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch02-basic-usage.xml:1974
+#: ../../en/book/ch02-basic-usage.xml:1976
msgid "Comparing working copy to repository"
msgstr "比较工作副本和版本库"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:1976
+#: ../../en/book/ch02-basic-usage.xml:1978
msgid ""
"If a single <option>--revision</option> (<option>-r</option>) number is "
"passed, your working copy is compared to the specified revision in the "
@@ -7383,7 +7387,7 @@
"副本会与版本库中的指定版本比较："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2003
+#: ../../en/book/ch02-basic-usage.xml:2005
msgid ""
"If two revision numbers, separated by a colon, are passed via <option>--"
"revision</option> (<option>-r</option>), the two revisions are directly "
@@ -7393,7 +7397,7 @@
"开的版本号，这两个版本会直接比较："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2023
+#: ../../en/book/ch02-basic-usage.xml:2025
#, fuzzy
msgid ""
"A more convenient way of comparing one revision to the previous revision
is "
@@ -7403,7 +7407,7 @@
"option>)选项："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2042
+#: ../../en/book/ch02-basic-usage.xml:2044
msgid ""
"Lastly, you can compare repository revisions even when you don't have a "
"working copy on your local machine, just by including the appropriate URL
on "
@@ -7413,12 +7417,12 @@
"输入合适的URL："
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:2058
+#: ../../en/book/ch02-basic-usage.xml:2060
msgid "Browsing the Repository"
msgstr "浏览版本库"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2060
+#: ../../en/book/ch02-basic-usage.xml:2062
#, fuzzy
msgid ""
"Using <command>svn cat</command> and <command>svn list</command>, you
can "
@@ -7430,12 +7434,12 @@
"作修订版本的情况下查看文件和目录的内容，实际上，你甚至也不需要有一个工作副
本。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refname>
-#: ../../en/book/ch02-basic-usage.xml:2068 ../../en/book/ch09-reference.xml:968
+#: ../../en/book/ch02-basic-usage.xml:2070 ../../en/book/ch09-reference.xml:968
msgid "svn cat"
msgstr "svn cat"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2071
+#: ../../en/book/ch02-basic-usage.xml:2073
msgid ""
"If you want to examine an earlier version of a file and not necessarily
the "
"differences between two files, you can use <command>svn cat</command>:"
@@ -7444,18 +7448,18 @@
"command>："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2084
+#: ../../en/book/ch02-basic-usage.xml:2086
msgid "You can also redirect the output directly into a file:"
msgstr "你可以重定向输出到一个文件："
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refname>
-#: ../../en/book/ch02-basic-usage.xml:2096
-#: ../../en/book/ch09-reference.xml:2606
+#: ../../en/book/ch02-basic-usage.xml:2098
+#: ../../en/book/ch09-reference.xml:2607
msgid "svn list"
msgstr "svn list"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2098
+#: ../../en/book/ch02-basic-usage.xml:2100
msgid ""
"The <command>svn list</command> command shows you what files are in a "
"repository directory without actually downloading the files to your
local "
@@ -7465,7 +7469,7 @@
"件："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2111
+#: ../../en/book/ch02-basic-usage.xml:2113
msgid ""
"If you want a more detailed listing, pass the <option>--verbose</option> "
"(<option>-v</option>) flag to get output like this:"
@@ -7474,7 +7478,7 @@
"option>) 参数："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch02-basic-usage.xml:2124
+#: ../../en/book/ch02-basic-usage.xml:2126
msgid ""
"The columns tell you the revision at which the file or directory was
last "
"modified, the user who modified it, the size if it is a file, the date it
was "
@@ -7484,7 +7488,7 @@
"的大小，最后是修改日期和项目的名字。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><warning><para>
-#: ../../en/book/ch02-basic-usage.xml:2130
+#: ../../en/book/ch02-basic-usage.xml:2132
#, fuzzy
msgid ""
"The <userinput>svn list</userinput> command with no arguments defaults to
the "
@@ -7499,30 +7503,30 @@
"物)。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:2145
+#: ../../en/book/ch02-basic-usage.xml:2147
msgid "Fetching Older Repository Snapshots"
msgstr "获得旧的版本库快照"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2147
+#: ../../en/book/ch02-basic-usage.xml:2149
#, fuzzy
msgid ""
"In addition to all of the previous commands, you can use <command>svn
update</"
"command> and <command>svn checkout</command> with the
<option>--revision</"
-"option> option to take an entire working copy <quote>back in
time</quote>: "
-"<placeholder type=\"footnote\" id=\"0\"/>"
+"option> (<option>-r</option>) option to take an entire working copy "
+"<quote>back in time</quote>: <placeholder type=\"footnote\" id=\"0\"/>"
msgstr ""
"除了以上的命令，你可以使用带参数<option>--revision</option>的
<command>svn "
"update</command>和<command>svn checkout</command>来使整个工作副本<quote>回
到过"
"去</quote><placeholder-1/>："
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch02-basic-usage.xml:2152
+#: ../../en/book/ch02-basic-usage.xml:2155
msgid "See? We told you that Subversion was a time machine."
msgstr "看到了吧？我们说过Subversion是一个时间机器。"
#. type: Content of: <book><chapter><sect1><sect2><tip><para>
-#: ../../en/book/ch02-basic-usage.xml:2164
+#: ../../en/book/ch02-basic-usage.xml:2167
#, fuzzy
msgid ""
"Many Subversion newcomers attempt to use the preceding <command>svn
update</"
@@ -7538,7 +7542,7 @@
"basicmerging.resurrect\"/>。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2173
+#: ../../en/book/ch02-basic-usage.xml:2176
#, fuzzy
msgid ""
"Lastly, if you're building a release and wish to bundle up your files
from "
@@ -7546,8 +7550,8 @@
"in the way, you can use <command>svn export</command> to create a local
copy "
"of all or part of your repository sans <filename>.svn</filename> "
"directories. As with <command>svn update</command> and <command>svn "
-"checkout</command>, you can also pass the <option>--revision</option>
option "
-"to <command>svn export</command>:"
+"checkout</command>, you can also pass the <option>--revision</option> "
+"(<option>-r</option>) option to <command>svn export</command>:"
msgstr ""
"最后，如果你构建了一个版本，并且希望从Subversion打包文件，但是你不希望有讨
厌"
"的.svn目录，这时你可以导出版本库的一部分文件而没有.svn目录。就像
<command>svn "
@@ -7555,12 +7559,12 @@
"revision</option>选项给<command>svn export</command>："
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch02-basic-usage.xml:2201
+#: ../../en/book/ch02-basic-usage.xml:2204
msgid "Sometimes You Just Need to Clean Up"
msgstr "有时你只需要清理"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:2203
+#: ../../en/book/ch02-basic-usage.xml:2206
msgid ""
"Now that we've covered the day-to-day tasks that you'll frequently use "
"Subversion for, we'll review a few administrative tasks relating to your "
@@ -7570,12 +7574,12 @@
"务。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:2210
+#: ../../en/book/ch02-basic-usage.xml:2213
msgid "Disposing of a Working Copy"
msgstr "处理你的工作副本"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2212
+#: ../../en/book/ch02-basic-usage.xml:2215
#, fuzzy
msgid ""
"Subversion doesn't track either the state or the existence of working
copies "
@@ -7587,7 +7591,7 @@
"务器负担，没有必要让服务器知道你会删除一个工作副本。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2218
+#: ../../en/book/ch02-basic-usage.xml:2221
msgid ""
"If you're likely to use a working copy again, there's nothing wrong with
just "
"leaving it on disk until you're ready to use it again, at which point all
it "
@@ -7598,7 +7602,7 @@
"任何时候一个<command>svn update</command>命令可以让使用的文件成为最新。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2224
+#: ../../en/book/ch02-basic-usage.xml:2227
#, fuzzy
msgid ""
"However, if you're definitely not going to use a working copy again, you
can "
@@ -7614,12 +7618,12 @@
"认它们是否重要。在你完成审计之后，你可以安全的删除你的工作副本。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:2237
+#: ../../en/book/ch02-basic-usage.xml:2240
msgid "Recovering from an Interruption"
msgstr "从中断中恢复"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2239
+#: ../../en/book/ch02-basic-usage.xml:2242
#, fuzzy
msgid ""
"When Subversion modifies your working copy (or any information within "
@@ -7644,7 +7648,7 @@
"以回到一致的状态。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2255
+#: ../../en/book/ch02-basic-usage.xml:2258
#, fuzzy
msgid ""
"And this is exactly what <command>svn cleanup</command> does: it
searches "
@@ -7660,7 +7664,7 @@
"会使用<literal>L</literal> 标示锁定的项目："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2273
+#: ../../en/book/ch02-basic-usage.xml:2276
#, fuzzy
msgid ""
"Don't confuse these working copy locks with the ordinary locks that "
@@ -7673,12 +7677,12 @@
"meanings\"/>。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch02-basic-usage.xml:2288
+#: ../../en/book/ch02-basic-usage.xml:2291
msgid "Dealing with Structural Conflicts"
msgstr "处理结构性冲突"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:2290
+#: ../../en/book/ch02-basic-usage.xml:2293
msgid ""
"So far, we have only talked about conflicts at the level of file
content. "
"When you and your collaborators make overlapping changes within the same "
@@ -7687,14 +7691,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch02-basic-usage.xml:2293
+#: ../../en/book/ch02-basic-usage.xml:2296
msgid ""
"Well, you could mark files containing conflict markers as resolved and
commit "
"them, if you really wanted to. But this is rarely done in practice."
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:2298
+#: ../../en/book/ch02-basic-usage.xml:2301
msgid ""
"But what happens if your collaborators move or delete a file that you
are "
"still working on? Maybe there was a miscommunication, and one person
thinks "
@@ -7708,12 +7712,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch02-basic-usage.xml:2310
+#: ../../en/book/ch02-basic-usage.xml:2313
msgid "Tree conflicts prior to Subversion 1.6"
msgstr "Subversion 1.6 之前的树冲突"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch02-basic-usage.xml:2312
+#: ../../en/book/ch02-basic-usage.xml:2315
msgid ""
"Prior to Subversion 1.6, tree conflicts could yield rather unexpected "
"results. For example, if a file was locally modified, but had been
renamed "
@@ -7722,12 +7726,12 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:2319
+#: ../../en/book/ch02-basic-usage.xml:2322
msgid "Check the file to be renamed for local modifications."
msgstr "检查本地修改中改名的文件"
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:2322
+#: ../../en/book/ch02-basic-usage.xml:2325
msgid ""
"Delete the file at its old location, and if it had local modifications,
keep "
"an on-disk copy of the file at the old location. This on-disk copy now "
@@ -7735,12 +7739,12 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch02-basic-usage.xml:2328
+#: ../../en/book/ch02-basic-usage.xml:2331
msgid "Add the file, as it exists in the repository, at its new location."
msgstr ""
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch02-basic-usage.xml:2332
+#: ../../en/book/ch02-basic-usage.xml:2335
msgid ""
"When this situation arises, there is the possibility that the user makes
a "
"commit without realizing that local modifications have been left in a
now-"
@@ -7750,14 +7754,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch02-basic-usage.xml:2339
+#: ../../en/book/ch02-basic-usage.xml:2342
msgid ""
"Since Subversion 1.6, this and other similar situations are flagged as "
"conflicts in the working copy."
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:2344
+#: ../../en/book/ch02-basic-usage.xml:2347
msgid ""
"As with textual conflicts, tree conflicts prevent a commit from being
made "
"from the conflicted state, giving the user the opportunity to examine
the "
@@ -7766,18 +7770,18 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch02-basic-usage.xml:2352
+#: ../../en/book/ch02-basic-usage.xml:2355
msgid "An example Tree Conflict"
msgstr "树冲突示例"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2354
+#: ../../en/book/ch02-basic-usage.xml:2357
msgid ""
"Suppose a software project you were working on currently looked like
this:"
msgstr "假定你正在工作的软件项目布局如下："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2368
+#: ../../en/book/ch02-basic-usage.xml:2371
msgid ""
"Your collaborator Harry has renamed the file <filename>bar.c</filename>
to "
"<filename>baz.c</filename>. You are still working on <filename>bar.c</"
@@ -7789,17 +7793,17 @@
"改名。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2374
+#: ../../en/book/ch02-basic-usage.xml:2377
msgid "The log message to Harry's commit looked like this:"
msgstr "Harry 的提交日志是："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2388
+#: ../../en/book/ch02-basic-usage.xml:2391
msgid "The local changes you have made look like this:"
msgstr "你的本地修改是："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2415
+#: ../../en/book/ch02-basic-usage.xml:2418
#, fuzzy
msgid ""
"Your changes are all based on revision 4. They cannot be committed
because "
@@ -7807,7 +7811,7 @@
msgstr "你的修改完全基于版本 4。因为 Harry 已经检入了版本 5，所以它不能被提
交。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2428
+#: ../../en/book/ch02-basic-usage.xml:2431
msgid ""
"At this point, you need to run <command>svn update</command>. Besides "
"bringing our working copy up to date so that you can see Harry's
changes, "
@@ -7818,7 +7822,7 @@
"以看到 Harry 的修改，发现产生了树冲突，从而你有机会评估和正确处理它。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2443
+#: ../../en/book/ch02-basic-usage.xml:2446
msgid ""
"In its output, <command>svn update</command> signifies tree conflicts
using a "
"capital C in the fourth output column. <command>svn status</command>
reveals "
@@ -7828,14 +7832,14 @@
"<command>svn status</command> 展现了冲突的额外信息："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2456
+#: ../../en/book/ch02-basic-usage.xml:2459
msgid ""
"Note how bar.c is automatically scheduled for re-addition in your
working "
"copy, which simplifies things in case you want to keep the file."
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2460
+#: ../../en/book/ch02-basic-usage.xml:2463
msgid ""
"Because a move in Subversion is implemented as a copy operation followed
by a "
"delete operation, and these two operations cannot be easily related to
one "
@@ -7847,7 +7851,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2470
+#: ../../en/book/ch02-basic-usage.xml:2473
msgid ""
"Both <filename>foo.c</filename> and <filename>baz.c</filename> are
reported "
"as locally modified in the output of <command>svn status</command>. You
made "
@@ -7857,7 +7861,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2478
+#: ../../en/book/ch02-basic-usage.xml:2481
msgid ""
"The answer is that despite the limitations of the move implementation, "
"Subversion was smart enough to transfer your local edits in
<filename>bar.c</"
@@ -7865,7 +7869,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><warning><para>
-#: ../../en/book/ch02-basic-usage.xml:2497
+#: ../../en/book/ch02-basic-usage.xml:2500
msgid ""
"Local edits to the file <filename>bar.c</filename>, which is renamed
during "
"an update to <filename>baz.c</filename>, will only be applied to "
@@ -7877,7 +7881,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2510
+#: ../../en/book/ch02-basic-usage.xml:2513
msgid ""
"<filename>bar.c</filename> is now said to be the <firstterm>victim</"
"firstterm> of a tree conflict. It cannot be committed until the conflict
is "
@@ -7885,7 +7889,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2520
+#: ../../en/book/ch02-basic-usage.xml:2523
msgid ""
"So how can this conflict be resolved? You can either agree or disagree
with "
"the move Harry made. In case you agree, you can delete <filename>bar.c</"
@@ -7893,7 +7897,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2557
+#: ../../en/book/ch02-basic-usage.xml:2560
msgid ""
"If you do not agree with the move, you can delete
<filename>baz.c</filename> "
"instead, after making sure any changes made to it after it was renamed
are "
@@ -7904,7 +7908,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch02-basic-usage.xml:2617
+#: ../../en/book/ch02-basic-usage.xml:2620
msgid ""
"In either case, you have now resolved your first tree conflict! You can "
"commit your changes and tell Harry during tea break about all the extra
work "
@@ -7912,7 +7916,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch02-basic-usage.xml:2630
+#: ../../en/book/ch02-basic-usage.xml:2633
#, fuzzy
msgid ""
"Now we've covered most of the Subversion client commands. Notable
exceptions "
@@ -11264,10 +11268,11 @@
#, fuzzy
msgid ""
"If the repository lock was broken, then <userinput>svn status
--show-updates</"
-"userinput> displays a <literal>B</literal> (Broken) symbol next to the
file. "
-"If a new lock exists in place of the old one, then a
<literal>T</literal> "
-"(sTolen) symbol is shown. Finally, <command>svn update</command> notices
any "
-"defunct lock tokens and removes them from the working copy."
+"userinput> (<option>-u</option>) displays a <literal>B</literal>
(Broken) "
+"symbol next to the file. If a new lock exists in place of the old one,
then "
+"a <literal>T</literal> (sTolen) symbol is shown. Finally, <command>svn "
+"update</command> notices any defunct lock tokens and removes them from
the "
+"working copy."
msgstr ""
"如果版本库锁定被打破了，<command>svn status --show-updates</command>会在文
件旁"
"边显示一个<literal>B</literal> (Broken)。如果有一个新的锁，就会显示一个"
@@ -12808,10 +12813,10 @@
msgid ""
"Or, if you want to disable credential caching permanently, you can edit
the "
"<filename>config</filename> file in your runtime configuration area and
set "
-"the <option>store-auth-creds</option> option to <literal>no</literal>.
This "
-"will prevent the storing of credentials used in any Subversion
interactions "
-"you perform on the affected computer. This can be extended to cover all "
-"users on the computer, too, by modifying the system-wide runtime "
+"the <literal>store-auth-creds</literal> option to
<literal>no</literal>. "
+"This will prevent the storing of credentials used in any Subversion "
+"interactions you perform on the affected computer. This can be extended
to "
+"cover all users on the computer, too, by modifying the system-wide
runtime "
"configuration area (described in <xref
linkend=\"svn.advanced.confarea.layout"
"\" />)."
msgstr ""
@@ -17035,11 +17040,11 @@
#. type: Content of: <book><chapter><sect1><refentry><indexterm><secondary>
#: ../../en/book/ch05-repository-admin.xml:101
-#: ../../en/book/ch09-reference.xml:9424 ../../en/book/ch09-reference.xml:9487
-#: ../../en/book/ch09-reference.xml:9542 ../../en/book/ch09-reference.xml:9598
-#: ../../en/book/ch09-reference.xml:9670 ../../en/book/ch09-reference.xml:9745
-#: ../../en/book/ch09-reference.xml:9804 ../../en/book/ch09-reference.xml:9862
-#: ../../en/book/ch09-reference.xml:9922
+#: ../../en/book/ch09-reference.xml:9466 ../../en/book/ch09-reference.xml:9529
+#: ../../en/book/ch09-reference.xml:9584 ../../en/book/ch09-reference.xml:9640
+#: ../../en/book/ch09-reference.xml:9712 ../../en/book/ch09-reference.xml:9787
+#: ../../en/book/ch09-reference.xml:9846 ../../en/book/ch09-reference.xml:9904
+#: ../../en/book/ch09-reference.xml:9964
msgid "hooks"
msgstr "hooks"
@@ -17551,9 +17556,9 @@
#: ../../en/book/ch05-repository-admin.xml:460
#: ../../en/book/ch05-repository-admin.xml:465
#: ../../en/book/ch09-reference.xml:755 ../../en/book/ch09-reference.xml:1079
-#: ../../en/book/ch09-reference.xml:1330 ../../en/book/ch09-reference.xml:2294
-#: ../../en/book/ch09-reference.xml:4170 ../../en/book/ch09-reference.xml:4256
-#: ../../en/book/ch09-reference.xml:4345
+#: ../../en/book/ch09-reference.xml:1330 ../../en/book/ch09-reference.xml:2295
+#: ../../en/book/ch09-reference.xml:4178 ../../en/book/ch09-reference.xml:4264
+#: ../../en/book/ch09-reference.xml:4353
msgid "No"
msgstr "否"
@@ -17562,11 +17567,11 @@
#: ../../en/book/ch05-repository-admin.xml:466
#: ../../en/book/ch05-repository-admin.xml:471
#: ../../en/book/ch09-reference.xml:861 ../../en/book/ch09-reference.xml:996
-#: ../../en/book/ch09-reference.xml:1176 ../../en/book/ch09-reference.xml:1420
-#: ../../en/book/ch09-reference.xml:2346 ../../en/book/ch09-reference.xml:2665
-#: ../../en/book/ch09-reference.xml:2780 ../../en/book/ch09-reference.xml:2894
-#: ../../en/book/ch09-reference.xml:3335 ../../en/book/ch09-reference.xml:4938
-#: ../../en/book/ch09-reference.xml:5097 ../../en/book/ch09-reference.xml:5258
+#: ../../en/book/ch09-reference.xml:1176 ../../en/book/ch09-reference.xml:1421
+#: ../../en/book/ch09-reference.xml:2347 ../../en/book/ch09-reference.xml:2666
+#: ../../en/book/ch09-reference.xml:2782 ../../en/book/ch09-reference.xml:2899
+#: ../../en/book/ch09-reference.xml:3342 ../../en/book/ch09-reference.xml:4976
+#: ../../en/book/ch09-reference.xml:5135 ../../en/book/ch09-reference.xml:5296
msgid "Yes"
msgstr "是"
@@ -20006,7 +20011,7 @@
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
#: ../../en/book/ch05-repository-admin.xml:2392
-#: ../../en/book/ch09-reference.xml:8333
+#: ../../en/book/ch09-reference.xml:8375
msgid "<option>--drop-empty-revs</option>"
msgstr "<option>--drop-empty-revs</option>"
@@ -20017,7 +20022,7 @@
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
#: ../../en/book/ch05-repository-admin.xml:2399
-#: ../../en/book/ch09-reference.xml:8342
+#: ../../en/book/ch09-reference.xml:8384
msgid "<option>--renumber-revs</option>"
msgstr "<option>--renumber-revs</option>"
@@ -20033,7 +20038,7 @@
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
#: ../../en/book/ch05-repository-admin.xml:2408
-#: ../../en/book/ch09-reference.xml:8361
+#: ../../en/book/ch09-reference.xml:8403
msgid "<option>--preserve-revprops</option>"
msgstr "<option>--preserve-revprops</option>"
@@ -21474,7 +21479,7 @@
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
#: ../../en/book/ch06-server-configuration.xml:162
-#: ../../en/book/ch06-server-configuration.xml:1261
+#: ../../en/book/ch06-server-configuration.xml:1263
msgid "Initial setup"
msgstr "初始设置"
@@ -22039,12 +22044,12 @@
"If your Windows system is a descendant of Windows NT (2000, 2003, XP, or "
"Vista), you can run <command>svnserve</command> as a standard Windows "
"service. This is typically a much nicer experience than running it as a "
-"standalone daemon with the <option>--daemon (-d)</option> option. Using "
-"daemon mode requires launching a console, typing a command, and then
leaving "
-"the console window running indefinitely. A Windows service, however,
runs in "
-"the background, can start at boot time automatically, and can be started
and "
-"stopped using the same consistent administration interface as other
Windows "
-"services."
+"standalone daemon with the <option>--daemon</option>
(<option>-d</option>) "
+"option. Using daemon mode requires launching a console, typing a
command, "
+"and then leaving the console window running indefinitely. A Windows
service, "
+"however, runs in the background, can start at boot time automatically,
and "
+"can be started and stopped using the same consistent administration
interface "
+"as other Windows services."
msgstr ""
"如果你的Windows系统是Windows NT (2000, 2003, XP或Vista)的后代，你可以将"
"<command>svnserve</command>作为Windows服务运行，这是比使用
<option>--daemon (-"
@@ -22085,16 +22090,16 @@
"First, notice that the <command>svnserve.exe</command> program must
always be "
"invoked with the <option>--service</option> option. Any other options
to "
"<command>svnserve</command> must then be specified on the same line, but
you "
-"cannot add conflicting options such as <option>--daemon (-d)</option>, "
-"<option>--tunnel</option>, or <option>--inetd (-i)</option>. Options
such as "
-"<option>-r</option> or <option>--listen-port</option> are fine, though. "
-"Second, be careful about spaces when invoking the
<command>SC.EXE</command> "
-"command: the <literal>key= value</literal> patterns must have no spaces "
-"between <literal>key=</literal> and must have exactly one space before
the "
-"<literal>value</literal>. Lastly, be careful about spaces in your
command "
-"line to be invoked. If a directory name contains spaces (or other
characters "
-"that need escaping), place the entire inner value of <literal>binpath</"
-"literal> in double quotes, by escaping them:"
+"cannot add conflicting options such as <option>--daemon</option>
(<option>-d</"
+"option>), <option>--tunnel</option>, or <option>--inetd</option>
(<option>-i</"
+"option>). Options such as <option>-r</option> or <option>--listen-port</"
+"option> are fine, though. Second, be careful about spaces when invoking
the "
+"<command>SC.EXE</command> command: the <literal>key= value</literal>
patterns "
+"must have no spaces between <literal>key=</literal> and must have exactly
one "
+"space before the <literal>value</literal>. Lastly, be careful about
spaces "
+"in your command line to be invoked. If a directory name contains spaces
(or "
+"other characters that need escaping), place the entire inner value of "
+"<literal>binpath</literal> in double quotes, by escaping them:"
msgstr ""
"首先，要注意<command>svnserve.exe</command>必须使用
<option>--service</option>"
"选项启动。<command>svnserve</command>的其它选项必须在同一行上指定，但你不
能使"
@@ -22107,7 +22112,7 @@
"整个<literal>binpath</literal>值放在双引号中："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:674
+#: ../../en/book/ch06-server-configuration.xml:676
#, fuzzy
msgid ""
"Also note that the word <literal>binpath</literal> is
misleading—its "
@@ -22119,7 +22124,7 @@
"绕。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:680
+#: ../../en/book/ch06-server-configuration.xml:682
msgid ""
"Once the service is defined, it can be stopped, started, or queried
using "
"standard GUI tools (the Services administrative control panel), or at
the "
@@ -22129,7 +22134,7 @@
"或者是通过命令行："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:690
+#: ../../en/book/ch06-server-configuration.xml:692
#, fuzzy
msgid ""
"The service can also be uninstalled (i.e., undefined) by deleting its "
@@ -22143,24 +22148,24 @@
"<literal>sc /?</literal>查看。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:703
+#: ../../en/book/ch06-server-configuration.xml:705
msgid "Built-in Authentication and Authorization"
msgstr "内置的认证和授权"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:705
+#: ../../en/book/ch06-server-configuration.xml:707
msgid ""
"When a client connects to an <command>svnserve</command> process, the "
"following things happen:"
msgstr "如果一个客户端连接到<command>svnserve</command>进程，如下事情会发
生："
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:709
+#: ../../en/book/ch06-server-configuration.xml:711
msgid "The client selects a specific repository."
msgstr "客户端选择特定的版本库。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:712
+#: ../../en/book/ch06-server-configuration.xml:714
msgid ""
"The server processes the repository's
<filename>conf/svnserve.conf</filename> "
"file and begins to enforce any authentication and authorization policies
it "
@@ -22170,24 +22175,24 @@
"义的所有认证和授权政策。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:717
+#: ../../en/book/ch06-server-configuration.xml:719
msgid "Depending on the defined policies, one of the following may occur:"
msgstr "取决于已定义的策略，可能发生下列事情："
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:721
+#: ../../en/book/ch06-server-configuration.xml:723
msgid ""
"The client may be allowed to make requests anonymously, without ever "
"receiving an authentication challenge."
msgstr "如果没有收到认证请求，客户端可能被允许匿名访问。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:725
+#: ../../en/book/ch06-server-configuration.xml:727
msgid "The client may be challenged for authentication at any time."
msgstr "客户端可以在任何认证时被要求。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:728
+#: ../../en/book/ch06-server-configuration.xml:730
msgid ""
"If operating in tunnel mode, the client will declare itself to be
already "
"externally authenticated (typically by SSH)."
@@ -22196,7 +22201,7 @@
"SSH)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:736
+#: ../../en/book/ch06-server-configuration.xml:738
#, fuzzy
msgid ""
"The <command>svnserve</command> server, by default, knows only how to
send a "
@@ -22214,12 +22219,12 @@
"<emphasis>真正的密码并没有在互联网上传递。</emphasis>"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:739
+#: ../../en/book/ch06-server-configuration.xml:741
msgid "See RFC 2195."
msgstr "见RFC 2195。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:750
+#: ../../en/book/ch06-server-configuration.xml:752
msgid ""
"If your <command>svnserve</command> server was built with SASL support,
it "
"not only knows how to send CRAM-MD5 challenges, but also likely knows a
whole "
@@ -22229,7 +22234,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:758
+#: ../../en/book/ch06-server-configuration.xml:760
#, fuzzy
msgid ""
"It's also possible, of course, for the client to be externally
authenticated "
@@ -22243,7 +22248,7 @@
"息请看<xref linkend=\"svn.serverconfig.svnserve.sshauth\"/>。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:766
+#: ../../en/book/ch06-server-configuration.xml:768
#, fuzzy
msgid ""
"As you've already guessed, a repository's
<filename>svnserve.conf</filename> "
@@ -22263,12 +22268,12 @@
"怎样使用它们。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:780
+#: ../../en/book/ch06-server-configuration.xml:782
msgid "Create a users file and realm"
msgstr "创建一个用户文件和认证域"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:782
+#: ../../en/book/ch06-server-configuration.xml:784
#, fuzzy
msgid ""
"For now, the <literal>[general]</literal> section of
<filename>svnserve.conf</"
@@ -22280,7 +22285,7 @@
"包括所有你需要的变量，开始先定义一个保存用户名和密码的文件和一个认证域："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:794
+#: ../../en/book/ch06-server-configuration.xml:796
#, fuzzy
msgid ""
"The <literal>realm</literal> is a name that you define. It tells
clients "
@@ -22299,7 +22304,7 @@
"使用同样熟悉的格式，举个例子："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:811
+#: ../../en/book/ch06-server-configuration.xml:813
#, fuzzy
msgid ""
"The value of <literal>password-db</literal> can be an absolute or
relative "
@@ -22323,12 +22328,12 @@
"件有读权限是必须的。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:830
+#: ../../en/book/ch06-server-configuration.xml:832
msgid "Set access controls"
msgstr "设置访问控制"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:832
+#: ../../en/book/ch06-server-configuration.xml:834
#, fuzzy
msgid ""
"There are two more variables to set in the
<filename>svnserve.conf</filename> "
@@ -22349,7 +22354,7 @@
"全的读/写权限，例如："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:856
+#: ../../en/book/ch06-server-configuration.xml:858
#, fuzzy
msgid ""
"The example settings are, in fact, the default values of the variables, "
@@ -22360,7 +22365,7 @@
"点，你可以完全封锁匿名访问："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:873
+#: ../../en/book/ch06-server-configuration.xml:875
#, fuzzy
msgid ""
"The server process understands not only these <quote>blanket</quote>
access "
@@ -22374,7 +22379,7 @@
"<literal>authz-db</literal>指向到这个文件。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:890
+#: ../../en/book/ch06-server-configuration.xml:892
#, fuzzy
msgid ""
"We discuss the syntax of the <filename>authzfile</filename> file in
detail "
@@ -22390,12 +22395,12 @@
"了所有的变量，要想被允许访问必须满足所有的规则。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:904
+#: ../../en/book/ch06-server-configuration.xml:906
msgid "Using <command>svnserve</command> with SASL"
msgstr "让 svnserve 使用 SASL"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:906
+#: ../../en/book/ch06-server-configuration.xml:908
msgid ""
"For many teams, the built-in CRAM-MD5 authentication is all they need
from "
"<command>svnserve</command>. However, if your server (and your
Subversion "
@@ -22405,12 +22410,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:914
+#: ../../en/book/ch06-server-configuration.xml:916
msgid "What Is SASL?"
msgstr "什么是 SASL？"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:915
+#: ../../en/book/ch06-server-configuration.xml:917
msgid ""
"The Cyrus Simple Authentication and Security Layer is open source
software "
"written by Carnegie Mellon University. It adds generic authentication
and "
@@ -22429,14 +22434,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:935
+#: ../../en/book/ch06-server-configuration.xml:937
msgid ""
"You can download Cyrus SASL (both code and documentation) from <ulink
url="
"\"http://asg.web.cmu.edu/sasl/sasl-library.html\"/>."
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:940
+#: ../../en/book/ch06-server-configuration.xml:942
msgid ""
"Normally, when a subversion client connects to
<command>svnserve</command>, "
"the server sends a greeting that advertises a list of the capabilities
it "
@@ -22453,12 +22458,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:958
+#: ../../en/book/ch06-server-configuration.xml:960
msgid "Authenticating with SASL"
msgstr "使用 SASL 认证"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:960
+#: ../../en/book/ch06-server-configuration.xml:962
msgid ""
"To activate specific SASL mechanisms on the server, you'll need to do
two "
"things. First, create a <literal>[sasl]</literal> section in your "
@@ -22467,7 +22472,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:971
+#: ../../en/book/ch06-server-configuration.xml:973
msgid ""
"Second, create a main SASL configuration file called <filename>svn.conf</"
"filename> in a place where the SASL library can find it—typically
in "
@@ -22479,7 +22484,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:982
+#: ../../en/book/ch06-server-configuration.xml:984
msgid ""
"On a Windows server, you'll also have to edit the system registry (using
a "
"tool such as <command>regedit</command>) to tell SASL where to find
things. "
@@ -22493,7 +22498,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:995
+#: ../../en/book/ch06-server-configuration.xml:997
msgid ""
"Because SASL provides so many different kinds of authentication
mechanisms, "
"it would be foolish (and far beyond the scope of this book) to try to "
@@ -22508,7 +22513,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1016
+#: ../../en/book/ch06-server-configuration.xml:1018
msgid ""
"you've told SASL to advertise the DIGEST-MD5 mechanism to clients and to "
"check user passwords against a private password database located at "
@@ -22518,7 +22523,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1028
+#: ../../en/book/ch06-server-configuration.xml:1030
msgid ""
"A few words of warning: first, make sure the <quote>realm</quote>
argument to "
"<command>saslpasswd2</command> matches the same realm you've defined in
your "
@@ -22531,7 +22536,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1041
+#: ../../en/book/ch06-server-configuration.xml:1043
msgid ""
"This is just one simple way of configuring SASL. Many other
authentication "
"mechanisms are available, and passwords can be stored in other places
such as "
@@ -22539,7 +22544,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1047
+#: ../../en/book/ch06-server-configuration.xml:1049
msgid ""
"Remember that if you configure your server to only allow certain SASL "
"authentication mechanisms, this forces all connecting clients to have
SASL "
@@ -22553,12 +22558,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:1062
+#: ../../en/book/ch06-server-configuration.xml:1064
msgid "SASL encryption"
msgstr "SASL 加密"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1064
+#: ../../en/book/ch06-server-configuration.xml:1066
msgid ""
"SASL is also able to perform data encryption if a particular mechanism "
"supports it. The built-in CRAM-MD5 mechanism doesn't support encryption,
but "
@@ -22569,7 +22574,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1079
+#: ../../en/book/ch06-server-configuration.xml:1081
msgid ""
"The <literal>min-encryption</literal> and
<literal>max-encryption</literal> "
"variables control the level of encryption demanded by the server. To
disable "
@@ -22583,12 +22588,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:1099
+#: ../../en/book/ch06-server-configuration.xml:1101
msgid "Tunneling over SSH"
msgstr "穿越 SSH 隧道"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1101
+#: ../../en/book/ch06-server-configuration.xml:1103
#, fuzzy
msgid ""
"<command>svnserve</command>'s built-in authentication (and SASL support)
can "
@@ -22603,7 +22608,7 @@
"下，所有的项目用户已经拥有了系统帐号和有能力<quote>SSH到</quote>服务器。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1109
+#: ../../en/book/ch06-server-configuration.xml:1111
#, fuzzy
msgid ""
"It's easy to use SSH in conjunction with <command>svnserve</command>.
The "
@@ -22613,7 +22618,7 @@
"+ssh://</literal>的URL模式来连接："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1126
+#: ../../en/book/ch06-server-configuration.xml:1128
#, fuzzy
msgid ""
"In this example, the Subversion client is invoking a local <command>ssh</"
@@ -22636,7 +22641,7 @@
"如果客户执行一个提交，认证的用户名会作为版本的参数保存到新的修订本。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1141
+#: ../../en/book/ch06-server-configuration.xml:1143
#, fuzzy
msgid ""
"The important thing to understand here is that the Subversion client is "
@@ -22652,7 +22657,7 @@
"<command>svnserve</command>进程，然后网络断开后终止进程。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1150
+#: ../../en/book/ch06-server-configuration.xml:1152
#, fuzzy
msgid ""
"When using <literal>svn+ssh://</literal> URLs to access a repository, "
@@ -22678,7 +22683,7 @@
"Windows下的<command>pageant</command>。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1166
+#: ../../en/book/ch06-server-configuration.xml:1168
#, fuzzy
msgid ""
"When running over a tunnel, authorization is primarily controlled by "
@@ -22702,7 +22707,7 @@
"literal>。<placeholder-1/>"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:1180
+#: ../../en/book/ch06-server-configuration.xml:1182
msgid ""
"Note that using any sort of <command>svnserve</command>-enforced access "
"control at all is a bit pointless; the user already has direct access to
the "
@@ -22712,7 +22717,7 @@
"为用户已经直接访问到了版本库数据。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1187
+#: ../../en/book/ch06-server-configuration.xml:1189
#, fuzzy
msgid ""
"You'd think that the story of SSH tunneling would end here, but it
doesn't. "
@@ -22728,13 +22733,13 @@
"<filename>config</filename>文件的<literal>[tunnels]</literal>部分作如下定
义："
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:1193
+#: ../../en/book/ch06-server-configuration.xml:1195
msgid ""
"We don't actually recommend this, since RSH is notably less secure than
SSH."
msgstr "我们实际上不支持这个，因为RSH在安全性上显著不如SSH。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1205
+#: ../../en/book/ch06-server-configuration.xml:1207
#, fuzzy
msgid ""
"And now, you can use this new tunnel definition by using a URL scheme
that "
@@ -22754,7 +22759,7 @@
"义比这个更加智能的新的管道模式："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1221
+#: ../../en/book/ch06-server-configuration.xml:1223
#, fuzzy
msgid ""
"This example demonstrates a couple of things. First, it shows how to
make "
@@ -22770,7 +22775,7 @@
"的SSH程序―对连接到非标准端口的程序非常有用。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1231
+#: ../../en/book/ch06-server-configuration.xml:1233
#, fuzzy
msgid ""
"Second, it shows how to define a custom environment variable that can "
@@ -22792,12 +22797,12 @@
"<command>/opt/alternate/ssh -p 29934</command>。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:1249
+#: ../../en/book/ch06-server-configuration.xml:1251
msgid "SSH configuration tricks"
msgstr "SSH 配置技巧"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1251
+#: ../../en/book/ch06-server-configuration.xml:1253
#, fuzzy
msgid ""
"It's possible to control not only the way in which the client invokes "
@@ -22812,7 +22817,7 @@
"户。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1263
+#: ../../en/book/ch06-server-configuration.xml:1265
#, fuzzy
msgid ""
"To begin, locate the home directory of the account you'll be using to
launch "
@@ -22828,7 +22833,7 @@
"作。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1271
+#: ../../en/book/ch06-server-configuration.xml:1273
#, fuzzy
msgid ""
"If it doesn't already exist, create the
<filename>authorized_keys</filename> "
@@ -22841,7 +22846,7 @@
"个允许连接的公钥，这些行通常是下面的形式："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1282
+#: ../../en/book/ch06-server-configuration.xml:1284
#, fuzzy
msgid ""
"The first field describes the type of key, the second field is the
base64-"
@@ -22854,7 +22859,7 @@
"行："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1292
+#: ../../en/book/ch06-server-configuration.xml:1294
#, fuzzy
msgid ""
"When the <literal>command</literal> field is set, the SSH daemon will run
the "
@@ -22868,12 +22873,12 @@
"开启了大门，在下面的例子里，我们简写了文件的这些行："
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:1307
+#: ../../en/book/ch06-server-configuration.xml:1309
msgid "Controlling the invoked command"
msgstr "控制调用的命令"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1309
+#: ../../en/book/ch06-server-configuration.xml:1311
msgid ""
"Because we can specify the executed server-side command, it's easy to
name a "
"specific <command>svnserve</command> binary to run and to pass it extra "
@@ -22883,7 +22888,7 @@
"<command>svnserve</command>程序来并且传递给它额外的参数："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1317
+#: ../../en/book/ch06-server-configuration.xml:1319
#, fuzzy
msgid ""
"In this example, <filename>/path/to/svnserve</filename> might be a
custom "
@@ -22903,7 +22908,7 @@
"以使用户不需要在<literal>svn+ssh://</literal>URL里输入绝对路径。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1329
+#: ../../en/book/ch06-server-configuration.xml:1331
#, fuzzy
msgid ""
"It's also possible to have multiple users share a single account.
Instead of "
@@ -22917,7 +22922,7 @@
"钥，一个用户一行，使用<option>--tunnel-user</option>选项："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1342
+#: ../../en/book/ch06-server-configuration.xml:1344
#, fuzzy
msgid ""
"This example allows both Harry and Sally to connect to the same account
via "
@@ -22933,7 +22938,7 @@
"提交会作为共享的系统帐户提交。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1352
+#: ../../en/book/ch06-server-configuration.xml:1354
#, fuzzy
msgid ""
"A final word of caution: giving a user access to the server via
public-key in "
@@ -22952,7 +22957,7 @@
"后指定一些限制选项："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1368
+#: ../../en/book/ch06-server-configuration.xml:1370
msgid ""
"Note that this all must be on one line—truly on one
line—since "
"SSH <filename>authorized_keys</filename> files do not even allow the "
@@ -22962,12 +22967,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch06-server-configuration.xml:1387
+#: ../../en/book/ch06-server-configuration.xml:1389
msgid "httpd, the Apache HTTP Server"
msgstr "httpd - Apache 的 HTTP 服务器"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:1389
+#: ../../en/book/ch06-server-configuration.xml:1391
#, fuzzy
msgid ""
"The Apache HTTP Server is a <quote>heavy-duty</quote> network server
that "
@@ -22995,12 +23000,12 @@
"command>没有的特性，但是也有一点难于配置，灵活通常会带来复杂性。"
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:1403
+#: ../../en/book/ch06-server-configuration.xml:1405
msgid "They really hate doing that."
msgstr "他们讨厌这样做。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:1409
+#: ../../en/book/ch06-server-configuration.xml:1411
#, fuzzy
msgid ""
"Much of the following discussion includes references to Apache
configuration "
@@ -23018,7 +23023,7 @@
"html\"> http://httpd.apache.org/docs-2.0/mod/directives.html</uri>。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:1418
+#: ../../en/book/ch06-server-configuration.xml:1420
#, fuzzy
msgid ""
"Also, as you make changes to your Apache setup, it is likely that
somewhere "
@@ -23039,12 +23044,12 @@
"的错误日志接口，你可以浏览这个文件的内容查看信息来查找难于发现的问题根
源。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:1432
+#: ../../en/book/ch06-server-configuration.xml:1434
msgid "Why Apache 2?"
msgstr "为什么是 Apache 2？"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:1434
+#: ../../en/book/ch06-server-configuration.xml:1436
#, fuzzy
msgid ""
"If you're a system administrator, it's very likely that you're already "
@@ -23064,7 +23069,7 @@
"Subversion的Apache模块只是为Apache 2 API写的后开始担心。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:1447
+#: ../../en/book/ch06-server-configuration.xml:1449
#, fuzzy
msgid ""
"The proper response to this problem is: don't worry about it. It's easy
to "
@@ -23078,12 +23083,12 @@
"端可以访问版本库时在URL里指定端口："
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:1462
+#: ../../en/book/ch06-server-configuration.xml:1464
msgid "Prerequisites"
msgstr "先决条件"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1464
+#: ../../en/book/ch06-server-configuration.xml:1466
#, fuzzy
msgid ""
"To network your repository over HTTP, you basically need four
components, "
@@ -23099,13 +23104,13 @@
"果你有了这些组件，网络化你的版本库将非常简单，如："
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1475
+#: ../../en/book/ch06-server-configuration.xml:1477
msgid ""
"Getting httpd 2.0 up and running with the <command>mod_dav</command>
module"
msgstr "配置好httpd 2.0，并且使用<command>mod_dav</command>启动"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1479
+#: ../../en/book/ch06-server-configuration.xml:1481
msgid ""
"Installing the <command>mod_dav_svn</command> backend to
<command>mod_dav</"
"command>, which uses Subversion's libraries to access the repository"
@@ -23114,14 +23119,14 @@
"用 Subversion 库访问版本库"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1484
+#: ../../en/book/ch06-server-configuration.xml:1486
msgid ""
"Configuring your <filename>httpd.conf</filename> file to export (or
expose) "
"the repository"
msgstr "配置你的<filename>httpd.conf</filename>来输出(或者说暴露)版本库"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1489
+#: ../../en/book/ch06-server-configuration.xml:1491
#, fuzzy
msgid ""
"You can accomplish the first two items either by compiling
<command>httpd</"
@@ -23138,12 +23143,12 @@
"<filename>INSTALL</filename>文件。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:1502
+#: ../../en/book/ch06-server-configuration.xml:1504
msgid "Basic Apache Configuration"
msgstr "基本的 Apache 配置"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1504
+#: ../../en/book/ch06-server-configuration.xml:1506
#, fuzzy
msgid ""
"Once you have all the necessary components installed on your system, all
that "
@@ -23167,7 +23172,7 @@
"位置："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1523
+#: ../../en/book/ch06-server-configuration.xml:1525
#, fuzzy
msgid ""
"Note that if <command>mod_dav</command> was compiled as a shared object "
@@ -23181,7 +23186,7 @@
"句，一定确定它在<command>mod_dav_svn</command>之前："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1535
+#: ../../en/book/ch06-server-configuration.xml:1537
#, fuzzy
msgid ""
"At a later location in your configuration file, you now need to tell
Apache "
@@ -23210,7 +23215,7 @@
"<filename>httpd.conf</filename>语法："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1561
+#: ../../en/book/ch06-server-configuration.xml:1563
#, fuzzy
msgid ""
"If you plan to support multiple Subversion repositories that will reside
in "
@@ -23231,7 +23236,7 @@
"语法："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1583
+#: ../../en/book/ch06-server-configuration.xml:1585
#, fuzzy
msgid ""
"Using the previous syntax, Apache will delegate the handling of all URLs "
@@ -23248,7 +23253,7 @@
"<literal>SVNPath</literal>指示，我们在此不必为创建新的版本库而重启
Apache。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1593
+#: ../../en/book/ch06-server-configuration.xml:1595
#, fuzzy
msgid ""
"Be sure that when you define your new <literal>Location</literal>, it
doesn't "
@@ -23271,12 +23276,12 @@
"通常是<literal>301 Moved Permanently</literal>。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:1609
+#: ../../en/book/ch06-server-configuration.xml:1611
msgid "Server Names and the COPY Request"
msgstr "服务器名称和复制请求"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:1611
+#: ../../en/book/ch06-server-configuration.xml:1613
#, fuzzy
msgid ""
"Subversion makes use of the <literal>COPY</literal> request type to
perform "
@@ -23295,7 +23300,7 @@
"的。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:1626
+#: ../../en/book/ch06-server-configuration.xml:1628
#, fuzzy
msgid ""
"If you are using Apache's virtual hosting support via the "
@@ -23309,7 +23314,7 @@
"文档的来得到更多细节。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1634
+#: ../../en/book/ch06-server-configuration.xml:1636
#, fuzzy
msgid ""
"At this stage, you should strongly consider the question of permissions.
If "
@@ -23327,7 +23332,7 @@
"Subversion服务器运行时，同样需要正确的访问许可来读写你的Subversion版本
库。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1645
+#: ../../en/book/ch06-server-configuration.xml:1647
#, fuzzy
msgid ""
"You will need to determine a permission system setup that satisfies "
@@ -23352,19 +23357,19 @@
"忽。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:1665
+#: ../../en/book/ch06-server-configuration.xml:1667
msgid "Authentication Options"
msgstr "认证选项"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1667
+#: ../../en/book/ch06-server-configuration.xml:1669
msgid ""
"At this point, if you configured <filename>httpd.conf</filename> to
contain "
"something such as the following:"
msgstr "此时，如果你配置的 <filename>httpd.conf</filename> 包含了如下内
容："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1678
+#: ../../en/book/ch06-server-configuration.xml:1680
#, fuzzy
msgid ""
"your repository is <quote>anonymously</quote> accessible to the world.
Until "
@@ -23377,7 +23382,7 @@
"访问，换句话说："
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1687
+#: ../../en/book/ch06-server-configuration.xml:1689
msgid ""
"Anyone can use a Subversion client to check out a working copy of a "
"repository URL (or any of its subdirectories)."
@@ -23386,7 +23391,7 @@
"录)。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1692
+#: ../../en/book/ch06-server-configuration.xml:1694
msgid ""
"Anyone can interactively browse the repository's latest revision simply
by "
"pointing a web browser to the repository URL."
@@ -23394,12 +23399,12 @@
"任何人可以在浏览器输入版本库URL交互浏览的方式来查看版本库的最新修订版本。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1697
+#: ../../en/book/ch06-server-configuration.xml:1699
msgid "Anyone can commit to the repository."
msgstr "任何人可以提交到版本库。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1701
+#: ../../en/book/ch06-server-configuration.xml:1703
#, fuzzy
msgid ""
"Of course, you might have already set up a
<filename>pre-commit</filename> "
@@ -23412,12 +23417,12 @@
"内置的方法来限制访问。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:1710
+#: ../../en/book/ch06-server-configuration.xml:1712
msgid "Setting up HTTP authentication"
msgstr "配置 HTTP 认证"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1712
+#: ../../en/book/ch06-server-configuration.xml:1714
#, fuzzy
msgid ""
"The easiest way to authenticate a client is via the HTTP Basic
authentication "
@@ -23433,7 +23438,7 @@
"Harry赋予提交权限，首先，我们需要添加他们到密码文件："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1735
+#: ../../en/book/ch06-server-configuration.xml:1737
#, fuzzy
msgid ""
"Next, you need to add some more <filename>httpd.conf</filename>
directives "
@@ -23456,7 +23461,7 @@
"密码文件的位置。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1750
+#: ../../en/book/ch06-server-configuration.xml:1752
msgid ""
"After adding these three directives, your
<literal><Location></literal> "
"block should look something like this:"
@@ -23464,7 +23469,7 @@
"添加完这三个指示，你的<literal><Location></literal>区块一定像这个样
子："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1764
+#: ../../en/book/ch06-server-configuration.xml:1766
#, fuzzy
msgid ""
"This <literal><Location></literal> block is not yet complete, and
it "
@@ -23484,7 +23489,7 @@
"<literal>Require valid-user</literal>来告诉Apache任何请求需要认证的用户："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1787
+#: ../../en/book/ch06-server-configuration.xml:1789
msgid ""
"Be sure to read the next section (<xref
linkend=\"svn.serverconfig.httpd.authz"
"\"/>) for more detail on the <literal>Require</literal> directive and
other "
@@ -23494,14 +23499,14 @@
"<literal>Require</literal>的细节，和授权政策的其他设置方法。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1792
+#: ../../en/book/ch06-server-configuration.xml:1794
msgid ""
"One word of warning: HTTP Basic Auth passwords pass in very nearly plain
text "
"over the network, and thus are extremely insecure."
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1796
+#: ../../en/book/ch06-server-configuration.xml:1798
msgid ""
"Another option is to not use Basic authentication, but to use Digest "
"authentication instead. Digest authentication allows the server to
verify "
@@ -23515,7 +23520,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1808
+#: ../../en/book/ch06-server-configuration.xml:1810
msgid ""
"Configuring Apache for Digest authentication is also fairly easy, and
only a "
"small variation on our prior example. Be sure to consult Apache's "
@@ -23523,7 +23528,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1825
+#: ../../en/book/ch06-server-configuration.xml:1827
#, fuzzy
msgid ""
"If you're looking for maximum security, public key cryptography is the
best "
@@ -23539,7 +23544,7 @@
"<placeholder-1/>参考Apache的文档(和OpenSSL文档)来查看怎样做。"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:1832
+#: ../../en/book/ch06-server-configuration.xml:1834
msgid ""
"While self-signed server certificates are still vulnerable to a
<quote>man-in-"
"the-middle</quote> attack, such an attack is much more difficult for a
casual "
@@ -23549,12 +23554,12 @@
"码相比，这样的攻击比一个偶然的获取要艰难许多。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:1846
+#: ../../en/book/ch06-server-configuration.xml:1848
msgid "SSL certificate management"
msgstr "SSL 证书管理"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1848
+#: ../../en/book/ch06-server-configuration.xml:1850
#, fuzzy
msgid ""
"Businesses that need to expose their repositories for access outside the "
@@ -23567,7 +23572,7 @@
"露。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1855
+#: ../../en/book/ch06-server-configuration.xml:1857
#, fuzzy
msgid ""
"If a Subversion client is compiled to use OpenSSL, it gains the ability
to "
@@ -23584,7 +23589,7 @@
"SSL证书并且成功地互相认证，所有剩下的交流都会通过一个会话关键字加密。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1864
+#: ../../en/book/ch06-server-configuration.xml:1866
#, fuzzy
msgid ""
"It's beyond the scope of this book to describe how to generate client
and "
@@ -23598,7 +23603,7 @@
"通的客户端怎样来管理服务器与客户端证书。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1872
+#: ../../en/book/ch06-server-configuration.xml:1874
msgid ""
"When speaking to Apache via <literal>https://</literal>, a Subversion
client "
"can receive two different types of information:"
@@ -23607,17 +23612,17 @@
"两种类型的信息："
#. type: Content of:
<book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1877
+#: ../../en/book/ch06-server-configuration.xml:1879
msgid "A server certificate"
msgstr "一个服务器证书"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:1878
+#: ../../en/book/ch06-server-configuration.xml:1880
msgid "A demand for a client certificate"
msgstr "一个客户端证书的要求"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1881
+#: ../../en/book/ch06-server-configuration.xml:1883
#, fuzzy
msgid ""
"If the client receives a server certificate, it needs to verify that it "
@@ -23635,7 +23640,7 @@
"书："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1907
+#: ../../en/book/ch06-server-configuration.xml:1909
#, fuzzy
msgid ""
"This dialogue should look familiar; it's essentially the same question
you've "
@@ -23653,7 +23658,7 @@
"任这个证书。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1918
+#: ../../en/book/ch06-server-configuration.xml:1920
#, fuzzy
msgid ""
"Your runtime <filename>servers</filename> file also gives you the ability
to "
@@ -23667,7 +23672,7 @@
"authority-files</literal>为一组逗号隔开的PEM加密的CA证书列表："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1930
+#: ../../en/book/ch06-server-configuration.xml:1932
#, fuzzy
msgid ""
"Many OpenSSL installations also have a predefined set of <quote>default</"
@@ -23680,7 +23685,7 @@
"literal>为<literal>true</literal>。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1937
+#: ../../en/book/ch06-server-configuration.xml:1939
#, fuzzy
msgid ""
"When talking to Apache, a Subversion client might also receive a
challenge "
@@ -23698,7 +23703,7 @@
"护用的密码："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1957
+#: ../../en/book/ch06-server-configuration.xml:1959
#, fuzzy
msgid ""
"Notice that the client certificate is a <quote>p12</quote> file. To use
a "
@@ -23712,7 +23717,7 @@
"另一个选择是用OpenSSL命令行工具来转化存在的证书为PKCS#12格式。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1965
+#: ../../en/book/ch06-server-configuration.xml:1967
#, fuzzy
msgid ""
"Again, the runtime <filename>servers</filename> file allows you to
automate "
@@ -23723,7 +23728,7 @@
"单个或两条信息可以用运行参数来描述："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:1979
+#: ../../en/book/ch06-server-configuration.xml:1981
#, fuzzy
msgid ""
"Once you've set the <literal>ssl-client-cert-file</literal> and
<literal>ssl-"
@@ -23736,7 +23741,7 @@
"打扰你。<placeholder-1/>"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:1985
+#: ../../en/book/ch06-server-configuration.xml:1987
msgid ""
"More security-conscious folk might not want to store the client
certificate "
"password in the runtime <filename>servers</filename> file."
@@ -23745,12 +23750,12 @@
"书密码。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:1997
+#: ../../en/book/ch06-server-configuration.xml:1999
msgid "Authorization Options"
msgstr "授权选项"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:1999
+#: ../../en/book/ch06-server-configuration.xml:2001
#, fuzzy
msgid ""
"At this point, you've configured authentication, but not authorization. "
@@ -23764,12 +23769,12 @@
"略。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2008
+#: ../../en/book/ch06-server-configuration.xml:2010
msgid "Blanket access control"
msgstr "整体访问控制"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2010
+#: ../../en/book/ch06-server-configuration.xml:2012
msgid ""
"The simplest form of access control is to authorize certain users for
either "
"read-only access to a repository or read/write access to a repository."
@@ -23777,7 +23782,7 @@
"最简单的访问控制形式是授权特定用户为只读版本库访问或者是读/写访问版本库。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2014
+#: ../../en/book/ch06-server-configuration.xml:2016
#, fuzzy
msgid ""
"You can restrict access on all repository operations by adding the "
@@ -23794,7 +23799,7 @@
"供正确的用户名及对应密码，这样允许对Subversion版本库做任何事："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2038
+#: ../../en/book/ch06-server-configuration.xml:2040
#, fuzzy
msgid ""
"Sometimes you don't need to run such a tight ship. For example,
Subversion's "
@@ -23816,7 +23821,7 @@
"签，你需要在<literal><Location></literal>中添加这个指示。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2052
+#: ../../en/book/ch06-server-configuration.xml:2054
#, fuzzy
msgid ""
"The parameters present on the <literal>Limit</literal> and "
@@ -23839,7 +23844,7 @@
"literal>区块中而不是在<literal><Location></literal>区块。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2083
+#: ../../en/book/ch06-server-configuration.xml:2085
#, fuzzy
msgid ""
"These are only a few simple examples. For more in-depth information
about "
@@ -23854,12 +23859,12 @@
"tutorials.html</uri>中的<literal>Security</literal>部分。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2095
+#: ../../en/book/ch06-server-configuration.xml:2097
msgid "Per-directory access control"
msgstr "每目录访问控制"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2097
+#: ../../en/book/ch06-server-configuration.xml:2099
#, fuzzy
msgid ""
"It's possible to set up finer-grained permissions using a second Apache
httpd "
@@ -23874,7 +23879,7 @@
"求。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2105
+#: ../../en/book/ch06-server-configuration.xml:2107
#, fuzzy
msgid ""
"If you've built Subversion from source code,
<command>mod_authz_svn</command> "
@@ -23890,7 +23895,7 @@
"literal>指示中的<command>mod_dav_svn</command>后面："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2120
+#: ../../en/book/ch06-server-configuration.xml:2122
#, fuzzy
msgid ""
"To activate this module, you need to configure your <literal>Location</"
@@ -23903,7 +23908,7 @@
"件。(一会儿我们将会讨论这个文件的格式。)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2127
+#: ../../en/book/ch06-server-configuration.xml:2129
#, fuzzy
msgid ""
"Apache is flexible, so you have the option to configure your block in one
of "
@@ -23917,7 +23922,7 @@
"查看更多的细节。)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2134
+#: ../../en/book/ch06-server-configuration.xml:2136
#, fuzzy
msgid ""
"The simplest block is to allow open access to everyone. In this
scenario, "
@@ -23930,12 +23935,12 @@
"authz.perdir.ex-1\"/>。)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><example><title>
-#: ../../en/book/ch06-server-configuration.xml:2141
+#: ../../en/book/ch06-server-configuration.xml:2143
msgid "A sample configuration for anonymous access"
msgstr "匿名访问的配置样例"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2153
+#: ../../en/book/ch06-server-configuration.xml:2155
#, fuzzy
msgid ""
"On the opposite end of the paranoia scale, you can configure your block
to "
@@ -23951,12 +23956,12 @@
"\"/>。)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><example><title>
-#: ../../en/book/ch06-server-configuration.xml:2162
+#: ../../en/book/ch06-server-configuration.xml:2164
msgid "A sample configuration for authenticated access"
msgstr "认证访问的配置样例"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2182
+#: ../../en/book/ch06-server-configuration.xml:2184
#, fuzzy
msgid ""
"A third very popular pattern is to allow a combination of authenticated
and "
@@ -23977,12 +23982,12 @@
"<xref linkend=\"svn.serverconfig.httpd.authz.perdir.ex-3\"/>。)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><example><title>
-#: ../../en/book/ch06-server-configuration.xml:2196
+#: ../../en/book/ch06-server-configuration.xml:2198
msgid "A sample configuration for mixed authenticated/anonymous access"
msgstr "混合认证/匿名访问的配置样例"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2219
+#: ../../en/book/ch06-server-configuration.xml:2221
#, fuzzy
msgid ""
"Once you've settled on one of these three basic <filename>httpd.conf</"
@@ -23995,12 +24000,12 @@
"有描述。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2230
+#: ../../en/book/ch06-server-configuration.xml:2232
msgid "Disabling path-based checks"
msgstr "禁用基于路径的检查"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2232
+#: ../../en/book/ch06-server-configuration.xml:2234
#, fuzzy
msgid ""
"The <command>mod_dav_svn</command> module goes through a lot of work to
make "
@@ -24024,7 +24029,7 @@
"终止。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2247
+#: ../../en/book/ch06-server-configuration.xml:2249
#, fuzzy
msgid ""
"All of this path checking can sometimes be quite expensive, especially in
the "
@@ -24032,14 +24037,15 @@
"server looks at every changed path in each revision and checks it for "
"readability. If an unreadable path is discovered, it's omitted from the
list "
"of the revision's changed paths (normally seen with the
<option>--verbose</"
-"option> option), and the whole log message is suppressed. Needless to
say, "
-"this can be time-consuming on revisions that affect a large number of
files. "
-"This is the cost of security: even if you haven't configured a module
such as "
-"<command>mod_authz_svn</command> at all, the
<command>mod_dav_svn</command> "
-"module is still asking Apache <command>httpd</command> to run
authorization "
-"checks on every path. The <command>mod_dav_svn</command> module has no
idea "
-"what authorization modules have been installed, so all it can do is ask "
-"Apache to invoke whatever might be present."
+"option> (<option>-v</option>) option), and the whole log message is "
+"suppressed. Needless to say, this can be time-consuming on revisions
that "
+"affect a large number of files. This is the cost of security: even if
you "
+"haven't configured a module such as <command>mod_authz_svn</command> at
all, "
+"the <command>mod_dav_svn</command> module is still asking Apache "
+"<command>httpd</command> to run authorization checks on every path. The "
+"<command>mod_dav_svn</command> module has no idea what authorization
modules "
+"have been installed, so all it can do is ask Apache to invoke whatever
might "
+"be present."
msgstr ""
"所有的路径检查在有时会非常昂贵，特别是<command>svn log</command>的情况。当
检索"
"一列修订版本时，服务器会查看所有修订版本修改的路径，并且检查可读性，如果发
现了"
@@ -24051,7 +24057,7 @@
"证模块被安装，所以只能要求Apache调用时提供的内容。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2267
+#: ../../en/book/ch06-server-configuration.xml:2269
#, fuzzy
msgid ""
"On the other hand, there's also an escape hatch of sorts, which allows
you to "
@@ -24068,12 +24074,12 @@
"<literal>SVNPathAuthz</literal>指示："
#. type: Content of: <book><chapter><sect1><sect2><sect3><example><title>
-#: ../../en/book/ch06-server-configuration.xml:2279
+#: ../../en/book/ch06-server-configuration.xml:2281
msgid "Disabling path checks altogether"
msgstr "禁用所有的路径检查"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2290
+#: ../../en/book/ch06-server-configuration.xml:2292
#, fuzzy
msgid ""
"The <literal>SVNPathAuthz</literal> directive is <quote>on</quote> by "
@@ -24086,12 +24092,12 @@
"command>停止对每个目录调用授权检查。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch06-server-configuration.xml:2303
+#: ../../en/book/ch06-server-configuration.xml:2305
msgid "Extra Goodies"
msgstr "额外的糖果"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch06-server-configuration.xml:2305
+#: ../../en/book/ch06-server-configuration.xml:2307
#, fuzzy
msgid ""
"We've covered most of the authentication and authorization options for
Apache "
@@ -24102,12 +24108,12 @@
"选项，但是Apache还提供了许多很好的特性。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2312
+#: ../../en/book/ch06-server-configuration.xml:2314
msgid "Repository browsing"
msgstr "版本库浏览"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2314
+#: ../../en/book/ch06-server-configuration.xml:2316
#, fuzzy
msgid ""
"One of the most useful benefits of an Apache/WebDAV configuration for
your "
@@ -24127,7 +24133,7 @@
"mod_dav_svn会负责列出目录列表或者是文件内容。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2326
+#: ../../en/book/ch06-server-configuration.xml:2328
#, fuzzy
msgid ""
"Since the URLs do not contain any information about which version of the "
@@ -24144,12 +24150,12 @@
"使用这些URL。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:2337
+#: ../../en/book/ch06-server-configuration.xml:2339
msgid "Can I View Older Revisions?"
msgstr "我可以看到老的修订版本吗？"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2339
+#: ../../en/book/ch06-server-configuration.xml:2341
#, fuzzy
msgid ""
"With an ordinary web browser? In one word: nope. At least, not with "
@@ -24159,7 +24165,7 @@
"command>作为唯一的工具时。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2343
+#: ../../en/book/ch06-server-configuration.xml:2345
#, fuzzy
msgid ""
"Your web browser speaks ordinary HTTP only. That means it knows only how
to "
@@ -24179,7 +24185,7 @@
"PROPFIND请求和理解DeltaV概念，这些事情一般是你的web浏览器做不了的。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2355
+#: ../../en/book/ch06-server-configuration.xml:2357
#, fuzzy
msgid ""
"So, to answer the question, one obvious way to see older revisions of
files "
@@ -24200,17 +24206,17 @@
"<placeholder-1/>最新的版本也已经可以理解Subversion版本库了。"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><sidebar><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:2365
+#: ../../en/book/ch06-server-configuration.xml:2367
msgid "Back then, it was called ViewCVS."
msgstr "之前叫做 ViewCVS。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><title>
-#: ../../en/book/ch06-server-configuration.xml:2372
+#: ../../en/book/ch06-server-configuration.xml:2374
msgid "Proper MIME type"
msgstr "正确的 MIME 类型"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2374
+#: ../../en/book/ch06-server-configuration.xml:2376
#, fuzzy
msgid ""
"When browsing a Subversion repository, the web browser gets a clue about
how "
@@ -24232,7 +24238,7 @@
"照HTML方式渲染。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2389
+#: ../../en/book/ch06-server-configuration.xml:2391
#, fuzzy
msgid ""
"To make this happen, you need only to make sure that your files have the "
@@ -24248,7 +24254,7 @@
"literal>属性；见<xref linkend=\"svn.advanced.props.auto\"/>。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2399
+#: ../../en/book/ch06-server-configuration.xml:2401
#, fuzzy
msgid ""
"So in our example, if one were to set the
<literal>svn:mime-type</literal> "
@@ -24266,12 +24272,12 @@
"包含动态生成的内容。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><title>
-#: ../../en/book/ch06-server-configuration.xml:2414
+#: ../../en/book/ch06-server-configuration.xml:2416
msgid "Customizing the look"
msgstr "定制外观"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2416
+#: ../../en/book/ch06-server-configuration.xml:2418
#, fuzzy
msgid ""
"You generally will get more use out of URLs to versioned
files—after "
@@ -24295,7 +24301,7 @@
"样式表文件："
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2441
+#: ../../en/book/ch06-server-configuration.xml:2443
#, fuzzy
msgid ""
"Using the <literal>SVNIndexXSLT</literal> directive and a creative XSLT "
@@ -24314,12 +24320,12 @@
"表来利用它们！"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><title>
-#: ../../en/book/ch06-server-configuration.xml:2455
+#: ../../en/book/ch06-server-configuration.xml:2457
msgid "Listing repositories"
msgstr "列出版本库"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2457
+#: ../../en/book/ch06-server-configuration.xml:2459
#, fuzzy
msgid ""
"If you're serving a collection of repositories from a single URL via the "
@@ -24332,7 +24338,7 @@
"literal>指示激活："
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2473
+#: ../../en/book/ch06-server-configuration.xml:2475
#, fuzzy
msgid ""
"If a user now points her web browser to the URL
<literal>http://host.example."
@@ -24345,12 +24351,12 @@
"安全问题，所以这个特性默认是关闭的。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2486
+#: ../../en/book/ch06-server-configuration.xml:2488
msgid "Apache logging"
msgstr "Apache 日志"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2488
+#: ../../en/book/ch06-server-configuration.xml:2490
#, fuzzy
msgid ""
"Because Apache is an HTTP server at heart, it contains fantastically
flexible "
@@ -24370,7 +24376,7 @@
"filename>。)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2501
+#: ../../en/book/ch06-server-configuration.xml:2503
#, fuzzy
msgid ""
"The <filename>error_log</filename> describes any internal errors that
Apache "
@@ -24385,7 +24391,7 @@
"易查看，例如包括Subversion客户端的IP地址，哪些用户正确认证和请求成功还是失
败。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2510
+#: ../../en/book/ch06-server-configuration.xml:2512
#, fuzzy
msgid ""
"Unfortunately, because HTTP is a stateless protocol, even the simplest "
@@ -24404,7 +24410,7 @@
"操作会发送几乎完全相同的一系列请求，所以更加难以区分。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2521
+#: ../../en/book/ch06-server-configuration.xml:2523
#, fuzzy
msgid ""
"<command>mod_dav_svn</command>, however, can come to your aid. By
activating "
@@ -24417,7 +24423,7 @@
"件，来描述你的客户端都做了哪些高级操作。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2528
+#: ../../en/book/ch06-server-configuration.xml:2530
#, fuzzy
msgid ""
"To do this, you need to make use of Apache's
<literal>CustomLog</literal> "
@@ -24430,7 +24436,7 @@
"个指示。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2544
+#: ../../en/book/ch06-server-configuration.xml:2546
#, fuzzy
msgid ""
"In this example, we're asking Apache to create a special logfile, "
@@ -24451,7 +24457,7 @@
"客户段操作时自动设置的。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2556
+#: ../../en/book/ch06-server-configuration.xml:2558
#, fuzzy
msgid ""
"So, instead of having to interpret a traditional <filename>access_log</"
@@ -24459,14 +24465,14 @@
msgstr "所以我们不选择翻译下面的传统的<filename>access_log</filename>文
件："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2570
+#: ../../en/book/ch06-server-configuration.xml:2572
msgid ""
"you can peruse a much more intelligible <filename>svn_logfile</filename>
like "
"this:"
msgstr "你可以细读一个更加智能的 <filename>svn_logfile</filename> 文件："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2581
+#: ../../en/book/ch06-server-configuration.xml:2583
msgid ""
"For an exhaustive list of all actions logged, see <xref
linkend=\"svn.ref."
"mod_dav_svn.conf.logging\"/>."
@@ -24474,12 +24480,12 @@
"完全记录的日志动作见<xref
linkend=\"svn.ref.mod_dav_svn.conf.logging\"/>。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2588
+#: ../../en/book/ch06-server-configuration.xml:2590
msgid "Write-through proxying"
msgstr "通过代理写"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2590
+#: ../../en/book/ch06-server-configuration.xml:2592
msgid ""
"One of the nice advantages of using Apache as a Subversion server is that
it "
"can be set up for simple replication. For example, suppose that your
team is "
@@ -24498,7 +24504,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2610
+#: ../../en/book/ch06-server-configuration.xml:2612
msgid ""
"This configuration creates a huge perceptual speed increase for your
users, "
"because Subversion client traffic is typically 80–90% read
requests. "
@@ -24507,7 +24513,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2616
+#: ../../en/book/ch06-server-configuration.xml:2618
msgid ""
"In this section, we'll walk you through a standard setup of this single-"
"master/multiple-slave system. However, keep in mind that your servers
must "
@@ -24516,12 +24522,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><title>
-#: ../../en/book/ch06-server-configuration.xml:2623
+#: ../../en/book/ch06-server-configuration.xml:2625
msgid "Configure the servers"
msgstr "配置服务器"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2625
+#: ../../en/book/ch06-server-configuration.xml:2627
msgid ""
"First, configure your master server's <filename>httpd.conf</filename>
file in "
"the usual way. Make the repository available at a certain URI location,
and "
@@ -24532,7 +24538,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2643
+#: ../../en/book/ch06-server-configuration.xml:2645
msgid ""
"This new directive tells a slave server to redirect all write requests to
the "
"master. (This is done automatically via Apache's <command>mod_proxy</"
@@ -24543,7 +24549,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2652
+#: ../../en/book/ch06-server-configuration.xml:2654
msgid ""
"Next, we need to deal with the problem of infinite recursion. With the "
"current configuration, imagine what will happen when a Subversion client "
@@ -24555,7 +24561,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2663
+#: ../../en/book/ch06-server-configuration.xml:2665
msgid ""
"The solution to this problem is to have the master push revisions to a "
"different <literal><Location></literal> on the slaves. This
location "
@@ -24564,12 +24570,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><title>
-#: ../../en/book/ch06-server-configuration.xml:2685
+#: ../../en/book/ch06-server-configuration.xml:2687
msgid "Set up replication"
msgstr "设置复制"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2687
+#: ../../en/book/ch06-server-configuration.xml:2689
msgid ""
"Now that you've configured your <literal>Location</literal> blocks on
master "
"and slaves, you need to configure the master to replicate to the
slaves. "
@@ -24579,7 +24585,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2696
+#: ../../en/book/ch06-server-configuration.xml:2698
msgid ""
"First, make sure that each slave repository has a <filename>pre-revprop-"
"change</filename> hook script which allows remote revision property
changes. "
@@ -24590,7 +24596,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2743
+#: ../../en/book/ch06-server-configuration.xml:2745
msgid ""
"After this is done, we configure the master server's
<literal>post-commit</"
"literal> hook script to invoke <command>svnsync</command> on each slave "
@@ -24598,7 +24604,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2756
+#: ../../en/book/ch06-server-configuration.xml:2758
msgid ""
"The extra bits on the end of each line aren't necessary, but they're a
sneaky "
"way to allow the sync commands to run in the background so that the "
@@ -24609,7 +24615,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2776
+#: ../../en/book/ch06-server-configuration.xml:2778
msgid ""
"The only thing we've left out here is what to do about locks. Because
locks "
"are strictly enforced by the master server (the only place where commits "
@@ -24626,12 +24632,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><title>
-#: ../../en/book/ch06-server-configuration.xml:2796
+#: ../../en/book/ch06-server-configuration.xml:2798
msgid "Caveats"
msgstr "告诫"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sect4><para>
-#: ../../en/book/ch06-server-configuration.xml:2798
+#: ../../en/book/ch06-server-configuration.xml:2800
msgid ""
"Your master/slave replication system should now be ready to use. A
couple of "
"words of warning are in order, however. Remember that this replication
isn't "
@@ -24649,12 +24655,12 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sect2><sect3><sect4><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:2818
+#: ../../en/book/ch06-server-configuration.xml:2820
msgid "Can We Set Up Replication with svnserve?"
msgstr "我们可以为 svnserve 设置复制吗？"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><sect4><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2820
+#: ../../en/book/ch06-server-configuration.xml:2822
msgid ""
"If you're using <command>svnserve</command> instead of Apache as your
server, "
"you can certainly configure your repository's hook scripts to invoke "
@@ -24670,12 +24676,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch06-server-configuration.xml:2842
+#: ../../en/book/ch06-server-configuration.xml:2844
msgid "Other Apache features"
msgstr "其它的 Apache 特性"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2844
+#: ../../en/book/ch06-server-configuration.xml:2846
#, fuzzy
msgid ""
"Several of the features already provided by Apache in its role as a
robust "
@@ -24692,7 +24698,7 @@
"器。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2853
+#: ../../en/book/ch06-server-configuration.xml:2855
msgid ""
"Equally useful are other features of the Apache and Subversion
relationship, "
"such as the ability to specify a custom port (instead of the default
HTTP "
@@ -24704,7 +24710,7 @@
"务器访问的能力，这些特性都是Neon所支持的，所以Subversion轻易得到这些支
持。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2860
+#: ../../en/book/ch06-server-configuration.xml:2862
#, fuzzy
msgid ""
"Finally, because <command>mod_dav_svn</command> is speaking a subset of
the "
@@ -24720,7 +24726,7 @@
"杂的主题；察看<xref linkend=\"svn.webdav\"/>来得到更多细节。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch06-server-configuration.xml:2869
+#: ../../en/book/ch06-server-configuration.xml:2871
msgid ""
"Note that there are a number of other small tweaks one can make to "
"<command>mod_dav_svn</command> that are too obscure to mention in this "
@@ -24730,12 +24736,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch06-server-configuration.xml:2887
+#: ../../en/book/ch06-server-configuration.xml:2889
msgid "Path-Based Authorization"
msgstr "基于路径的授权"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:2889
+#: ../../en/book/ch06-server-configuration.xml:2891
#, fuzzy
msgid ""
"Both Apache and <command>svnserve</command> are capable of granting (or "
@@ -24752,7 +24758,7 @@
"它的；另一个目录可以是只对一少部分用户可读。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:2899
+#: ../../en/book/ch06-server-configuration.xml:2901
#, fuzzy
msgid ""
"Both servers use a common file format to describe these path-based
access "
@@ -24772,12 +24778,12 @@
"<filename>svnserve.conf</filename>中)指向规则文件。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:2912
+#: ../../en/book/ch06-server-configuration.xml:2914
msgid "Do You Really Need Path-Based Access Control?"
msgstr "你真的需要基于路径的访问控制吗？"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2914
+#: ../../en/book/ch06-server-configuration.xml:2916
#, fuzzy
msgid ""
"A lot of administrators setting up Subversion for the first time tend to
jump "
@@ -24793,7 +24799,7 @@
"制版本库访问的愿望。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2923
+#: ../../en/book/ch06-server-configuration.xml:2925
#, fuzzy
msgid ""
"Note, though, that there are often invisible (and visible!) costs
associated "
@@ -24819,7 +24825,7 @@
"发, 新人加入等活动的规则，还有很多额外的工作。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2942
+#: ../../en/book/ch06-server-configuration.xml:2944
#, fuzzy
msgid ""
"Remember that this is a version control system! Even if somebody
accidentally "
@@ -24833,7 +24839,7 @@
"外解决。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2949
+#: ../../en/book/ch06-server-configuration.xml:2951
#, fuzzy
msgid ""
"So, before you begin restricting users' access rights, ask yourself
whether "
@@ -24849,12 +24855,12 @@
"<placeholder-1/>。"
#. type: Content of: <book><chapter><sect1><sidebar><para><footnote><para>
-#: ../../en/book/ch06-server-configuration.xml:2957
+#: ../../en/book/ch06-server-configuration.xml:2959
msgid "A common theme in this book!"
msgstr "本书的共同主题！"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:2961
+#: ../../en/book/ch06-server-configuration.xml:2963
#, fuzzy
msgid ""
"As an example to ponder, consider that the Subversion project itself has "
@@ -24871,14 +24877,14 @@
"允许以小组人可以访问。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:2973
+#: ../../en/book/ch06-server-configuration.xml:2975
msgid ""
"Once your server knows where to find your rules file, it's time to define
the "
"rules."
msgstr "当你的服务器知道去查找规则文件时，就是需要定义规则的时候了。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:2976
+#: ../../en/book/ch06-server-configuration.xml:2978
#, fuzzy
msgid ""
"The syntax of the file is the same familiar one used by
<filename>svnserve."
@@ -24897,7 +24903,7 @@
"果用户没有提到，访问是不允许的。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:2988
+#: ../../en/book/ch06-server-configuration.xml:2990
#, fuzzy
msgid ""
"To be more specific: the value of the section names is either of the
form "
@@ -24917,7 +24923,7 @@
"literal>指示，因此在你的小节中只是定义路径也很好―毕竟只有一个版本库。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3006
+#: ../../en/book/ch06-server-configuration.xml:3008
#, fuzzy
msgid ""
"In this first example, the user <literal>harry</literal> has full read
and "
@@ -24931,7 +24937,7 @@
"<literal>sally</literal>只有读权利，任何其他用户禁止访问这个目录。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3013
+#: ../../en/book/ch06-server-configuration.xml:3015
#, fuzzy
msgid ""
"Of course, permissions are inherited from parent to child directory.
That "
@@ -24941,7 +24947,7 @@
"不同访问策略："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3027
+#: ../../en/book/ch06-server-configuration.xml:3029
#, fuzzy
msgid ""
"Now Sally can write to the <filename>testing</filename> subdirectory of
the "
@@ -24952,14 +24958,14 @@
"可以读，同时，Harry对整个分支还继续有完全的读写权限。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3032
+#: ../../en/book/ch06-server-configuration.xml:3034
msgid ""
"It's also possible to explicitly deny permission to someone via
inheritance "
"rules, by setting the username variable to nothing:"
msgstr "也可以通过继承规则明确的的拒绝某人的访问，只需要设置用户名参数为
空："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3045
+#: ../../en/book/ch06-server-configuration.xml:3047
#, fuzzy
msgid ""
"In this example, Harry has read/write access to the entire
<filename>bug-142</"
@@ -24970,7 +24976,7 @@
"对其中的<filename>secret</filename>子目录没有任何访问权利。"
#. type: Content of: <book><chapter><sect1><tip><para>
-#: ../../en/book/ch06-server-configuration.xml:3051
+#: ../../en/book/ch06-server-configuration.xml:3053
#, fuzzy
msgid ""
"The thing to remember is that the most specific path always matches
first. "
@@ -24984,7 +24990,7 @@
"制。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3059
+#: ../../en/book/ch06-server-configuration.xml:3061
#, fuzzy
msgid ""
"By default, nobody has any access to the repository at all. That means
that "
@@ -24998,7 +25004,7 @@
"现，用来代表<quote>所有用户</quote>："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3071
+#: ../../en/book/ch06-server-configuration.xml:3073
#, fuzzy
msgid ""
"This is a common setup; notice that no repository name is mentioned in
the "
@@ -25012,7 +25018,7 @@
"<literal>rw</literal>权限。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3078
+#: ../../en/book/ch06-server-configuration.xml:3080
#, fuzzy
msgid ""
"The asterisk variable (<literal>*</literal>) is also worth special
mention "
@@ -25030,7 +25036,7 @@
"值；如果找不到，Apache就会要求真实的客户端认证。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3088
+#: ../../en/book/ch06-server-configuration.xml:3090
msgid ""
"The access file also allows you to define whole groups of users, much
like "
"the Unix <filename>/etc/group</filename> file:"
@@ -25039,7 +25045,7 @@
"件："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3099
+#: ../../en/book/ch06-server-configuration.xml:3101
#, fuzzy
msgid ""
"Groups can be granted access control just like users. Distinguish them
with "
@@ -25049,7 +25055,7 @@
"前缀来加以区别："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3112
+#: ../../en/book/ch06-server-configuration.xml:3114
msgid ""
"Another important fact is that the <emphasis>first</emphasis> matching
rule "
"is the one which gets applied to a user. In the prior example, even
though "
@@ -25059,12 +25065,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3120
+#: ../../en/book/ch06-server-configuration.xml:3122
msgid "Groups can also be defined to contain other groups:"
msgstr "组中也可以定义为包含其它的组："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3129
+#: ../../en/book/ch06-server-configuration.xml:3131
msgid ""
"Subversion 1.5 brings another useful feature to the access file syntax: "
"username aliases. Some authentication systems expect and carry
relatively "
@@ -25081,7 +25087,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3153
+#: ../../en/book/ch06-server-configuration.xml:3155
msgid ""
"Once you've defined a set of aliases, you can refer to the users
elsewhere in "
"the access file via their aliases in all the same places you could have "
@@ -25090,7 +25096,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3166
+#: ../../en/book/ch06-server-configuration.xml:3168
msgid ""
"You might also choose to use aliases if your users' usernames change "
"frequently. Doing so allows you to need to update only the aliases
table "
@@ -25099,12 +25105,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:3176
+#: ../../en/book/ch06-server-configuration.xml:3178
msgid "Partial Readability and Checkouts"
msgstr "部分可读性和检出"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:3178
+#: ../../en/book/ch06-server-configuration.xml:3180
#, fuzzy
msgid ""
"If you're using Apache as your Subversion server and have made certain "
@@ -25115,7 +25121,7 @@
"然后你需要知道<command>svn checkout</command>会有一个不理想的执行方式。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:3183
+#: ../../en/book/ch06-server-configuration.xml:3185
#, fuzzy
msgid ""
"When the client requests a checkout or update over HTTP, it makes a
single "
@@ -25142,12 +25148,12 @@
"访问的，则整个检出将不需要认证―再一次，略过不可读的目录，而不会中途要求认
证。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch06-server-configuration.xml:3209
+#: ../../en/book/ch06-server-configuration.xml:3211
msgid "Supporting Multiple Repository Access Methods"
msgstr "支持多种版本库访问方法"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3211
+#: ../../en/book/ch06-server-configuration.xml:3213
#, fuzzy
msgid ""
"You've seen how a repository can be accessed in many different ways. But
is "
@@ -25159,14 +25165,14 @@
"并行的访问你的版本库吗？回答是可以，倘若你有一些深谋远虑的使用。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3216
+#: ../../en/book/ch06-server-configuration.xml:3218
msgid ""
"At any given time, these processes may require read and write access to
your "
"repository:"
msgstr "在任何给定的时间，这些进程会要求读或者写访问你的版本库："
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3221
+#: ../../en/book/ch06-server-configuration.xml:3223
msgid ""
"Regular system users using a Subversion client (as themselves) to access
the "
"repository directly via <literal>file://</literal> URLs"
@@ -25175,7 +25181,7 @@
"literal>URL直接访问版本库"
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3226
+#: ../../en/book/ch06-server-configuration.xml:3228
msgid ""
"Regular system users connecting to SSH-spawned private
<command>svnserve</"
"command> processes (running as themselves), which access the repository"
@@ -25184,7 +25190,7 @@
"像它们自己运行一样)；"
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3231
+#: ../../en/book/ch06-server-configuration.xml:3233
#, fuzzy
msgid ""
"An <command>svnserve</command> process—either a daemon or one
launched "
@@ -25194,13 +25200,13 @@
"command>启动的―作为一个固定的用户运行"
#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3237
+#: ../../en/book/ch06-server-configuration.xml:3239
msgid ""
"An Apache <command>httpd</command> process, running as a particular fixed
user"
msgstr "一个Apache <command>httpd</command>进程，以一个固定用户运行"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3242
+#: ../../en/book/ch06-server-configuration.xml:3244
#, fuzzy
msgid ""
"The most common problem administrators run into is repository ownership
and "
@@ -25219,7 +25225,7 @@
"的用户的访问。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3253
+#: ../../en/book/ch06-server-configuration.xml:3255
#, fuzzy
msgid ""
"So the next step beyond setting up a common group for repository users is
to "
@@ -25239,7 +25245,7 @@
"<filename>apachectl</filename>中。例如："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3274
+#: ../../en/book/ch06-server-configuration.xml:3276
#, fuzzy
msgid ""
"Another common problem is often encountered on Unix-like systems. If
your "
@@ -25259,7 +25265,7 @@
"所有新创建的日志文件拥有同父目录相同的组拥有者。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3286
+#: ../../en/book/ch06-server-configuration.xml:3288
#, fuzzy
msgid ""
"Once you've jumped through these hoops, your repository should be
accessible "
@@ -25272,7 +25278,7 @@
"且经常是没有优雅的解决。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch06-server-configuration.xml:3292
+#: ../../en/book/ch06-server-configuration.xml:3294
#, fuzzy
msgid ""
"Fortunately, most repository administrators will never <emphasis>need</"
@@ -25294,12 +25300,12 @@
"变得超出需要的头痛，我们建议你选择最符合你的需要的版本库，并且坚持使用！"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch06-server-configuration.xml:3306
+#: ../../en/book/ch06-server-configuration.xml:3308
msgid "The svn+ssh:// Server Checklist"
msgstr "svn+ssh 服务器检查列表"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch06-server-configuration.xml:3308
+#: ../../en/book/ch06-server-configuration.xml:3310
#, fuzzy
msgid ""
"It can be quite tricky to get a bunch of users with existing SSH accounts
to "
@@ -25313,24 +25319,24 @@
"快速的检查列表，总结了本小节讨论的事情："
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3317
+#: ../../en/book/ch06-server-configuration.xml:3319
msgid ""
"All of your SSH users need to be able to read and write to the
repository, so "
"put all the SSH users into a single group."
msgstr "所有的SSH用户需要能够读写版本库，把所有的SSH用户放到同一个组里。"
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3323
+#: ../../en/book/ch06-server-configuration.xml:3325
msgid "Make the repository wholly owned by that group."
msgstr "让那个组拥有整个版本库。"
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3327
+#: ../../en/book/ch06-server-configuration.xml:3329
msgid "Set the group permissions to read/write."
msgstr "设置组的访问许可为读/写。"
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3331
+#: ../../en/book/ch06-server-configuration.xml:3333
#, fuzzy
msgid ""
"Your users need to use a sane umask when accessing the repository, so
make "
@@ -25347,7 +25353,7 @@
"使用上面说明的包裹。"
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
-#: ../../en/book/ch06-server-configuration.xml:3339
+#: ../../en/book/ch06-server-configuration.xml:3341
#, fuzzy
msgid ""
"Take similar measures when using <command>svnlook</command> and "
@@ -27241,7 +27247,7 @@
#. type: Content of: <book><chapter><sect1><title>
#: ../../en/book/ch08-embedding-svn.xml:113
-#: ../../en/book/ch09-reference.xml:9116
+#: ../../en/book/ch09-reference.xml:9158
msgid "mod_authz_svn"
msgstr "mod_authz_svn"
@@ -28779,12 +28785,12 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:67 ../../en/book/ch09-reference.xml:7682
+#: ../../en/book/ch09-reference.xml:67 ../../en/book/ch09-reference.xml:7721
msgid "<option>--config-dir</option> <replaceable>DIR</replaceable>"
msgstr "<option>--config-dir</option> <replaceable>DIR</replaceable>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch09-reference.xml:70 ../../en/book/ch09-reference.xml:7685
+#: ../../en/book/ch09-reference.xml:70 ../../en/book/ch09-reference.xml:7724
msgid ""
"Instructs Subversion to read configuration information from the
specified "
"directory instead of the default location
(<filename>.subversion</filename> "
@@ -28794,12 +28800,12 @@
"filename>)读取配置信息。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:78 ../../en/book/ch09-reference.xml:7693
+#: ../../en/book/ch09-reference.xml:78 ../../en/book/ch09-reference.xml:7732
msgid "<option>--no-auth-cache</option>"
msgstr "<option>--no-auth-cache</option>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch09-reference.xml:80 ../../en/book/ch09-reference.xml:7695
+#: ../../en/book/ch09-reference.xml:80 ../../en/book/ch09-reference.xml:7734
#, fuzzy
msgid ""
"Prevents caching of authentication information (e.g., username and
password) "
@@ -28807,7 +28813,7 @@
msgstr "阻止在Subversion管理区缓存认证信息(如用户名密码)。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:87 ../../en/book/ch09-reference.xml:7702
+#: ../../en/book/ch09-reference.xml:87 ../../en/book/ch09-reference.xml:7741
msgid "<option>--non-interactive</option>"
msgstr "<option>--non-interactive</option>"
@@ -29159,7 +29165,7 @@
msgstr "告诉Subversion忽略外部定义和外部定义管理的工作副本。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:343 ../../en/book/ch09-reference.xml:5407
+#: ../../en/book/ch09-reference.xml:343 ../../en/book/ch09-reference.xml:5445
msgid "<option>--incremental</option>"
msgstr "<option>--incremental</option>"
@@ -29249,7 +29255,7 @@
"props</literal>指示。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:407 ../../en/book/ch09-reference.xml:6658
+#: ../../en/book/ch09-reference.xml:407 ../../en/book/ch09-reference.xml:6696
msgid "<option>--no-diff-deleted</option>"
msgstr "<option>--no-diff-deleted</option>"
@@ -29356,12 +29362,13 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:480 ../../en/book/ch09-reference.xml:7714
+#: ../../en/book/ch09-reference.xml:480 ../../en/book/ch09-reference.xml:5491
+#: ../../en/book/ch09-reference.xml:7753
msgid "<option>--quiet</option> (<option>-q</option>)"
msgstr "<option>--quiet</option> (<option>-q</option>)"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch09-reference.xml:482 ../../en/book/ch09-reference.xml:7716
+#: ../../en/book/ch09-reference.xml:482 ../../en/book/ch09-reference.xml:7755
msgid ""
"Requests that the client print only essential information while
performing an "
"operation."
@@ -29463,12 +29470,12 @@
msgstr "见<xref linkend=\"svn.tour.revs.keywords\"/>查看更多信息。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:565 ../../en/book/ch09-reference.xml:6689
+#: ../../en/book/ch09-reference.xml:565 ../../en/book/ch09-reference.xml:6727
msgid "<option>--revprop</option>"
msgstr "<option>--revprop</option>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch09-reference.xml:567 ../../en/book/ch09-reference.xml:6691
+#: ../../en/book/ch09-reference.xml:567 ../../en/book/ch09-reference.xml:6729
#, fuzzy
msgid ""
"Operates on a revision property instead of a property specific to a file
or "
@@ -29595,8 +29602,8 @@
"件的细节信息或者是关于动作的附加信息。"
#. type: Content of:
<book><chapter><sect1><refentry><refsect1><variablelist><varlistentry><term>
-#: ../../en/book/ch09-reference.xml:660 ../../en/book/ch09-reference.xml:8297
-#: ../../en/book/ch09-reference.xml:8639
+#: ../../en/book/ch09-reference.xml:660 ../../en/book/ch09-reference.xml:8339
+#: ../../en/book/ch09-reference.xml:8681
msgid "<option>--version</option>"
msgstr "<option>--version</option>"
@@ -29667,42 +29674,42 @@
#: ../../en/book/ch09-reference.xml:718 ../../en/book/ch09-reference.xml:827
#: ../../en/book/ch09-reference.xml:963 ../../en/book/ch09-reference.xml:1043
#: ../../en/book/ch09-reference.xml:1139 ../../en/book/ch09-reference.xml:1286
-#: ../../en/book/ch09-reference.xml:1363 ../../en/book/ch09-reference.xml:1501
-#: ../../en/book/ch09-reference.xml:1708 ../../en/book/ch09-reference.xml:1821
-#: ../../en/book/ch09-reference.xml:2145 ../../en/book/ch09-reference.xml:2260
-#: ../../en/book/ch09-reference.xml:2307 ../../en/book/ch09-reference.xml:2414
-#: ../../en/book/ch09-reference.xml:2601 ../../en/book/ch09-reference.xml:2742
-#: ../../en/book/ch09-reference.xml:2837 ../../en/book/ch09-reference.xml:3148
-#: ../../en/book/ch09-reference.xml:3294 ../../en/book/ch09-reference.xml:3370
-#: ../../en/book/ch09-reference.xml:3454 ../../en/book/ch09-reference.xml:3583
-#: ../../en/book/ch09-reference.xml:3660 ../../en/book/ch09-reference.xml:3739
-#: ../../en/book/ch09-reference.xml:3838 ../../en/book/ch09-reference.xml:3944
-#: ../../en/book/ch09-reference.xml:4081 ../../en/book/ch09-reference.xml:4212
-#: ../../en/book/ch09-reference.xml:4308 ../../en/book/ch09-reference.xml:4420
-#: ../../en/book/ch09-reference.xml:4863 ../../en/book/ch09-reference.xml:5060
-#: ../../en/book/ch09-reference.xml:5148 ../../en/book/ch09-reference.xml:5512
-#: ../../en/book/ch09-reference.xml:5560 ../../en/book/ch09-reference.xml:5640
-#: ../../en/book/ch09-reference.xml:5680 ../../en/book/ch09-reference.xml:5782
-#: ../../en/book/ch09-reference.xml:5813 ../../en/book/ch09-reference.xml:5865
-#: ../../en/book/ch09-reference.xml:5898 ../../en/book/ch09-reference.xml:5947
-#: ../../en/book/ch09-reference.xml:6014 ../../en/book/ch09-reference.xml:6067
-#: ../../en/book/ch09-reference.xml:6106 ../../en/book/ch09-reference.xml:6137
-#: ../../en/book/ch09-reference.xml:6219 ../../en/book/ch09-reference.xml:6265
-#: ../../en/book/ch09-reference.xml:6320 ../../en/book/ch09-reference.xml:6381
-#: ../../en/book/ch09-reference.xml:6437 ../../en/book/ch09-reference.xml:6491
-#: ../../en/book/ch09-reference.xml:6559 ../../en/book/ch09-reference.xml:6731
-#: ../../en/book/ch09-reference.xml:6777 ../../en/book/ch09-reference.xml:6835
-#: ../../en/book/ch09-reference.xml:6959 ../../en/book/ch09-reference.xml:7005
-#: ../../en/book/ch09-reference.xml:7078 ../../en/book/ch09-reference.xml:7125
-#: ../../en/book/ch09-reference.xml:7162 ../../en/book/ch09-reference.xml:7226
-#: ../../en/book/ch09-reference.xml:7277 ../../en/book/ch09-reference.xml:7329
-#: ../../en/book/ch09-reference.xml:7375 ../../en/book/ch09-reference.xml:7430
-#: ../../en/book/ch09-reference.xml:7496 ../../en/book/ch09-reference.xml:7555
-#: ../../en/book/ch09-reference.xml:7599 ../../en/book/ch09-reference.xml:7788
-#: ../../en/book/ch09-reference.xml:7859 ../../en/book/ch09-reference.xml:7899
-#: ../../en/book/ch09-reference.xml:7961 ../../en/book/ch09-reference.xml:8039
-#: ../../en/book/ch09-reference.xml:8397 ../../en/book/ch09-reference.xml:8460
-#: ../../en/book/ch09-reference.xml:8525
+#: ../../en/book/ch09-reference.xml:1363 ../../en/book/ch09-reference.xml:1502
+#: ../../en/book/ch09-reference.xml:1709 ../../en/book/ch09-reference.xml:1822
+#: ../../en/book/ch09-reference.xml:2146 ../../en/book/ch09-reference.xml:2261
+#: ../../en/book/ch09-reference.xml:2308 ../../en/book/ch09-reference.xml:2415
+#: ../../en/book/ch09-reference.xml:2602 ../../en/book/ch09-reference.xml:2744
+#: ../../en/book/ch09-reference.xml:2839 ../../en/book/ch09-reference.xml:3155
+#: ../../en/book/ch09-reference.xml:3301 ../../en/book/ch09-reference.xml:3377
+#: ../../en/book/ch09-reference.xml:3461 ../../en/book/ch09-reference.xml:3590
+#: ../../en/book/ch09-reference.xml:3667 ../../en/book/ch09-reference.xml:3746
+#: ../../en/book/ch09-reference.xml:3845 ../../en/book/ch09-reference.xml:3952
+#: ../../en/book/ch09-reference.xml:4089 ../../en/book/ch09-reference.xml:4220
+#: ../../en/book/ch09-reference.xml:4316 ../../en/book/ch09-reference.xml:4428
+#: ../../en/book/ch09-reference.xml:4901 ../../en/book/ch09-reference.xml:5098
+#: ../../en/book/ch09-reference.xml:5186 ../../en/book/ch09-reference.xml:5550
+#: ../../en/book/ch09-reference.xml:5598 ../../en/book/ch09-reference.xml:5678
+#: ../../en/book/ch09-reference.xml:5718 ../../en/book/ch09-reference.xml:5820
+#: ../../en/book/ch09-reference.xml:5851 ../../en/book/ch09-reference.xml:5903
+#: ../../en/book/ch09-reference.xml:5936 ../../en/book/ch09-reference.xml:5985
+#: ../../en/book/ch09-reference.xml:6052 ../../en/book/ch09-reference.xml:6105
+#: ../../en/book/ch09-reference.xml:6144 ../../en/book/ch09-reference.xml:6175
+#: ../../en/book/ch09-reference.xml:6257 ../../en/book/ch09-reference.xml:6303
+#: ../../en/book/ch09-reference.xml:6358 ../../en/book/ch09-reference.xml:6419
+#: ../../en/book/ch09-reference.xml:6475 ../../en/book/ch09-reference.xml:6529
+#: ../../en/book/ch09-reference.xml:6597 ../../en/book/ch09-reference.xml:6769
+#: ../../en/book/ch09-reference.xml:6815 ../../en/book/ch09-reference.xml:6873
+#: ../../en/book/ch09-reference.xml:6997 ../../en/book/ch09-reference.xml:7043
+#: ../../en/book/ch09-reference.xml:7116 ../../en/book/ch09-reference.xml:7163
+#: ../../en/book/ch09-reference.xml:7200 ../../en/book/ch09-reference.xml:7264
+#: ../../en/book/ch09-reference.xml:7315 ../../en/book/ch09-reference.xml:7367
+#: ../../en/book/ch09-reference.xml:7413 ../../en/book/ch09-reference.xml:7468
+#: ../../en/book/ch09-reference.xml:7535 ../../en/book/ch09-reference.xml:7594
+#: ../../en/book/ch09-reference.xml:7638 ../../en/book/ch09-reference.xml:7827
+#: ../../en/book/ch09-reference.xml:7898 ../../en/book/ch09-reference.xml:7938
+#: ../../en/book/ch09-reference.xml:8000 ../../en/book/ch09-reference.xml:8078
+#: ../../en/book/ch09-reference.xml:8439 ../../en/book/ch09-reference.xml:8502
+#: ../../en/book/ch09-reference.xml:8567
msgid "subcommands"
msgstr "子命令"
@@ -29710,46 +29717,46 @@
#: ../../en/book/ch09-reference.xml:719 ../../en/book/ch09-reference.xml:828
#: ../../en/book/ch09-reference.xml:964 ../../en/book/ch09-reference.xml:1044
#: ../../en/book/ch09-reference.xml:1140 ../../en/book/ch09-reference.xml:1287
-#: ../../en/book/ch09-reference.xml:1364 ../../en/book/ch09-reference.xml:1502
-#: ../../en/book/ch09-reference.xml:1709 ../../en/book/ch09-reference.xml:1822
-#: ../../en/book/ch09-reference.xml:2146 ../../en/book/ch09-reference.xml:2261
-#: ../../en/book/ch09-reference.xml:2308 ../../en/book/ch09-reference.xml:2415
-#: ../../en/book/ch09-reference.xml:2602 ../../en/book/ch09-reference.xml:2743
-#: ../../en/book/ch09-reference.xml:2838 ../../en/book/ch09-reference.xml:3149
-#: ../../en/book/ch09-reference.xml:3295 ../../en/book/ch09-reference.xml:3371
-#: ../../en/book/ch09-reference.xml:3455 ../../en/book/ch09-reference.xml:3584
-#: ../../en/book/ch09-reference.xml:3661 ../../en/book/ch09-reference.xml:3740
-#: ../../en/book/ch09-reference.xml:3839 ../../en/book/ch09-reference.xml:3945
-#: ../../en/book/ch09-reference.xml:4082 ../../en/book/ch09-reference.xml:4213
-#: ../../en/book/ch09-reference.xml:4309 ../../en/book/ch09-reference.xml:4421
-#: ../../en/book/ch09-reference.xml:4864 ../../en/book/ch09-reference.xml:5061
-#: ../../en/book/ch09-reference.xml:5149 ../../en/book/ch09-reference.xml:5513
-#: ../../en/book/ch09-reference.xml:5561 ../../en/book/ch09-reference.xml:5641
-#: ../../en/book/ch09-reference.xml:5681 ../../en/book/ch09-reference.xml:5783
-#: ../../en/book/ch09-reference.xml:5814 ../../en/book/ch09-reference.xml:5866
-#: ../../en/book/ch09-reference.xml:5899 ../../en/book/ch09-reference.xml:5948
-#: ../../en/book/ch09-reference.xml:6015 ../../en/book/ch09-reference.xml:6068
-#: ../../en/book/ch09-reference.xml:6107 ../../en/book/ch09-reference.xml:6138
-#: ../../en/book/ch09-reference.xml:6220 ../../en/book/ch09-reference.xml:6266
-#: ../../en/book/ch09-reference.xml:6321 ../../en/book/ch09-reference.xml:6382
-#: ../../en/book/ch09-reference.xml:6438 ../../en/book/ch09-reference.xml:6492
-#: ../../en/book/ch09-reference.xml:6560 ../../en/book/ch09-reference.xml:6732
-#: ../../en/book/ch09-reference.xml:6778 ../../en/book/ch09-reference.xml:6836
-#: ../../en/book/ch09-reference.xml:6960 ../../en/book/ch09-reference.xml:7006
-#: ../../en/book/ch09-reference.xml:7079 ../../en/book/ch09-reference.xml:7126
-#: ../../en/book/ch09-reference.xml:7163 ../../en/book/ch09-reference.xml:7227
-#: ../../en/book/ch09-reference.xml:7278 ../../en/book/ch09-reference.xml:7330
-#: ../../en/book/ch09-reference.xml:7376 ../../en/book/ch09-reference.xml:7431
-#: ../../en/book/ch09-reference.xml:7497 ../../en/book/ch09-reference.xml:7556
-#: ../../en/book/ch09-reference.xml:7600 ../../en/book/ch09-reference.xml:7789
-#: ../../en/book/ch09-reference.xml:7860 ../../en/book/ch09-reference.xml:7900
-#: ../../en/book/ch09-reference.xml:7962 ../../en/book/ch09-reference.xml:8040
-#: ../../en/book/ch09-reference.xml:8398 ../../en/book/ch09-reference.xml:8461
-#: ../../en/book/ch09-reference.xml:8526 ../../en/book/ch09-reference.xml:9425
-#: ../../en/book/ch09-reference.xml:9488 ../../en/book/ch09-reference.xml:9543
-#: ../../en/book/ch09-reference.xml:9599 ../../en/book/ch09-reference.xml:9671
-#: ../../en/book/ch09-reference.xml:9746 ../../en/book/ch09-reference.xml:9805
-#: ../../en/book/ch09-reference.xml:9863 ../../en/book/ch09-reference.xml:9923
+#: ../../en/book/ch09-reference.xml:1364 ../../en/book/ch09-reference.xml:1503
+#: ../../en/book/ch09-reference.xml:1710 ../../en/book/ch09-reference.xml:1823
+#: ../../en/book/ch09-reference.xml:2147 ../../en/book/ch09-reference.xml:2262
+#: ../../en/book/ch09-reference.xml:2309 ../../en/book/ch09-reference.xml:2416
+#: ../../en/book/ch09-reference.xml:2603 ../../en/book/ch09-reference.xml:2745
+#: ../../en/book/ch09-reference.xml:2840 ../../en/book/ch09-reference.xml:3156
+#: ../../en/book/ch09-reference.xml:3302 ../../en/book/ch09-reference.xml:3378
+#: ../../en/book/ch09-reference.xml:3462 ../../en/book/ch09-reference.xml:3591
+#: ../../en/book/ch09-reference.xml:3668 ../../en/book/ch09-reference.xml:3747
+#: ../../en/book/ch09-reference.xml:3846 ../../en/book/ch09-reference.xml:3953
+#: ../../en/book/ch09-reference.xml:4090 ../../en/book/ch09-reference.xml:4221
+#: ../../en/book/ch09-reference.xml:4317 ../../en/book/ch09-reference.xml:4429
+#: ../../en/book/ch09-reference.xml:4902 ../../en/book/ch09-reference.xml:5099
+#: ../../en/book/ch09-reference.xml:5187 ../../en/book/ch09-reference.xml:5551
+#: ../../en/book/ch09-reference.xml:5599 ../../en/book/ch09-reference.xml:5679
+#: ../../en/book/ch09-reference.xml:5719 ../../en/book/ch09-reference.xml:5821
+#: ../../en/book/ch09-reference.xml:5852 ../../en/book/ch09-reference.xml:5904
+#: ../../en/book/ch09-reference.xml:5937 ../../en/book/ch09-reference.xml:5986
+#: ../../en/book/ch09-reference.xml:6053 ../../en/book/ch09-reference.xml:6106
+#: ../../en/book/ch09-reference.xml:6145 ../../en/book/ch09-reference.xml:6176
+#: ../../en/book/ch09-reference.xml:6258 ../../en/book/ch09-reference.xml:6304
+#: ../../en/book/ch09-reference.xml:6359 ../../en/book/ch09-reference.xml:6420
+#: ../../en/book/ch09-reference.xml:6476 ../../en/book/ch09-reference.xml:6530
+#: ../../en/book/ch09-reference.xml:6598 ../../en/book/ch09-reference.xml:6770
+#: ../../en/book/ch09-reference.xml:6816 ../../en/book/ch09-reference.xml:6874
+#: ../../en/book/ch09-reference.xml:6998 ../../en/book/ch09-reference.xml:7044
+#: ../../en/book/ch09-reference.xml:7117 ../../en/book/ch09-reference.xml:7164
+#: ../../en/book/ch09-reference.xml:7201 ../../en/book/ch09-reference.xml:7265
+#: ../../en/book/ch09-reference.xml:7316 ../../en/book/ch09-reference.xml:7368
+#: ../../en/book/ch09-reference.xml:7414 ../../en/book/ch09-reference.xml:7469
+#: ../../en/book/ch09-reference.xml:7536 ../../en/book/ch09-reference.xml:7595
+#: ../../en/book/ch09-reference.xml:7639 ../../en/book/ch09-reference.xml:7828
+#: ../../en/book/ch09-reference.xml:7899 ../../en/book/ch09-reference.xml:7939
+#: ../../en/book/ch09-reference.xml:8001 ../../en/book/ch09-reference.xml:8079
+#: ../../en/book/ch09-reference.xml:8440 ../../en/book/ch09-reference.xml:8503
+#: ../../en/book/ch09-reference.xml:8568 ../../en/book/ch09-reference.xml:9467
+#: ../../en/book/ch09-reference.xml:9530 ../../en/book/ch09-reference.xml:9585
+#: ../../en/book/ch09-reference.xml:9641 ../../en/book/ch09-reference.xml:9713
+#: ../../en/book/ch09-reference.xml:9788 ../../en/book/ch09-reference.xml:9847
+#: ../../en/book/ch09-reference.xml:9905 ../../en/book/ch09-reference.xml:9965
msgid "<placeholder type=\"tertiary\" id=\"0\"/>"
msgstr "<placeholder type=\"tertiary\" id=\"0\"/>"
@@ -29772,42 +29779,42 @@
#: ../../en/book/ch09-reference.xml:728 ../../en/book/ch09-reference.xml:837
#: ../../en/book/ch09-reference.xml:973 ../../en/book/ch09-reference.xml:1053
#: ../../en/book/ch09-reference.xml:1148 ../../en/book/ch09-reference.xml:1295
-#: ../../en/book/ch09-reference.xml:1372 ../../en/book/ch09-reference.xml:1512
-#: ../../en/book/ch09-reference.xml:1718 ../../en/book/ch09-reference.xml:1830
-#: ../../en/book/ch09-reference.xml:2154 ../../en/book/ch09-reference.xml:2269
-#: ../../en/book/ch09-reference.xml:2317 ../../en/book/ch09-reference.xml:2424
-#: ../../en/book/ch09-reference.xml:2610 ../../en/book/ch09-reference.xml:2753
-#: ../../en/book/ch09-reference.xml:2846 ../../en/book/ch09-reference.xml:3158
-#: ../../en/book/ch09-reference.xml:3305 ../../en/book/ch09-reference.xml:3379
-#: ../../en/book/ch09-reference.xml:3463 ../../en/book/ch09-reference.xml:3592
-#: ../../en/book/ch09-reference.xml:3671 ../../en/book/ch09-reference.xml:3748
-#: ../../en/book/ch09-reference.xml:3847 ../../en/book/ch09-reference.xml:3953
-#: ../../en/book/ch09-reference.xml:4091 ../../en/book/ch09-reference.xml:4223
-#: ../../en/book/ch09-reference.xml:4317 ../../en/book/ch09-reference.xml:4429
-#: ../../en/book/ch09-reference.xml:4872 ../../en/book/ch09-reference.xml:5069
-#: ../../en/book/ch09-reference.xml:5157 ../../en/book/ch09-reference.xml:5521
-#: ../../en/book/ch09-reference.xml:5569 ../../en/book/ch09-reference.xml:5649
-#: ../../en/book/ch09-reference.xml:5689 ../../en/book/ch09-reference.xml:5790
-#: ../../en/book/ch09-reference.xml:5822 ../../en/book/ch09-reference.xml:5876
-#: ../../en/book/ch09-reference.xml:5909 ../../en/book/ch09-reference.xml:5957
-#: ../../en/book/ch09-reference.xml:6023 ../../en/book/ch09-reference.xml:6076
-#: ../../en/book/ch09-reference.xml:6116 ../../en/book/ch09-reference.xml:6152
-#: ../../en/book/ch09-reference.xml:6229 ../../en/book/ch09-reference.xml:6274
-#: ../../en/book/ch09-reference.xml:6329 ../../en/book/ch09-reference.xml:6390
-#: ../../en/book/ch09-reference.xml:6446 ../../en/book/ch09-reference.xml:6501
-#: ../../en/book/ch09-reference.xml:6568 ../../en/book/ch09-reference.xml:6740
-#: ../../en/book/ch09-reference.xml:6786 ../../en/book/ch09-reference.xml:6844
-#: ../../en/book/ch09-reference.xml:6968 ../../en/book/ch09-reference.xml:7014
-#: ../../en/book/ch09-reference.xml:7087 ../../en/book/ch09-reference.xml:7133
-#: ../../en/book/ch09-reference.xml:7173 ../../en/book/ch09-reference.xml:7236
-#: ../../en/book/ch09-reference.xml:7287 ../../en/book/ch09-reference.xml:7339
-#: ../../en/book/ch09-reference.xml:7385 ../../en/book/ch09-reference.xml:7440
-#: ../../en/book/ch09-reference.xml:7505 ../../en/book/ch09-reference.xml:7565
-#: ../../en/book/ch09-reference.xml:7608 ../../en/book/ch09-reference.xml:7799
-#: ../../en/book/ch09-reference.xml:7868 ../../en/book/ch09-reference.xml:7909
-#: ../../en/book/ch09-reference.xml:7971 ../../en/book/ch09-reference.xml:8049
-#: ../../en/book/ch09-reference.xml:8406 ../../en/book/ch09-reference.xml:8470
-#: ../../en/book/ch09-reference.xml:8534 ../../en/book/ch09-reference.xml:8577
+#: ../../en/book/ch09-reference.xml:1372 ../../en/book/ch09-reference.xml:1513
+#: ../../en/book/ch09-reference.xml:1719 ../../en/book/ch09-reference.xml:1831
+#: ../../en/book/ch09-reference.xml:2155 ../../en/book/ch09-reference.xml:2270
+#: ../../en/book/ch09-reference.xml:2318 ../../en/book/ch09-reference.xml:2425
+#: ../../en/book/ch09-reference.xml:2611 ../../en/book/ch09-reference.xml:2755
+#: ../../en/book/ch09-reference.xml:2848 ../../en/book/ch09-reference.xml:3165
+#: ../../en/book/ch09-reference.xml:3312 ../../en/book/ch09-reference.xml:3386
+#: ../../en/book/ch09-reference.xml:3470 ../../en/book/ch09-reference.xml:3599
+#: ../../en/book/ch09-reference.xml:3678 ../../en/book/ch09-reference.xml:3755
+#: ../../en/book/ch09-reference.xml:3854 ../../en/book/ch09-reference.xml:3961
+#: ../../en/book/ch09-reference.xml:4099 ../../en/book/ch09-reference.xml:4231
+#: ../../en/book/ch09-reference.xml:4325 ../../en/book/ch09-reference.xml:4437
+#: ../../en/book/ch09-reference.xml:4910 ../../en/book/ch09-reference.xml:5107
+#: ../../en/book/ch09-reference.xml:5195 ../../en/book/ch09-reference.xml:5559
+#: ../../en/book/ch09-reference.xml:5607 ../../en/book/ch09-reference.xml:5687
+#: ../../en/book/ch09-reference.xml:5727 ../../en/book/ch09-reference.xml:5828
+#: ../../en/book/ch09-reference.xml:5860 ../../en/book/ch09-reference.xml:5914
+#: ../../en/book/ch09-reference.xml:5947 ../../en/book/ch09-reference.xml:5995
+#: ../../en/book/ch09-reference.xml:6061 ../../en/book/ch09-reference.xml:6114
+#: ../../en/book/ch09-reference.xml:6154 ../../en/book/ch09-reference.xml:6190
+#: ../../en/book/ch09-reference.xml:6267 ../../en/book/ch09-reference.xml:6312
+#: ../../en/book/ch09-reference.xml:6367 ../../en/book/ch09-reference.xml:6428
+#: ../../en/book/ch09-reference.xml:6484 ../../en/book/ch09-reference.xml:6539
+#: ../../en/book/ch09-reference.xml:6606 ../../en/book/ch09-reference.xml:6778
+#: ../../en/book/ch09-reference.xml:6824 ../../en/book/ch09-reference.xml:6882
+#: ../../en/book/ch09-reference.xml:7006 ../../en/book/ch09-reference.xml:7052
+#: ../../en/book/ch09-reference.xml:7125 ../../en/book/ch09-reference.xml:7171
+#: ../../en/book/ch09-reference.xml:7211 ../../en/book/ch09-reference.xml:7274
+#: ../../en/book/ch09-reference.xml:7325 ../../en/book/ch09-reference.xml:7377
+#: ../../en/book/ch09-reference.xml:7423 ../../en/book/ch09-reference.xml:7478
+#: ../../en/book/ch09-reference.xml:7544 ../../en/book/ch09-reference.xml:7604
+#: ../../en/book/ch09-reference.xml:7647 ../../en/book/ch09-reference.xml:7838
+#: ../../en/book/ch09-reference.xml:7907 ../../en/book/ch09-reference.xml:7948
+#: ../../en/book/ch09-reference.xml:8010 ../../en/book/ch09-reference.xml:8088
+#: ../../en/book/ch09-reference.xml:8448 ../../en/book/ch09-reference.xml:8512
+#: ../../en/book/ch09-reference.xml:8576 ../../en/book/ch09-reference.xml:8619
msgid "Synopsis"
msgstr "概要"
@@ -29829,42 +29836,42 @@
#: ../../en/book/ch09-reference.xml:744 ../../en/book/ch09-reference.xml:850
#: ../../en/book/ch09-reference.xml:985 ../../en/book/ch09-reference.xml:1068
#: ../../en/book/ch09-reference.xml:1165 ../../en/book/ch09-reference.xml:1319
-#: ../../en/book/ch09-reference.xml:1407 ../../en/book/ch09-reference.xml:1580
-#: ../../en/book/ch09-reference.xml:1740 ../../en/book/ch09-reference.xml:1970
-#: ../../en/book/ch09-reference.xml:2179 ../../en/book/ch09-reference.xml:2280
-#: ../../en/book/ch09-reference.xml:2335 ../../en/book/ch09-reference.xml:2469
-#: ../../en/book/ch09-reference.xml:2654 ../../en/book/ch09-reference.xml:2769
-#: ../../en/book/ch09-reference.xml:2883 ../../en/book/ch09-reference.xml:3220
-#: ../../en/book/ch09-reference.xml:3324 ../../en/book/ch09-reference.xml:3399
-#: ../../en/book/ch09-reference.xml:3511 ../../en/book/ch09-reference.xml:3608
-#: ../../en/book/ch09-reference.xml:3687 ../../en/book/ch09-reference.xml:3765
-#: ../../en/book/ch09-reference.xml:3863 ../../en/book/ch09-reference.xml:3979
-#: ../../en/book/ch09-reference.xml:4159 ../../en/book/ch09-reference.xml:4245
-#: ../../en/book/ch09-reference.xml:4334 ../../en/book/ch09-reference.xml:4735
-#: ../../en/book/ch09-reference.xml:4927 ../../en/book/ch09-reference.xml:5086
-#: ../../en/book/ch09-reference.xml:5247 ../../en/book/ch09-reference.xml:5803
-#: ../../en/book/ch09-reference.xml:7152 ../../en/book/ch09-reference.xml:7397
-#: ../../en/book/ch09-reference.xml:7452 ../../en/book/ch09-reference.xml:7921
+#: ../../en/book/ch09-reference.xml:1408 ../../en/book/ch09-reference.xml:1581
+#: ../../en/book/ch09-reference.xml:1741 ../../en/book/ch09-reference.xml:1971
+#: ../../en/book/ch09-reference.xml:2180 ../../en/book/ch09-reference.xml:2281
+#: ../../en/book/ch09-reference.xml:2336 ../../en/book/ch09-reference.xml:2470
+#: ../../en/book/ch09-reference.xml:2655 ../../en/book/ch09-reference.xml:2771
+#: ../../en/book/ch09-reference.xml:2888 ../../en/book/ch09-reference.xml:3227
+#: ../../en/book/ch09-reference.xml:3331 ../../en/book/ch09-reference.xml:3406
+#: ../../en/book/ch09-reference.xml:3518 ../../en/book/ch09-reference.xml:3615
+#: ../../en/book/ch09-reference.xml:3694 ../../en/book/ch09-reference.xml:3772
+#: ../../en/book/ch09-reference.xml:3870 ../../en/book/ch09-reference.xml:3987
+#: ../../en/book/ch09-reference.xml:4167 ../../en/book/ch09-reference.xml:4253
+#: ../../en/book/ch09-reference.xml:4342 ../../en/book/ch09-reference.xml:4770
+#: ../../en/book/ch09-reference.xml:4965 ../../en/book/ch09-reference.xml:5124
+#: ../../en/book/ch09-reference.xml:5285 ../../en/book/ch09-reference.xml:5841
+#: ../../en/book/ch09-reference.xml:7190 ../../en/book/ch09-reference.xml:7435
+#: ../../en/book/ch09-reference.xml:7491 ../../en/book/ch09-reference.xml:7960
msgid "Alternate names"
msgstr "别名"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
#: ../../en/book/ch09-reference.xml:745 ../../en/book/ch09-reference.xml:986
-#: ../../en/book/ch09-reference.xml:1320 ../../en/book/ch09-reference.xml:2180
-#: ../../en/book/ch09-reference.xml:2299 ../../en/book/ch09-reference.xml:2336
-#: ../../en/book/ch09-reference.xml:2470 ../../en/book/ch09-reference.xml:2770
-#: ../../en/book/ch09-reference.xml:2884 ../../en/book/ch09-reference.xml:3221
-#: ../../en/book/ch09-reference.xml:3325 ../../en/book/ch09-reference.xml:3400
-#: ../../en/book/ch09-reference.xml:4160 ../../en/book/ch09-reference.xml:4246
-#: ../../en/book/ch09-reference.xml:4335 ../../en/book/ch09-reference.xml:5087
-#: ../../en/book/ch09-reference.xml:5539 ../../en/book/ch09-reference.xml:6041
-#: ../../en/book/ch09-reference.xml:6128 ../../en/book/ch09-reference.xml:6241
-#: ../../en/book/ch09-reference.xml:6463 ../../en/book/ch09-reference.xml:6532
-#: ../../en/book/ch09-reference.xml:7148 ../../en/book/ch09-reference.xml:7302
-#: ../../en/book/ch09-reference.xml:7581 ../../en/book/ch09-reference.xml:7619
-#: ../../en/book/ch09-reference.xml:7822 ../../en/book/ch09-reference.xml:7885
-#: ../../en/book/ch09-reference.xml:7890 ../../en/book/ch09-reference.xml:7922
-#: ../../en/book/ch09-reference.xml:8549
+#: ../../en/book/ch09-reference.xml:1320 ../../en/book/ch09-reference.xml:2181
+#: ../../en/book/ch09-reference.xml:2300 ../../en/book/ch09-reference.xml:2337
+#: ../../en/book/ch09-reference.xml:2471 ../../en/book/ch09-reference.xml:2772
+#: ../../en/book/ch09-reference.xml:2889 ../../en/book/ch09-reference.xml:3228
+#: ../../en/book/ch09-reference.xml:3332 ../../en/book/ch09-reference.xml:3407
+#: ../../en/book/ch09-reference.xml:4168 ../../en/book/ch09-reference.xml:4254
+#: ../../en/book/ch09-reference.xml:4343 ../../en/book/ch09-reference.xml:5125
+#: ../../en/book/ch09-reference.xml:5577 ../../en/book/ch09-reference.xml:6079
+#: ../../en/book/ch09-reference.xml:6166 ../../en/book/ch09-reference.xml:6279
+#: ../../en/book/ch09-reference.xml:6501 ../../en/book/ch09-reference.xml:6570
+#: ../../en/book/ch09-reference.xml:7186 ../../en/book/ch09-reference.xml:7340
+#: ../../en/book/ch09-reference.xml:7620 ../../en/book/ch09-reference.xml:7658
+#: ../../en/book/ch09-reference.xml:7861 ../../en/book/ch09-reference.xml:7924
+#: ../../en/book/ch09-reference.xml:7929 ../../en/book/ch09-reference.xml:7961
+#: ../../en/book/ch09-reference.xml:8591
msgid "None"
msgstr "无"
@@ -29872,29 +29879,29 @@
#: ../../en/book/ch09-reference.xml:749 ../../en/book/ch09-reference.xml:855
#: ../../en/book/ch09-reference.xml:990 ../../en/book/ch09-reference.xml:1073
#: ../../en/book/ch09-reference.xml:1170 ../../en/book/ch09-reference.xml:1324
-#: ../../en/book/ch09-reference.xml:1414 ../../en/book/ch09-reference.xml:1585
-#: ../../en/book/ch09-reference.xml:1745 ../../en/book/ch09-reference.xml:1975
-#: ../../en/book/ch09-reference.xml:2184 ../../en/book/ch09-reference.xml:2288
-#: ../../en/book/ch09-reference.xml:2340 ../../en/book/ch09-reference.xml:2474
-#: ../../en/book/ch09-reference.xml:2659 ../../en/book/ch09-reference.xml:2774
-#: ../../en/book/ch09-reference.xml:2888 ../../en/book/ch09-reference.xml:3225
-#: ../../en/book/ch09-reference.xml:3329 ../../en/book/ch09-reference.xml:3404
-#: ../../en/book/ch09-reference.xml:3516 ../../en/book/ch09-reference.xml:3613
-#: ../../en/book/ch09-reference.xml:3692 ../../en/book/ch09-reference.xml:3770
-#: ../../en/book/ch09-reference.xml:3868 ../../en/book/ch09-reference.xml:3984
-#: ../../en/book/ch09-reference.xml:4164 ../../en/book/ch09-reference.xml:4250
-#: ../../en/book/ch09-reference.xml:4339 ../../en/book/ch09-reference.xml:4740
-#: ../../en/book/ch09-reference.xml:4932 ../../en/book/ch09-reference.xml:5091
-#: ../../en/book/ch09-reference.xml:5252
+#: ../../en/book/ch09-reference.xml:1415 ../../en/book/ch09-reference.xml:1586
+#: ../../en/book/ch09-reference.xml:1746 ../../en/book/ch09-reference.xml:1976
+#: ../../en/book/ch09-reference.xml:2185 ../../en/book/ch09-reference.xml:2289
+#: ../../en/book/ch09-reference.xml:2341 ../../en/book/ch09-reference.xml:2475
+#: ../../en/book/ch09-reference.xml:2660 ../../en/book/ch09-reference.xml:2776
+#: ../../en/book/ch09-reference.xml:2893 ../../en/book/ch09-reference.xml:3232
+#: ../../en/book/ch09-reference.xml:3336 ../../en/book/ch09-reference.xml:3411
+#: ../../en/book/ch09-reference.xml:3523 ../../en/book/ch09-reference.xml:3620
+#: ../../en/book/ch09-reference.xml:3699 ../../en/book/ch09-reference.xml:3777
+#: ../../en/book/ch09-reference.xml:3875 ../../en/book/ch09-reference.xml:3992
+#: ../../en/book/ch09-reference.xml:4172 ../../en/book/ch09-reference.xml:4258
+#: ../../en/book/ch09-reference.xml:4347 ../../en/book/ch09-reference.xml:4775
+#: ../../en/book/ch09-reference.xml:4970 ../../en/book/ch09-reference.xml:5129
+#: ../../en/book/ch09-reference.xml:5290
msgid "Changes"
msgstr "改变"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
#: ../../en/book/ch09-reference.xml:750 ../../en/book/ch09-reference.xml:1074
-#: ../../en/book/ch09-reference.xml:1325 ../../en/book/ch09-reference.xml:3226
-#: ../../en/book/ch09-reference.xml:4165 ../../en/book/ch09-reference.xml:4251
-#: ../../en/book/ch09-reference.xml:4340 ../../en/book/ch09-reference.xml:4933
-#: ../../en/book/ch09-reference.xml:5253
+#: ../../en/book/ch09-reference.xml:1325 ../../en/book/ch09-reference.xml:3233
+#: ../../en/book/ch09-reference.xml:4173 ../../en/book/ch09-reference.xml:4259
+#: ../../en/book/ch09-reference.xml:4348 ../../en/book/ch09-reference.xml:4971
+#: ../../en/book/ch09-reference.xml:5291
msgid "Working copy"
msgstr "工作副本2"
@@ -29902,20 +29909,20 @@
#: ../../en/book/ch09-reference.xml:754 ../../en/book/ch09-reference.xml:860
#: ../../en/book/ch09-reference.xml:995 ../../en/book/ch09-reference.xml:1078
#: ../../en/book/ch09-reference.xml:1175 ../../en/book/ch09-reference.xml:1329
-#: ../../en/book/ch09-reference.xml:1419 ../../en/book/ch09-reference.xml:1590
-#: ../../en/book/ch09-reference.xml:1751 ../../en/book/ch09-reference.xml:1980
-#: ../../en/book/ch09-reference.xml:2189 ../../en/book/ch09-reference.xml:2293
-#: ../../en/book/ch09-reference.xml:2345 ../../en/book/ch09-reference.xml:2479
-#: ../../en/book/ch09-reference.xml:2664 ../../en/book/ch09-reference.xml:2779
-#: ../../en/book/ch09-reference.xml:2893 ../../en/book/ch09-reference.xml:3230
-#: ../../en/book/ch09-reference.xml:3334 ../../en/book/ch09-reference.xml:3409
-#: ../../en/book/ch09-reference.xml:3521 ../../en/book/ch09-reference.xml:3618
-#: ../../en/book/ch09-reference.xml:3697 ../../en/book/ch09-reference.xml:3775
-#: ../../en/book/ch09-reference.xml:3873 ../../en/book/ch09-reference.xml:3989
-#: ../../en/book/ch09-reference.xml:4169 ../../en/book/ch09-reference.xml:4255
-#: ../../en/book/ch09-reference.xml:4344 ../../en/book/ch09-reference.xml:4745
-#: ../../en/book/ch09-reference.xml:4937 ../../en/book/ch09-reference.xml:5096
-#: ../../en/book/ch09-reference.xml:5257
+#: ../../en/book/ch09-reference.xml:1420 ../../en/book/ch09-reference.xml:1591
+#: ../../en/book/ch09-reference.xml:1752 ../../en/book/ch09-reference.xml:1981
+#: ../../en/book/ch09-reference.xml:2190 ../../en/book/ch09-reference.xml:2294
+#: ../../en/book/ch09-reference.xml:2346 ../../en/book/ch09-reference.xml:2480
+#: ../../en/book/ch09-reference.xml:2665 ../../en/book/ch09-reference.xml:2781
+#: ../../en/book/ch09-reference.xml:2898 ../../en/book/ch09-reference.xml:3237
+#: ../../en/book/ch09-reference.xml:3341 ../../en/book/ch09-reference.xml:3416
+#: ../../en/book/ch09-reference.xml:3528 ../../en/book/ch09-reference.xml:3625
+#: ../../en/book/ch09-reference.xml:3704 ../../en/book/ch09-reference.xml:3782
+#: ../../en/book/ch09-reference.xml:3880 ../../en/book/ch09-reference.xml:3997
+#: ../../en/book/ch09-reference.xml:4177 ../../en/book/ch09-reference.xml:4263
+#: ../../en/book/ch09-reference.xml:4352 ../../en/book/ch09-reference.xml:4780
+#: ../../en/book/ch09-reference.xml:4975 ../../en/book/ch09-reference.xml:5134
+#: ../../en/book/ch09-reference.xml:5295
msgid "Accesses repository"
msgstr "访问版本库"
@@ -29923,77 +29930,77 @@
#: ../../en/book/ch09-reference.xml:759 ../../en/book/ch09-reference.xml:865
#: ../../en/book/ch09-reference.xml:1000 ../../en/book/ch09-reference.xml:1083
#: ../../en/book/ch09-reference.xml:1180 ../../en/book/ch09-reference.xml:1334
-#: ../../en/book/ch09-reference.xml:1424 ../../en/book/ch09-reference.xml:1596
-#: ../../en/book/ch09-reference.xml:1756 ../../en/book/ch09-reference.xml:1986
-#: ../../en/book/ch09-reference.xml:2194 ../../en/book/ch09-reference.xml:2298
-#: ../../en/book/ch09-reference.xml:2350 ../../en/book/ch09-reference.xml:2484
-#: ../../en/book/ch09-reference.xml:2669 ../../en/book/ch09-reference.xml:2784
-#: ../../en/book/ch09-reference.xml:2898 ../../en/book/ch09-reference.xml:3235
-#: ../../en/book/ch09-reference.xml:3339 ../../en/book/ch09-reference.xml:3414
-#: ../../en/book/ch09-reference.xml:3526 ../../en/book/ch09-reference.xml:3623
-#: ../../en/book/ch09-reference.xml:3702 ../../en/book/ch09-reference.xml:3780
-#: ../../en/book/ch09-reference.xml:3878 ../../en/book/ch09-reference.xml:3994
-#: ../../en/book/ch09-reference.xml:4174 ../../en/book/ch09-reference.xml:4260
-#: ../../en/book/ch09-reference.xml:4349 ../../en/book/ch09-reference.xml:4750
-#: ../../en/book/ch09-reference.xml:4942 ../../en/book/ch09-reference.xml:5101
-#: ../../en/book/ch09-reference.xml:5262 ../../en/book/ch09-reference.xml:5537
-#: ../../en/book/ch09-reference.xml:5601 ../../en/book/ch09-reference.xml:5667
-#: ../../en/book/ch09-reference.xml:5744 ../../en/book/ch09-reference.xml:5842
-#: ../../en/book/ch09-reference.xml:5969 ../../en/book/ch09-reference.xml:6039
-#: ../../en/book/ch09-reference.xml:6127 ../../en/book/ch09-reference.xml:6162
-#: ../../en/book/ch09-reference.xml:6239 ../../en/book/ch09-reference.xml:6286
-#: ../../en/book/ch09-reference.xml:6356 ../../en/book/ch09-reference.xml:6407
-#: ../../en/book/ch09-reference.xml:6461 ../../en/book/ch09-reference.xml:6530
-#: ../../en/book/ch09-reference.xml:6589 ../../en/book/ch09-reference.xml:6751
-#: ../../en/book/ch09-reference.xml:6797 ../../en/book/ch09-reference.xml:6902
-#: ../../en/book/ch09-reference.xml:6979 ../../en/book/ch09-reference.xml:7025
-#: ../../en/book/ch09-reference.xml:7099 ../../en/book/ch09-reference.xml:7147
-#: ../../en/book/ch09-reference.xml:7185 ../../en/book/ch09-reference.xml:7247
-#: ../../en/book/ch09-reference.xml:7300 ../../en/book/ch09-reference.xml:7349
-#: ../../en/book/ch09-reference.xml:7402 ../../en/book/ch09-reference.xml:7457
-#: ../../en/book/ch09-reference.xml:7517 ../../en/book/ch09-reference.xml:7580
-#: ../../en/book/ch09-reference.xml:7618 ../../en/book/ch09-reference.xml:7826
-#: ../../en/book/ch09-reference.xml:7889 ../../en/book/ch09-reference.xml:7926
-#: ../../en/book/ch09-reference.xml:7994 ../../en/book/ch09-reference.xml:8078
-#: ../../en/book/ch09-reference.xml:8418 ../../en/book/ch09-reference.xml:8482
-#: ../../en/book/ch09-reference.xml:8548 ../../en/book/ch09-reference.xml:8608
+#: ../../en/book/ch09-reference.xml:1425 ../../en/book/ch09-reference.xml:1597
+#: ../../en/book/ch09-reference.xml:1757 ../../en/book/ch09-reference.xml:1987
+#: ../../en/book/ch09-reference.xml:2195 ../../en/book/ch09-reference.xml:2299
+#: ../../en/book/ch09-reference.xml:2351 ../../en/book/ch09-reference.xml:2485
+#: ../../en/book/ch09-reference.xml:2670 ../../en/book/ch09-reference.xml:2786
+#: ../../en/book/ch09-reference.xml:2903 ../../en/book/ch09-reference.xml:3242
+#: ../../en/book/ch09-reference.xml:3346 ../../en/book/ch09-reference.xml:3421
+#: ../../en/book/ch09-reference.xml:3533 ../../en/book/ch09-reference.xml:3630
+#: ../../en/book/ch09-reference.xml:3709 ../../en/book/ch09-reference.xml:3787
+#: ../../en/book/ch09-reference.xml:3885 ../../en/book/ch09-reference.xml:4002
+#: ../../en/book/ch09-reference.xml:4182 ../../en/book/ch09-reference.xml:4268
+#: ../../en/book/ch09-reference.xml:4357 ../../en/book/ch09-reference.xml:4786
+#: ../../en/book/ch09-reference.xml:4980 ../../en/book/ch09-reference.xml:5139
+#: ../../en/book/ch09-reference.xml:5300 ../../en/book/ch09-reference.xml:5575
+#: ../../en/book/ch09-reference.xml:5639 ../../en/book/ch09-reference.xml:5705
+#: ../../en/book/ch09-reference.xml:5782 ../../en/book/ch09-reference.xml:5880
+#: ../../en/book/ch09-reference.xml:6007 ../../en/book/ch09-reference.xml:6077
+#: ../../en/book/ch09-reference.xml:6165 ../../en/book/ch09-reference.xml:6200
+#: ../../en/book/ch09-reference.xml:6277 ../../en/book/ch09-reference.xml:6324
+#: ../../en/book/ch09-reference.xml:6394 ../../en/book/ch09-reference.xml:6445
+#: ../../en/book/ch09-reference.xml:6499 ../../en/book/ch09-reference.xml:6568
+#: ../../en/book/ch09-reference.xml:6627 ../../en/book/ch09-reference.xml:6789
+#: ../../en/book/ch09-reference.xml:6835 ../../en/book/ch09-reference.xml:6940
+#: ../../en/book/ch09-reference.xml:7017 ../../en/book/ch09-reference.xml:7063
+#: ../../en/book/ch09-reference.xml:7137 ../../en/book/ch09-reference.xml:7185
+#: ../../en/book/ch09-reference.xml:7223 ../../en/book/ch09-reference.xml:7285
+#: ../../en/book/ch09-reference.xml:7338 ../../en/book/ch09-reference.xml:7387
+#: ../../en/book/ch09-reference.xml:7440 ../../en/book/ch09-reference.xml:7496
+#: ../../en/book/ch09-reference.xml:7556 ../../en/book/ch09-reference.xml:7619
+#: ../../en/book/ch09-reference.xml:7657 ../../en/book/ch09-reference.xml:7865
+#: ../../en/book/ch09-reference.xml:7928 ../../en/book/ch09-reference.xml:7965
+#: ../../en/book/ch09-reference.xml:8033 ../../en/book/ch09-reference.xml:8117
+#: ../../en/book/ch09-reference.xml:8460 ../../en/book/ch09-reference.xml:8524
+#: ../../en/book/ch09-reference.xml:8590 ../../en/book/ch09-reference.xml:8650
msgid "Options"
msgstr "选项"
#. type: Content of: <book><chapter><sect1><refentry><refsect1><title>
#: ../../en/book/ch09-reference.xml:774 ../../en/book/ch09-reference.xml:907
#: ../../en/book/ch09-reference.xml:1008 ../../en/book/ch09-reference.xml:1192
-#: ../../en/book/ch09-reference.xml:1343 ../../en/book/ch09-reference.xml:1443
-#: ../../en/book/ch09-reference.xml:1613 ../../en/book/ch09-reference.xml:1773
-#: ../../en/book/ch09-reference.xml:2006 ../../en/book/ch09-reference.xml:2207
-#: ../../en/book/ch09-reference.xml:2369 ../../en/book/ch09-reference.xml:2498
-#: ../../en/book/ch09-reference.xml:2682 ../../en/book/ch09-reference.xml:2797
-#: ../../en/book/ch09-reference.xml:2917 ../../en/book/ch09-reference.xml:3254
-#: ../../en/book/ch09-reference.xml:3348 ../../en/book/ch09-reference.xml:3429
-#: ../../en/book/ch09-reference.xml:3543 ../../en/book/ch09-reference.xml:3636
-#: ../../en/book/ch09-reference.xml:3718 ../../en/book/ch09-reference.xml:3795
-#: ../../en/book/ch09-reference.xml:3893 ../../en/book/ch09-reference.xml:4011
-#: ../../en/book/ch09-reference.xml:4186 ../../en/book/ch09-reference.xml:4271
-#: ../../en/book/ch09-reference.xml:4361 ../../en/book/ch09-reference.xml:4766
-#: ../../en/book/ch09-reference.xml:4958 ../../en/book/ch09-reference.xml:5110
-#: ../../en/book/ch09-reference.xml:5279 ../../en/book/ch09-reference.xml:5544
-#: ../../en/book/ch09-reference.xml:5615 ../../en/book/ch09-reference.xml:5755
-#: ../../en/book/ch09-reference.xml:5926 ../../en/book/ch09-reference.xml:5982
-#: ../../en/book/ch09-reference.xml:6045 ../../en/book/ch09-reference.xml:6089
-#: ../../en/book/ch09-reference.xml:6168 ../../en/book/ch09-reference.xml:6245
-#: ../../en/book/ch09-reference.xml:6294 ../../en/book/ch09-reference.xml:6365
-#: ../../en/book/ch09-reference.xml:6417 ../../en/book/ch09-reference.xml:6468
-#: ../../en/book/ch09-reference.xml:6537 ../../en/book/ch09-reference.xml:6598
-#: ../../en/book/ch09-reference.xml:6760 ../../en/book/ch09-reference.xml:6806
-#: ../../en/book/ch09-reference.xml:6912 ../../en/book/ch09-reference.xml:6988
-#: ../../en/book/ch09-reference.xml:7038 ../../en/book/ch09-reference.xml:7108
-#: ../../en/book/ch09-reference.xml:7195 ../../en/book/ch09-reference.xml:7256
-#: ../../en/book/ch09-reference.xml:7306 ../../en/book/ch09-reference.xml:7358
-#: ../../en/book/ch09-reference.xml:7412 ../../en/book/ch09-reference.xml:7469
-#: ../../en/book/ch09-reference.xml:7585 ../../en/book/ch09-reference.xml:7623
-#: ../../en/book/ch09-reference.xml:7842 ../../en/book/ch09-reference.xml:7941
-#: ../../en/book/ch09-reference.xml:8010 ../../en/book/ch09-reference.xml:8094
-#: ../../en/book/ch09-reference.xml:8430 ../../en/book/ch09-reference.xml:8650
+#: ../../en/book/ch09-reference.xml:1343 ../../en/book/ch09-reference.xml:1444
+#: ../../en/book/ch09-reference.xml:1614 ../../en/book/ch09-reference.xml:1774
+#: ../../en/book/ch09-reference.xml:2007 ../../en/book/ch09-reference.xml:2208
+#: ../../en/book/ch09-reference.xml:2370 ../../en/book/ch09-reference.xml:2499
+#: ../../en/book/ch09-reference.xml:2683 ../../en/book/ch09-reference.xml:2799
+#: ../../en/book/ch09-reference.xml:2922 ../../en/book/ch09-reference.xml:3261
+#: ../../en/book/ch09-reference.xml:3355 ../../en/book/ch09-reference.xml:3436
+#: ../../en/book/ch09-reference.xml:3550 ../../en/book/ch09-reference.xml:3643
+#: ../../en/book/ch09-reference.xml:3725 ../../en/book/ch09-reference.xml:3802
+#: ../../en/book/ch09-reference.xml:3900 ../../en/book/ch09-reference.xml:4019
+#: ../../en/book/ch09-reference.xml:4194 ../../en/book/ch09-reference.xml:4279
+#: ../../en/book/ch09-reference.xml:4369 ../../en/book/ch09-reference.xml:4802
+#: ../../en/book/ch09-reference.xml:4996 ../../en/book/ch09-reference.xml:5148
+#: ../../en/book/ch09-reference.xml:5317 ../../en/book/ch09-reference.xml:5582
+#: ../../en/book/ch09-reference.xml:5653 ../../en/book/ch09-reference.xml:5793
+#: ../../en/book/ch09-reference.xml:5964 ../../en/book/ch09-reference.xml:6020
+#: ../../en/book/ch09-reference.xml:6083 ../../en/book/ch09-reference.xml:6127
+#: ../../en/book/ch09-reference.xml:6206 ../../en/book/ch09-reference.xml:6283
+#: ../../en/book/ch09-reference.xml:6332 ../../en/book/ch09-reference.xml:6403
+#: ../../en/book/ch09-reference.xml:6455 ../../en/book/ch09-reference.xml:6506
+#: ../../en/book/ch09-reference.xml:6575 ../../en/book/ch09-reference.xml:6636
+#: ../../en/book/ch09-reference.xml:6798 ../../en/book/ch09-reference.xml:6844
+#: ../../en/book/ch09-reference.xml:6950 ../../en/book/ch09-reference.xml:7026
+#: ../../en/book/ch09-reference.xml:7076 ../../en/book/ch09-reference.xml:7146
+#: ../../en/book/ch09-reference.xml:7233 ../../en/book/ch09-reference.xml:7294
+#: ../../en/book/ch09-reference.xml:7344 ../../en/book/ch09-reference.xml:7396
+#: ../../en/book/ch09-reference.xml:7450 ../../en/book/ch09-reference.xml:7508
+#: ../../en/book/ch09-reference.xml:7624 ../../en/book/ch09-reference.xml:7662
+#: ../../en/book/ch09-reference.xml:7881 ../../en/book/ch09-reference.xml:7980
+#: ../../en/book/ch09-reference.xml:8049 ../../en/book/ch09-reference.xml:8133
+#: ../../en/book/ch09-reference.xml:8472 ../../en/book/ch09-reference.xml:8692
msgid "Examples"
msgstr "例子"
@@ -30065,10 +30072,10 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
#: ../../en/book/ch09-reference.xml:856 ../../en/book/ch09-reference.xml:991
-#: ../../en/book/ch09-reference.xml:1976 ../../en/book/ch09-reference.xml:2289
-#: ../../en/book/ch09-reference.xml:2475 ../../en/book/ch09-reference.xml:2660
-#: ../../en/book/ch09-reference.xml:2889 ../../en/book/ch09-reference.xml:3330
-#: ../../en/book/ch09-reference.xml:4741
+#: ../../en/book/ch09-reference.xml:1977 ../../en/book/ch09-reference.xml:2290
+#: ../../en/book/ch09-reference.xml:2476 ../../en/book/ch09-reference.xml:2661
+#: ../../en/book/ch09-reference.xml:2894 ../../en/book/ch09-reference.xml:3337
+#: ../../en/book/ch09-reference.xml:4776
msgid "Nothing"
msgstr "无2"
@@ -30104,7 +30111,7 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><tertiary>
-#: ../../en/book/ch09-reference.xml:964 ../../en/book/ch09-reference.xml:6778
+#: ../../en/book/ch09-reference.xml:964 ../../en/book/ch09-reference.xml:6816
msgid "cat"
msgstr "cat"
@@ -30172,8 +30179,8 @@
msgstr "<command>cl</command>"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><title>
-#: ../../en/book/ch09-reference.xml:1096 ../../en/book/ch09-reference.xml:7529
-#: ../../en/book/ch09-reference.xml:8494
+#: ../../en/book/ch09-reference.xml:1096 ../../en/book/ch09-reference.xml:7568
+#: ../../en/book/ch09-reference.xml:8536
msgid "Example"
msgstr "例子"
@@ -30344,10 +30351,11 @@
#, fuzzy
msgid ""
"Send changes from your working copy to the repository. If you do not
supply "
-"a log message with your commit by using either the
<option>--file</option> or "
-"<option>--message</option> option, <command>svn</command> will launch
your "
-"editor for you to compose a commit message. See the
<literal>editor-cmd</"
-"literal> list entry in <xref
linkend=\"svn.advanced.confarea.opts.config\"/>."
+"a log message with your commit by using either the
<option>--file</option> "
+"(<option>-F</option>) or <option>--message</option>
(<option>-m</option>) "
+"option, <command>svn</command> will launch your editor for you to compose
a "
+"commit message. See the <literal>editor-cmd</literal> list entry in
<xref "
+"linkend=\"svn.advanced.confarea.opts.config\"/>."
msgstr ""
"将修改从工作副本发送到版本库。如果你没有使用<option>--file</option>或"
"<option>--message</option>提供一个提交日志信息，<command>svn</command>会启
动你"
@@ -30355,7 +30363,7 @@
"config\"/>的<literal>editor-cmd</literal>小节。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
-#: ../../en/book/ch09-reference.xml:1387
+#: ../../en/book/ch09-reference.xml:1388
#, fuzzy
msgid ""
"<command>svn commit</command> will send any lock tokens that it finds
and "
@@ -30367,7 +30375,7 @@
"数。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><tip><para>
-#: ../../en/book/ch09-reference.xml:1393
+#: ../../en/book/ch09-reference.xml:1394
#, fuzzy
msgid ""
"If you begin a commit and Subversion launches your editor to compose the "
@@ -30381,7 +30389,7 @@
"息，Subversion会提示你是选择取消提交, 空信息继续还是重新编辑信息。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
-#: ../../en/book/ch09-reference.xml:1408
+#: ../../en/book/ch09-reference.xml:1409
#, fuzzy
msgid ""
"<command>ci</command> (short for <quote>check in</quote>; not
<command>co</"
@@ -30391,12 +30399,12 @@
"quote>。)"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
-#: ../../en/book/ch0
==============================================================================
Diff truncated at 200k characters
More information about the svnbook-dev
mailing list