Merge changes from emacs-23 branch

3 files changed, 8 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 61e05aaf332..71de76e4d91 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * sc.texi (Getting Connected): Remove old index entries.
+
+2011-02-12  Ulrich Mueller <ulm@gentoo.org>
+
+        * url.texi: Remove duplicate @dircategory (Bug#7942).
+
 2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         * texinfo.tex: Update to version 2011-02-07.16.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 621d78b962f..a05eefc3371 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -751,8 +751,6 @@ interface specifications, or if you are writing or maintaining an MUA,
 @cindex .emacs file
 @findex sc-cite-original
 @findex cite-original (sc-)
-@findex sc-submit-bug-report
-@findex submit-bug-report (sc-)
 The first thing that everyone should do, regardless of the MUA you are
 using is to set up Emacs so it will load Supercite at the appropriate
 time.  This happens automatically if Supercite is distributed with your
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 5bfa96ec673..d337c82494c 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -12,7 +12,6 @@
 \overfullrule=0pt
 %\global\baselineskip 30pt      % for printing in double space
 @end tex
-@dircategory World Wide Web
 @dircategory Emacs
 @direntry
 * URL: (url).                   URL loading package.