qref cvs.sgml 翻译更新完成
各位：
qref中文手册的 cvs.sgml 翻译更新已经完成，diff文件在附件中。
我现在现在开始更新gnupg.sgml。
目前中文版翻译滞后情况如下：
bin/doc-check zh-cn
Translation delay for zh-cn
append : 1.47 -> 1.66
debian : 1.83 -> 1.124
gateway : 1.30 -> 1.244
gnupg : 1.18 -> 1.22
install : 1.65 -> 1.94
kernel : 1.51 -> 1.68
preface : 1.22 -> 1.41
program : 1.43 -> 1.73
support : 1.12 -> 1.27
system : 1.47 -> 1.87
tips : 1.63 -> 1.113
tune : 1.113 -> 1.176
tutorial : 1.33 -> 1.93
woody : 1.35 -> 1.43
--
肖盛文(Faris Xiao)
Email:atzlinux@163.com
Index: cvs.sgml
===================================================================
RCS file: /cvsroot/qref/qref/zh-cn/cvs.sgml,v
retrieving revision 1.3
diff -u -r1.3 cvs.sgml
--- cvs.sgml 16 Oct 2004 16:27:49 -0000 1.3
+++ cvs.sgml 15 Jul 2005 02:15:17 -0000
@@ -1,10 +1,10 @@
<!-- CVS revision of this document "$Revision: 1.3 $" -->
-<!-- CVS revision of original english document "1.30" -->
+<!-- CVS revision of original english document "1.40" -->
<!--Line width ruler (ruler uses 78 characters) 34567890123456789012345-->
<chapt id="vcs">ϵͳ°æ±¾¿ØÖÆ
-<sect id="cvs">CVS
+<sect id="cvs">²¢Ðа汾ϵͳ (CVS)
<p>
ÓйصÄÏêϸÐÅÏ¢¿ÉʹÓÃ<prgn>lynx</prgn>²éÔÄ<file>/usr/share/doc/cvs/html-cvsclient</file>£¬<file>/usr/share/doc/cvs/html-info</file>£¬<file>/usr/share/doc/cvsbook</file>»òÖ´ÐÐ<tt>info cvs</tt>¼°<tt>man cvs</tt>¡£
@@ -12,7 +12,7 @@
<p>
ÒÔϲ½ÖèÅäÖõķþÎñÆ÷£¬½öÔÊÐí¡°src¡±Óû§×éµÄ³ÉÔ±·ÃÎÊCVSÈÝÆ÷£¬²¢ÇÒ½ö¡°staff¡±Óû§×éµÄ³ÉÔ±²Å¿É¹ÜÀíCVS£¬ÕâÑù×ö¿ÉÒÔ½µµÍ¹ÜÀíÕß²»Ð¡ÐÄ·¸´íµÄ»úÂÊ¡£
<example>
-# cd /var/lib; umask 002 ; sudo mkdir cvs # [Woody] FSH
+# cd <var>/var/lib</var>; umask 002 ; sudo mkdir <var>cvs</var> # [Woody] FSH
# apt-get install cvs cvs-doc cvsbook
# export CVSROOT=<var>/var/lib/cvs</var>
# cd $CVSROOT
@@ -67,7 +67,7 @@
<example>
$ export CVSROOT=:ext:<var>account@cvs.foobar.com:/var/lib/cvs</var>
</example>
-»òÁ¬½ÓSourceforge£º
+»òÁ¬½ÓSourceForge£º
<example>
$ export CVSROOT=:ext:<var>account@cvs.sf.net:/cvsroot/qref</var>
</example>
@@ -108,9 +108,11 @@
$ cvs add <var>newfile_added</var>
$ cvs ci -m "<var>Added newfile_added</var>"
$ cvs up # ´ÓCVSºÏ²¢×îа汾
- ... watch out for lines starting with "C <var>filename</var>"
- ... unmodified code is moved to `.#<var>filename</var>.version'.
- ... Search "<<<<<<<" and ">>>>>>>" in <var>filename</var>.
+ ... Éú³ÉËùÓÐÔÚ CVS Àïд´½¨µÄ×ÓĿ¼£¬Ê¹ÓÃ
+ ... "cvs up -d -P" ´úÌæ "cvs up"
+ ... ×¢ÒâÒÔ "C <var>filename</var>" ¿ªÍ·µÄÐУ¬Õâ±íʾÔÚ¸üйý³ÌÖУ¬²úÉúÁ˳åÍ»
+ ... δÐ޸ĵı¾µØ´úÂëÎļþ±»ÖØÃüÃûΪ `.#<var>filename</var>.version'.
+ ... ÔÚ <var>filename</var> ÀïÃæ²éÕÒ "<<<<<<<" ºÍ ">>>>>>>"£¬¿ÉÒÔÕÒµ½·¢Éú³åÍ»µÄµØ·½
$ cvs tag <var>Release-1</var> # Ìí¼Órelease tag
... edit further ...
$ cvs tag -d <var>Release-1</var> # ÒƳýrelease tag
@@ -121,15 +123,15 @@
... get original version to <var>old</var> directory
$ cd old
$ cvs tag -b <var>Release-initial-bugfixes</var> # ´´½¨branch (-b) tag
- ... Now you can work on the old version (Tag=sticky)
-$ cvs update
- ... Source tree now has sticky tag "Release-initial-bugfixes"
- ... Work on this branch
-$ cvs up # sync with files modified by others on this branch
+ ... now you can work on the old version (Tag=sticky)
+$ cvs update -d -P
+ ... source tree now has sticky tag "Release-initial-bugfixes"
+ ... work on this branch
+$ cvs up -d -P # sync with files modified by others on this branch
$ cvs ci -m "<var>check into this branch</var>"
-$ cvs update -kk -A
- ... Remove sticky tag and forget contents
- ... Update from main trunk without keyword expansion
+$ cvs update -kk -A -d -P
+ ... remove sticky tag and forget contents
+ ... update from main trunk without keyword expansion
$ cvs update -kk -j <var>Release-initial-bugfixes</var>
... Merge from <var>Release-initial-bugfixes</var> branch into the main
... trunk without keyword expansion. Fix conflicts with editor.
@@ -164,7 +166,7 @@
$ echo "<var>px</var> -a <var>project-x</var>" >>modules
$ cvs ci -m "<var>Now px is an alias for project-x</var>"
$ cvs release -d .
-$ exit # °´control-D´Ósu·µ»Ø
+$ exit # °´Ctrl-D´Ósu·µ»Ø
$ cvs co -d <var>project</var> <var>px</var>
... check out <var>project-x</var> (alias:<var>px</var>) from CVS to directory project
$ cd project
@@ -226,7 +228,7 @@
<sect id="svn">Subversion
<p>
-SubversionÊÇÏÂÒ»´ú°æ±¾¿ØÖÆϵͳ£¬Ëü½«Ìæ´úCVS¡£µ±Ç°¿ª·¢Õß³ÆËü»¹´¦ÓÚ¡°alpha¡±½×¶Î£¬µ«¶Ô´ó¶àÊýÓû§¶øÑÔËüÒÑ×ã¹»Îȶ¨ÁË¡£µ½±¾ÎĵµÐ´×÷֮ʱ£¬Subversion½öÔÚDebian unstable°æÖпÉÓá£
+SubversionÊÇÏÂÒ»´ú°æ±¾¿ØÖÆϵͳ£¬Ëü½«Ìæ´úCVS¡£µ±Ç°¿ª·¢Õß³ÆËü»¹´¦ÓÚ¡°alpha¡±½×¶Î£¬µ«¶Ô´ó¶àÊýÓû§¶øÑÔËüÒÑ×ã¹»Îȶ¨ÁË¡£µ½±¾ÎĵµÐ´×÷֮ʱ£¬Subversion½öÔÚDebian <tt>unstable</tt>°æÖпÉÓá£
<sect1 id="svn-inst">°²×°Subversion·þÎñÆ÷
<p>
The <package>subversion-server</package> meta-packageÒÀÀµÒ»Ð©¹ØÁª°ü£¨<package>libapache2-dav-svn</package>ºÍ<package>subversion-tools</package>£©À´ÅäÖ÷þÎñÆ÷¡£
@@ -242,7 +244,7 @@
<example>
# svnadmin create /var/local/repos
</example>
-½«ÈÝÆ÷µÄдȨÏÞ¸³¸øwww server£º
+½«ÈÝÆ÷µÄдȨÏÞ¸³¸øWWW server£º
<example>
# chown -R www-data:www-data /var/local/repos
</example>
@@ -266,14 +268,14 @@
<example>
htpasswd2 -c /etc/subversion/passwd some-username
</example>
-ÖØÆôApache2£¬¾Í¿ÉÒÔʹÓÃURLhttp://<var>hostname</var>/reposÀ´·ÃÎÊеÄsubversionÈÝÆ÷ÁË¡£
+ÖØÆôApache2£¬¾Í¿ÉÒÔʹÓÃURLhttp://<var>hostname</var>/reposÀ´·ÃÎÊеÄSubversionÈÝÆ÷ÁË¡£
</sect2>
</sect1>
<sect1 id="svn-cvs">½«CVSÈÝÆ÷ǨÒƵ½Subversion
</sect1>
<sect1 id="svn-usage">SubversionÓ÷¨ÑùÀý
<p>
-ÏÂÃæµÄС½Ú½«½ÌÄãÈçºÎÔÚsubversionÏÂʹÓø÷ÖÖÃüÁî¡£
+ÏÂÃæµÄС½Ú½«½ÌÄãÈçºÎÔÚSubversionÏÂʹÓø÷ÖÖÃüÁî¡£
<sect2>´´½¨ÐµÄSubversionµµ°¸
<p>
@@ -284,7 +286,7 @@
<var>project-name</var> -m "initial project import"
</example>
<p>
-Õ⽫ÔÚÄãµÄsubversionÈÝÆ÷Ï´´½¨Ò»¸öÃûΪ<var>project-name</var>µÄĿ¼£¬ÓÃÀ´´æ·ÅÄãµÄÏîÄ¿Îļþ¡£²é¿´http://localhost/repos/ËüÊÇ·ñÔÚÄǶù£¿;
+Õ⽫ÔÚÄãµÄSubversionÈÝÆ÷Ï´´½¨Ò»¸öÃûΪ<var>project-name</var>µÄĿ¼£¬ÓÃÀ´´æ·ÅÄãµÄÏîÄ¿Îļþ¡£²é¿´http://localhost/repos/ËüÊÇ·ñÔÚÄǶù£¿;
</sect2>
<sect2>ʹÓÃsubversion
Reply to: