mirror of https://github.com/texmacs/doc.git
Doc: minor zh,en update for man-versioning
This commit is contained in:
Darcy Shen
parent
dc7f05dae7
commit
8d71c0332a
|
|
@ -1,6 +1,6 @@
|
|||
<TeXmacs|1.99.5>
|
||||
<TeXmacs|1.99.9>
|
||||
|
||||
<style|<tuple|tmdoc|english>>
|
||||
<style|<tuple|tmdoc|english|old-spacing>>
|
||||
|
||||
<\body>
|
||||
<tmdoc-title|Versioning tools>
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
<hlink|<name|Darcs>|http://darcs.net/>, <hlink|<name|GNU
|
||||
Arch>|http://www.gnu.org/software/gnu-arch/>, just to mention a few of
|
||||
them. <TeXmacs> currently provides a rudimentary support for
|
||||
<name|Subversion>, but interfaces for the other systems could easily be
|
||||
added.
|
||||
<name|Subversion> and <name|Git>, but interfaces for the other systems
|
||||
could easily be added.
|
||||
|
||||
<paragraph*|Comparing two versions>
|
||||
|
||||
|
|
@ -118,9 +118,9 @@
|
|||
control>
|
||||
|
||||
If the file you are editing belongs to a directory that is under version
|
||||
control (only <name|Subversion> is currently supported, although other
|
||||
systems might follow), then the first part of the <menu|Version> menu will
|
||||
contain some clickable entries.
|
||||
control (only <name|Subversion> and <name|Git> is currently supported,
|
||||
although other systems might follow), then the first part of the
|
||||
<menu|Version> menu will contain some clickable entries.
|
||||
|
||||
First of all, if the current buffer is under version control, then you may
|
||||
take a look at its history using <menu|Version|History>. The history
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
<menu|Version|Update>. At the moment, no conflict resolution has been
|
||||
implemented yet, although this is planned for the future.
|
||||
|
||||
<tmdoc-copyright|2010|Joris van der Hoeven>
|
||||
<tmdoc-copyright|2010\U2019|Joris van der Hoeven|Darcy Shen>
|
||||
|
||||
<tmdoc-license|Permission is granted to copy, distribute and/or modify this
|
||||
document under the terms of the GNU Free Documentation License, Version 1.1
|
||||
|
|
|
|||
|
|
@ -1,20 +1,17 @@
|
|||
<TeXmacs|1.99.2>
|
||||
<TeXmacs|1.99.9>
|
||||
|
||||
<style|<tuple|tmdoc|chinese>>
|
||||
<style|<tuple|tmdoc|chinese|old-spacing>>
|
||||
|
||||
<\body>
|
||||
<tmdoc-title|\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#5DE5\>\<#5177\>>
|
||||
|
||||
\<#4E0E\>\<#4ED6\>\<#4EBA\>\<#5408\>\<#4F5C\>\<#64B0\>\<#5199\>\<#6587\>\<#6863\>\<#65F6\>\<#FF0C\>\<#4F1A\>\<#4EA7\>\<#751F\>\<#8FD9\>\<#6837\>\<#7684\>\<#9700\>\<#6C42\>\<#FF0C\>\<#5373\>\<#5BA1\>\<#9605\>\<#4ED6\>\<#4EBA\>\<#5BF9\>\<#6587\>\<#6863\>\<#7684\>\<#66F4\>\<#6539\>\<#FF0C\>\<#7136\>\<#540E\>\<#6216\>\<#63A5\>\<#53D7\>\<#6216\>\<#820D\>\<#5F03\>\<#6216\>\<#66F4\>\<#6B63\>\<#4E4B\>\<#3002\>\<#5728\>
|
||||
<menu|Edit|Preferences|Tools|Versioning
|
||||
\<#4E0E\>\<#4ED6\>\<#4EBA\>\<#5408\>\<#4F5C\>\<#64B0\>\<#5199\>\<#6587\>\<#6863\>\<#65F6\>\<#FF0C\>\<#4F1A\>\<#4EA7\>\<#751F\>\<#8FD9\>\<#6837\>\<#7684\>\<#9700\>\<#6C42\>\<#FF0C\>\<#5373\>\<#5BA1\>\<#9605\>\<#4ED6\>\<#4EBA\>\<#5BF9\>\<#6587\>\<#6863\>\<#7684\>\<#66F4\>\<#6539\>\<#FF0C\>\<#7136\>\<#540E\>\<#6216\>\<#63A5\>\<#53D7\>\<#6216\>\<#820D\>\<#5F03\>\<#6216\>\<#66F4\>\<#6B63\>\<#3002\>\<#5728\><menu|Edit|Preferences|Tools|Versioning
|
||||
tool>\<#542F\>\<#7528\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#83DC\>\<#5355\>\<#540E\>\<#FF0C\>\<#83DC\>\<#5355\>\<#680F\>\<#4E2D\>\<#4F1A\>\<#65B0\>\<#589E\><menu|\<#7248\>\<#672C\>>\<#8FD9\>\<#4E00\>\<#9879\>\<#3002\>\<#4E0B\>\<#9762\>\<#6211\>\<#4EEC\>\<#6765\>\<#8C08\>\<#8C08\>\<#8FD9\>\<#4E2A\>\<#83DC\>\<#5355\>\<#662F\>\<#5982\>\<#4F55\>\<#4F7F\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#7684\>\<#8FC7\>\<#7A0B\>\<#66F4\>\<#52A0\>\<#65B9\>\<#4FBF\>\<#3002\>
|
||||
|
||||
\<#5F53\>\<#524D\>\<#6D41\>\<#884C\>\<#7684\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#5DE5\>\<#5177\>\<#6709\>
|
||||
<hlink|<name|Subversion>|http://subversion.tigris.org/>\<#FF0C\>
|
||||
\<#5F53\>\<#524D\>\<#6D41\>\<#884C\>\<#7684\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#5DE5\>\<#5177\>\<#6709\><hlink|<name|Subversion>|http://subversion.tigris.org/>\<#FF0C\>
|
||||
<hlink|<name|Git>|http://git-scm.com/>\<#FF0C\>
|
||||
<hlink|<name|Darcs>|http://darcs.net/>\<#FF0C\> <hlink|<name|GNU
|
||||
Arch>|http://www.gnu.org/software/gnu-arch/> \<#7B49\>\<#3002\><TeXmacs>
|
||||
\<#76EE\>\<#524D\>\<#53EA\>\<#5BF9\>Subversion\<#63D0\>\<#4F9B\>\<#57FA\>\<#7840\>\<#652F\>\<#6301\>\<#FF0C\>\<#4E0D\>\<#8FC7\>\<#8981\>\<#96C6\>\<#6210\>\<#5176\>\<#4ED6\>\<#7684\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#5DE5\>\<#5177\>\<#4E5F\>\<#5E76\>\<#4E0D\>\<#56F0\>\<#96BE\>\<#3002\>
|
||||
Arch>|http://www.gnu.org/software/gnu-arch/>\<#7B49\>\<#3002\><TeXmacs>\<#76EE\>\<#524D\>\<#53EA\>\<#5BF9\><name|Subversion>\<#548C\><name|Git>\<#63D0\>\<#4F9B\>\<#57FA\>\<#7840\>\<#652F\>\<#6301\>\<#FF0C\>\<#4E0D\>\<#8FC7\>\<#8981\>\<#96C6\>\<#6210\>\<#5176\>\<#4ED6\>\<#7684\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#5DE5\>\<#5177\>\<#4E5F\>\<#5E76\>\<#4E0D\>\<#56F0\>\<#96BE\>\<#3002\>
|
||||
|
||||
<paragraph*|\<#6BD4\>\<#8F83\>\<#4E24\>\<#4E2A\>\<#7248\>\<#672C\>>
|
||||
|
||||
|
|
@ -57,7 +54,7 @@
|
|||
|
||||
<paragraph*|\<#4F7F\>\<#7528\>\<#5916\>\<#90E8\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#5DE5\>\<#5177\>>
|
||||
|
||||
\<#5982\>\<#679C\>\<#4F60\>\<#6B63\>\<#5728\>\<#7F16\>\<#8F91\>\<#7684\>\<#6587\>\<#4EF6\>\<#6240\>\<#5728\>\<#7684\>\<#76EE\>\<#5F55\>\<#5728\>\<#67D0\>\<#4E2A\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#7CFB\>\<#7EDF\>\<#4E0B\>\<#FF0C\>\<#90A3\>\<#4E48\><menu|\<#7248\>\<#672C\>>\<#4E0B\>\<#62C9\>\<#83DC\>\<#5355\>\<#4E2D\>\<#5206\>\<#9694\>\<#7B26\>\<#4EE5\>\<#4E0A\>\<#7684\>\<#90E8\>\<#5206\>\<#4F1A\>\<#88AB\>\<#6FC0\>\<#6D3B\>\<#3002\>\<#76EE\>\<#524D\><TeXmacs>\<#53EA\>\<#652F\>\<#6301\>Subversion\<#3002\>
|
||||
\<#5982\>\<#679C\>\<#4F60\>\<#6B63\>\<#5728\>\<#7F16\>\<#8F91\>\<#7684\>\<#6587\>\<#4EF6\>\<#6240\>\<#5728\>\<#7684\>\<#76EE\>\<#5F55\>\<#5728\>\<#67D0\>\<#4E2A\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#7CFB\>\<#7EDF\>\<#4E0B\>\<#FF0C\>\<#90A3\>\<#4E48\><menu|\<#7248\>\<#672C\>>\<#4E0B\>\<#62C9\>\<#83DC\>\<#5355\>\<#4E2D\>\<#5206\>\<#9694\>\<#7B26\>\<#4EE5\>\<#4E0A\>\<#7684\>\<#90E8\>\<#5206\>\<#4F1A\>\<#88AB\>\<#6FC0\>\<#6D3B\>\<#3002\>\<#76EE\>\<#524D\><TeXmacs>\<#652F\>\<#6301\><name|Subversion>\<#548C\><name|Git>\<#3002\>
|
||||
|
||||
\<#9996\>\<#5148\>\<#FF0C\>\<#5982\>\<#679C\>\<#5F53\>\<#524D\>\<#7684\>\<#7F13\>\<#51B2\>\<#533A\>\<#5728\>\<#7248\>\<#672C\>\<#63A7\>\<#5236\>\<#4E0B\>\<#FF0C\>\<#90A3\>\<#4E48\>\<#4F60\>\<#53EF\>\<#4EE5\>\<#901A\>\<#8FC7\><menu|Version|History>\<#6D4F\>\<#89C8\>\<#8BE5\>\<#6587\>\<#4EF6\>\<#7684\>\<#5386\>\<#53F2\>\<#7248\>\<#672C\>\<#3002\>\<#8BE5\>\<#5B50\>\<#83DC\>\<#5355\>\<#7684\>\<#4E0B\>\<#62C9\>\<#83DC\>\<#5355\>\<#662F\>\<#4E00\>\<#7CFB\>\<#5217\>\<#65E7\>\<#7248\>\<#672C\>\<#7684\>\<#8D85\>\<#94FE\>\<#63A5\>\<#53CA\>\<#76F8\>\<#5173\>\<#4FE1\>\<#606F\>\<#FF0C\>\<#6BD4\>\<#5982\>\<#4F55\>\<#65F6\>\<#4F55\>\<#4EBA\>\<#66F4\>\<#6539\>\<#3002\>\<#5386\>\<#53F2\>\<#7248\>\<#672C\>\<#662F\>\<#53EA\>\<#8BFB\>\<#7684\>\<#FF0C\>\<#4F46\>\<#4F60\>\<#53EF\>\<#4EE5\>\<#4F7F\>\<#7528\><menu|Version|Compare|With
|
||||
current user version>\<#5C06\>\<#5B83\>\<#4EEC\>\<#548C\>\<#5F53\>\<#524D\>\<#7684\>\<#7248\>\<#672C\>\<#6BD4\>\<#8F83\>\<#3002\>
|
||||
|
|
@ -66,7 +63,7 @@
|
|||
|
||||
\<#5982\>\<#679C\>\<#5728\>\<#4F60\>\<#7F16\>\<#8F91\>\<#67D0\>\<#6587\>\<#4EF6\>\<#65F6\>\<#FF0C\>\<#5176\>\<#5BF9\>\<#5E94\>\<#7684\>\<#7248\>\<#672C\>\<#5E93\>\<#4E2D\>\<#7684\>\<#6587\>\<#4EF6\>\<#6B63\>\<#597D\>\<#88AB\>\<#66F4\>\<#6539\>\<#FF0C\>\<#6B64\>\<#65F6\>\<#FF0C\>\<#4F60\>\<#9700\>\<#8981\>\<#70B9\>\<#51FB\><menu|Version|Update>\<#FF0C\>\<#5C06\>\<#4E24\>\<#8005\>\<#5408\>\<#5E76\>\<#3002\>\<#73B0\>\<#5728\>\<#8FD8\>\<#6CA1\>\<#6709\>\<#5BF9\>\<#5B8C\>\<#6210\>\<#9488\>\<#5BF9\>\<#51B2\>\<#7A81\>\<#7684\>\<#89E3\>\<#51B3\>\<#65B9\>\<#6848\>\<#FF0C\>\<#4E0D\>\<#8FC7\>\<#FF0C\>\<#4E0D\>\<#4E45\>\<#60A8\>\<#5C31\>\<#80FD\>\<#8F7B\>\<#677E\>\<#89E3\>\<#51B3\>\<#51B2\>\<#7A81\>\<#4E86\>\<#3002\>
|
||||
|
||||
<tmdoc-copyright|2010|Joris van der Hoeven>
|
||||
<tmdoc-copyright|2013\U2019|Joris van der Hoeven|\<#6C88\>\<#8FBE\>>
|
||||
|
||||
<tmdoc-license|Permission is granted to copy, distribute and/or modify this
|
||||
document under the terms of the GNU Free Documentation License, Version 1.1
|
||||
|
|
|
|||
Loading…
Reference in New Issue