summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog9
-rw-r--r--doc/emacs/maintaining.texi4
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f5109e00910..aa9804fa94c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-21 Eli Zaretskii <eliz@gnu.org>
+
+ * maintaining.texi (Version Control Systems): Move "@end itemize"
+ past the last @item.
+
+2014-11-21 H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
+
+ * maintaining.texi (Version Control Systems): Fix a typo.
+
2014-11-20 Eric S. Raymond <esr@snark.thyrsus.com>
* maintaining.texi: Document SRC support.
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 761e67db670..ea6d60d5e65 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -191,7 +191,6 @@ exception of repository sync operations.
Bazaar (bzr) is a decentralized version control system that supports
both repository-based and decentralized versioning. VC supports most
basic editing operations under Bazaar.
-@end itemize
@cindex SRC
@cindex src
@@ -199,11 +198,12 @@ basic editing operations under Bazaar.
SRC (src) is RCS, reloaded - a specialized version-control system
designed for single-file projects worked on by only one person. It
allows multiple files with independent version-control histories to
-exisr in one directory, and is thus particularly well suited for
+exist in one directory, and is thus particularly well suited for
maintaining small documents, scripts, and dotfiles. While it uses RCS
for revision storage, it presents a modern user interface featuring
lockless operation and integer sequential version numbers. VC
supports almost all SRC operations.
+@end itemize
@node VCS Concepts
@subsubsection Concepts of Version Control