2 files changed, 37 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 758b4e37a64..ef3ddfa1ec9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2005-08-09  Juri Linkov  <juri@jurta.org>
+
+        * info.el: Replace `info' with upper-case `Info'
+        where appropriate.
+        (info-title-1, info-title-2, info-title-3, info-title-4)
+        (info-menu-header): Move up face definitions.
+        (info-menu-star): Rename from `info-menu-5'.
+        (Info-fontify-node): Replace `info-menu-5' with `info-menu-star'.
+        (Info-fontify-visited-nodes): Fix docstring.
+        (Info-hide-note-references): Fix docstring.
+        (Info-up, Info-next-reference, Info-prev-reference): Put cursor on
+        menu items in the same way as on cross-references.
+        (info-apropos): Fix sorting order and formatting to be like in the
+        stand-alone Info browser.  Display error messages for 1 sec.
+        (Info-mode-map): Move down `c' key binding.  Bind `^' to `Info-up'.
+        (Info-mode-menu): Remove item for `Info-search-case-sensitively'
+        from the menu bar.
+        (Info-insert-dir): Restore point after calling
+        `insert-buffer-substring'.
+
 2005-08-08  Richard M. Stallman  <rms@gnu.org>
 
         * emacs-lisp/lmenu.el (lucid-menubar-map, lucid-failing-menubar)
diff --git a/man/ChangeLog b/man/ChangeLog
index f0119913494..0baae8e1187 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,20 @@
+2005-08-09  Juri Linkov  <juri@jurta.org>
+
+        * info.texi (Help-P): Replace `Prev' with `Previous'.
+        (Help-M, Help-Xref): Add S-TAB.
+        (Help-FOO): Update `u' command.
+        (Help-Xref): Move info about Mouse-2 from `Help-Int'.
+        Update info about visibility of xref parts.
+        (Help-Int): Fix `m' command.  Rename `Info-last' to
+        `Info-history-back'.  Add `Info-history-forward'.
+        (Advanced): Fix `g*' and `M-n' commands.
+        (Info Search): Add `index-apropos' in stand-alone browser.
+        Add isearch commands.
+        (Emacs Info Variables): Remove `Info-fontify'.
+        Add `Info-mode-hook'.  Update face names.
+        Add `Info-fontify-maximum-menu-size',
+        `Info-fontify-visited-nodes', `Info-isearch-search'.
+
 2005-08-07  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.0.50.
@@ -132,7 +149,6 @@
         * mh-e.texi (Copying):
         * trouble.texi (Checklist): Update FSF's address.
 
->>>>>>> 1.631
 2005-07-03  Richard M. Stallman  <rms@gnu.org>
 
         * flymake.texi (Example -- Configuring a tool called directly):