diff options
| author | Chong Yidong | 2010-11-21 11:05:27 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-11-21 11:05:27 -0500 |
| commit | 0d6607ab81be365f247b8dd7a831fdb390591e49 (patch) | |
| tree | 744e69fb4dd8f2af989ddadace252df7ea007699 | |
| parent | 091af6490f0f4e6a314746401578b52991457ecd (diff) | |
| download | emacs-0d6607ab81be365f247b8dd7a831fdb390591e49.tar.gz emacs-0d6607ab81be365f247b8dd7a831fdb390591e49.zip | |
* maintaining.texi (Version Control Systems): Fix repeated sentence.
Suggested by Štěpán Němec.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7dba095b250..db27d5c46f0 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-21 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * maintaining.texi (Version Control Systems): Fix repeated sentence. | ||
| 4 | Suggested by Štěpán Němec. | ||
| 5 | |||
| 1 | 2010-11-20 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-11-20 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * maintaining.texi (Version Control): Say "commit", not "check in". | 8 | * maintaining.texi (Version Control): Say "commit", not "check in". |
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index dccd632bfb8..68e521be4ca 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -172,10 +172,8 @@ under active development, and has been deprecated in favor of Bazaar. | |||
| 172 | @item | 172 | @item |
| 173 | Git is a distributed version control system originally invented by | 173 | Git is a distributed version control system originally invented by |
| 174 | Linus Torvalds to support development of Linux (his kernel). VC | 174 | Linus Torvalds to support development of Linux (his kernel). VC |
| 175 | supports most git operations, with the exception of news merges and | 175 | supports many common git operations, but others, such as repository |
| 176 | repository syncing; these must be done from the command line. VC | 176 | syncing, must be done from the command line. |
| 177 | supports most git operations, with the exception of news merges and | ||
| 178 | repository syncing. | ||
| 179 | 177 | ||
| 180 | @cindex hg | 178 | @cindex hg |
| 181 | @cindex Mercurial | 179 | @cindex Mercurial |