[svnbook] r5330 committed - branches/1.8/zh/book/ch00-preface.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Mon Jun 12 21:19:40 CDT 2017
Revision: 5330
http://sourceforge.net/p/svnbook/source/5330
Author: wuzhouhui
Date: 2017-06-13 02:19:40 +0000 (Tue, 13 Jun 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 0 in progress
Modified Paths:
--------------
branches/1.8/zh/book/ch00-preface.xml
Modified: branches/1.8/zh/book/ch00-preface.xml
===================================================================
--- branches/1.8/zh/book/ch00-preface.xml 2017-06-12 13:01:07 UTC (rev 5329)
+++ branches/1.8/zh/book/ch00-preface.xml 2017-06-13 02:19:40 UTC (rev 5330)
@@ -909,8 +909,12 @@
</varlistentry>
<varlistentry>
+ <!--
<term>Subversion 1.6 (March 2009)</term>
+ -->
+ <term>Subversion 1.6 (2009 年 3 月)</term>
<listitem>
+ <!--
<para>Release 1.6 continued to make branching and merging
more robust by introducing tree conflicts, and offered
improvements to several other existing features: more
@@ -921,12 +925,22 @@
to what <command>mod_dav_svn</command> offered. Also,
the command-line client introduced a new shortcut syntax
for referring to Subversion repository URLs.</para>
+ -->
+ <para>通过引入结构冲突, 1.6 版的分支与合并变得更加健壮, 已有的几个
+ 特性也得到了增强: 更多的交互式冲突解决选项, 稀疏检出支持不可伸缩
+ 和完全的排他性, 基于文件的外部定义, <command>svnserve</command>
+ 支持与 <command>mod_dav_svn</command> 类似的操作日志. 另外,
+ 客户端命令行工具支持新的, 用于引用仓库 URL 的缩写语法.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Subversion 1.7 (October 2011)</term>
+ -->
+ <term>Subversion 1.7 (2011 年 10 月)</term>
<listitem>
+ <!--
<para>Release 1.7 was primarily a delivery vehicle for two
big plumbing overhauls of existing Subversion
components. The largest and most impactful of these was
@@ -937,18 +951,29 @@
client/server interaction. Subversion 1.7 delivered a
handful of additional features, many bug fixes, and some
notable performance improvements, too.</para>
+ -->
+ <para>1.7 版主要是对 Subversion 的已有组件进行了两次大检修,
+ 其中最大的变化是重新实现了工作副本的管理库函数
+ <command>libsvn_wc</command>, 也就是所谓的 <quote>WC-NG</quote>.
+ 第二个变化是为客户端与服务器间的交互引入了一种更光滑的 HTTP 协
+ 议. Subversion 1.7 还增加了很多新特性, 修复了很多问题, 在性能
+ 上也有明显的提升.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Subversion 1.8 (June 2013)</term>
+ -->
+ <term>Subversion 1.8 (2013 年 6 月)</term>
<listitem>
+ <!--
<para>In release 1.8, Subversion's client now tracks
renamed files and directories more thoroughly, and
its <command>svn merge</command> command has grown
intelligent enough to make the
- <option>--reintegrate</option> option unnecessary.
+ <option>- -reintegrate</option> option unnecessary.
Certain new versioned property values can be inherited
from parent directories. That feature now allows a
repository to dictate default values for automatic
@@ -959,6 +984,15 @@
interactive conflict resolution. As always, Subversion
1.8 includes many additional features, defect fixes, and
improvements in behavior and performance.</para>
+ -->
+ <para>Subversion 1.8 的客户端在跟踪文件和目录的重命名上更加详尽,
+ 它的 <command>svn merge</command> 更加智能, 选项
+ <option>--reintegrate</option> 对它来说根本就是多余的了. 增加
+ 了新的版本控制属性, 其中一些属性可以从父目录继承, 这就允许仓库
+ 为属性的自动设置和忽略文件模式传递默认值, 用户间的一致性得到增
+ 强, 而这种一致性以前需要通过用户间的交流才能完成. 交互式的冲突
+ 解决引入了一种新的命令行文件合并工具. 同样, Subversion 1.8 还
+ 增了许多新特性, 修复了很多问题, 在性能上也有提升.</para>
</listitem>
</varlistentry>
@@ -973,8 +1007,12 @@
<!-- ================================================================= -->
<sect1 id="svn.preface.audience">
+ <!--
<title>Audience</title>
+ -->
+ <title>目标听众</title>
+ <!--
<para>This book is written for computer-literate folk who want to
use Subversion to manage their data. While Subversion runs on a
number of different operating systems, its primary user
@@ -981,7 +1019,13 @@
interface is command-line-based. That command-line tool
(<command>svn</command>), and some additional auxiliary
programs, are the focus of this book.</para>
+ -->
+ <para>本书是为了那些在计算机领域有着丰富知识, 并且希望使用 Subversion
+ 管理数据的读者准备的. 尽管 Subversion 可以在多种不同的操作系统上运行,
+ 但是它的主要用户界面是基于命令行的, 所以本书主要讨论 Subversion 的
+ 命令行工具 (<command>svn</command>) 和其他一些辅助工具.</para>
+ <!--
<para>For consistency, the examples in this book assume that the reader
is using a Unix-like operating system and is relatively comfortable
with Unix and command-line interfaces. That said, the
@@ -991,6 +1035,13 @@
forward slashes (<literal>/</literal>) for path separators, the
input to and output from this tool when run on Windows are
identical to that of its Unix counterpart.</para>
+ -->
+ <para>主方便讨论, 本书的例子假设读者使用的是类 Unix 操作系统, 并且熟悉
+ Unix 和命令行界面, 当然, <command>svn</command> 也可以在非 Unix 平台上
+ 运行, 例如 Microsoft Windows. 除了一些微小的差别, 例如在路径中使用
+ 反斜杠 (<literal>\</literal>)—而不是斜杠 (<literal>/</literal>)
+ —作用分隔符, 在 Windows 上运行 <command>svn</command> 的输入
+ 和输出与在 Unix 平台上运行完全一致.</para>
<para>Most readers are probably programmers or system
administrators who need to track changes to source code. This
More information about the svnbook-dev
mailing list