[svnbook commit] r1953 - trunk/src/zh/book

rocksun svnbook-dev at red-bean.com
Wed Jan 25 10:51:00 CST 2006

Author: rocksun
Date: Wed Jan 25 10:50:54 2006
New Revision: 1953


* zh/book/ch03.xml: complete translate to 1.2

Modified: trunk/src/zh/book/ch03.xml
--- trunk/src/zh/book/ch03.xml	(original)
+++ trunk/src/zh/book/ch03.xml	Wed Jan 25 10:50:54 2006
@@ -216,56 +216,24 @@
-      <title>What's in a Name?</title>
+      <title>名称中有什么?</title>
-      <para>Subversion tries hard not to limit the type of data you
-        can place under version control.  The contents of files and
-        property values are stored and transmitted as binary data, and
-        the <xref linkend="svn.advanced.props.special.mime-type"/>
-        tells you how to give Subversion a hint that
-        <quote>textual</quote> operations don't make sense for a
-        particular file.  There are a few places, however, where
-        Subversion places restrictions on information it
-        stores.</para>
-      <para>Subversion handles text internally as UTF-8 encoded
-        Unicode.  As a result, certain items which are inherently
-        <quote>textual</quote>, such as property names, path names,
-        and log messages, can only contain legal UTF-8 characters.  It
-        also provides a minimum requirement for use of the
-        <literal>svn:mime-type</literal> property—if a file's
-        contents aren't compatible with UTF-8, you should mark it as a
-        binary file.  Otherwise, Subversion will attempt to merge
-        differences using UTF-8, which is likely to leave garbage in
-        the file.</para>
-      <para>In addition, path names are used as XML attribute values
-        in WebDAV exchanges, as well in as some of Subversion's
-        housekeeping files.  This means that path names can only
-        contain legal XML (1.0) characters.  Subversion also prohibits
-        TAB, CR, and LF characters in path names, so they aren't
-        broken up in diffs, or in the output of commands like <xref
-        linkend="svn.ref.svn.c.log"/> or <xref
-        linkend="svn.ref.svn.c.status"/>.</para>
-      <para>While it may seem like a lot to remember, in practice
-        these limitations are rarely a problem.  As long as your
-        locale settings are compatible with UTF-8, and you don't use
-        control characters in path names, you should have no trouble
-        communicating with Subversion.  The command-line client adds
-        an extra bit of help—it will automatically escape legal
-        path characters as needed in URLs you type to create
-        <quote>legally correct</quote> versions for internal
-        use.</para>
-      <para>Experienced users of Subversion have also developed a set
-        of best-practice conventions for laying out paths in the
-        repository.  While these aren't strict requirements like the
-        syntax described above, they help to organize frequently
-        performed tasks.  The <literal>/trunk</literal> part of URLs
-        you'll find throughout this book is one of these conventions;
-        we'll talk a lot more about it and related recommendations in
-        <xref linkend="svn.branchmerge"/>.</para>
+      <para>Subversion努力控制版本控制下数据的类型,文件的内容和属性值都是按照二进制数据存储和传递,并且<xref 
+      linkend="svn.advanced.props.special.mime-type"/>给Subversion提示以说明对于特定文件<quote>文本化的</quote>操作是没有意义的,也有一些地方,Subversion对存放信息的有限制。
+      </para>
+      <para>Subversion内部处理文本是UTF-8编码的,结果就是有些条目天生是<quote>文本的</quote>,例如属性名称、路径名称和日志信息只能存放合法的UTF-8字符。它也提供了使用<literal>svn:mime-type</literal>属性的最小需求—如果一个文件的内容不符合UTF-8,你一定要把它标记为二进制文件,否则,Subversion会尝试使用UTF-8合并区别,这很可能在文件中留下垃圾。
+      </para>
+      <para>此外,路径名称在WebDAV交换中会作为XML属性值,就像Subversion的管理文件。这意味着路径名称只能包含合法的XML(1.0)字符,Subversion也会禁止路径名称中出现TAB、CR或LF字符,所以它们才不会在区别程序或如<xref
+        linkend="svn.ref.svn.c.log"/>和<xref
+        linkend="svn.ref.svn.c.status"/>的输出命令中断掉。</para>
+      <para>虽然看起来要记住很多事情,但在实践中这些限制很少会成为问题。只要你的本地设置兼容UTF-8,也不在路径名称中使用控制字符,与Subversion的通讯就不会有问题。命令行客户端会添加一些额外的帮助字节—自动将你输入的URL路径字符转化为<quote>合法正确的</quote>内部用版本。
+      </para>
+      <para>有经验的Subversion用户也发展出了一套关于布局版本库路径的最佳实践习惯。这些不像上面提到的有严格的语法要求,它们是用来组织经常执行的任务。URL中的<literal>/trunk</literal>部分就是这种习惯,我们会在<xref linkend="svn.branchmerge"/>进一步论述这个问题并提出相关建议。
+     </para>
@@ -1255,10 +1223,8 @@
-        <command>svn log</command> also takes a <option>--quiet</option>
-        (<option>-q</option>) switch, which suppresses the body of the
-        log message. When combined with <option>--verbose</option>, it
-        gives just the names of the changed files.</para>
+      <command>svn log</command>也有一个<option>--quiet</option>
+        (<option>-q</option>)选项,会禁止日志信息的主要部分,当与<option>--verbose</option>结合使用,仅会显示修改的文件名。</para>
         <title>为什么<command>svn log</command>给我一个空的回应?</title>
@@ -1529,7 +1495,10 @@
   <sect1 id="svn.tour.summary">
-      <para>我们已经覆盖了大多数Subversion的客户端命令,引人注目的例外是处理分支与合并(见<xref linkend="svn.branchmerge"/>)以及属性(见<xref linkend="svn-ch-7-sect-2"/>)的命令,然而你也许会希望跳到<xref linkend="svn.ref"/>来察看所有不同的命令—怎样利用它们使你的工作更容易。</para>
+      <para>我们已经覆盖了大多数Subversion的客户端命令,引人注目的例外是处理分支与合并(见<xref 
+      linkend="svn.branchmerge"/>)以及属性(见<xref 
+      linkend="svn.advanced.props"/>)的命令,然而你也许会希望跳到<xref 
+      linkend="svn.ref"/>来察看所有不同的命令—怎样利用它们使你的工作更容易。</para>

More information about the svnbook-dev mailing list