Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz@gnu.org

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 615551225cb..e31c63fd8f6 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,7 +1,7 @@
 2013-03-03  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Digression into C): Update example.
-        (defcustom): Fix typo.
+        (defcustom, Simple Extension): Fix typos.
 
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index f1f9315747a..43e2539d2f2 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17811,7 +17811,7 @@ emacs -q --no-site-file -eval '(blink-cursor-mode nil)'
 
 @exdent Or nowadays, using an even more sophisticated set of options,
 
-emacs -Q - D
+emacs -Q -D
 @end smallexample
 }: