summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-02-04 19:26:26 -0800
committerGlenn Morris <rgm@gnu.org>2012-02-04 19:26:26 -0800
commitd273439c6a02f669a8d9830723e7e49818985065 (patch)
tree941906621c03d1b20227b42b328163e72841bbc0 /doc/emacs
parentf8cdeef0bcc818188c6e299a23447ee49593342f (diff)
downloademacs-d273439c6a02f669a8d9830723e7e49818985065.tar.gz
Mention ERT in the Emacs manual.
* doc/emacs/maintaining.texi (Maintaining): Add cross-ref to ERT. * etc/NEWS: Related markup.
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/maintaining.texi4
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 54cd9fe9b92..6ff188a3da0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-05 Glenn Morris <rgm@gnu.org>
+
+ * maintaining.texi (Maintaining): Add cross-ref to ERT.
+
2012-02-04 Glenn Morris <rgm@gnu.org>
* macos.texi (Customization options specific to Mac OS / GNUstep):
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 2ec477031ca..984c65fbf2c 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -6,7 +6,9 @@
@chapter Maintaining Large Programs
This chapter describes Emacs features for maintaining large
-programs.
+programs. In addition to the features described here, you may find
+the @file{ERT} (``Emacs Lisp Regression Testing'') library useful in
+this context (@pxref{Top,,ERT,ert, Emacs Lisp Regression Testing}).
@menu
* Version Control:: Using version control systems.