diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-04 09:39:04 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-04 09:39:04 +0000 |
| commit | 093571c374d671607c822dd2e5bedb2ac877ea91 (patch) | |
| tree | 2b912b5ab8966dd0710fcbfcfaa9fc305895d078 /doc | |
| parent | e9198520f3a0c0ef88a77179bc89e3714d58e69f (diff) | |
| parent | 8e7e5143d9d3c4625846f58a905d4d6fc2c424ef (diff) | |
| download | emacs-093571c374d671607c822dd2e5bedb2ac877ea91.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 8 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 2 | ||||
| -rw-r--r-- | doc/misc/tramp.texi | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 099abd58a3f..5f416f61612 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,11 @@ +2008-02-02 Eli Zaretskii <eliz@gnu.org> + + * maintaining.texi (Tags): Fix last change. + +2008-02-02 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi: Use new FSF's Back-Cover Text. + 2008-01-31 Nick Roberts <nickrob@snap.net.nz> * trouble.texi (Checklist): Direct users to emacs-devel@gnu.org. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 7106a380d03..d4774379555 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -130,7 +130,7 @@ Of course, you should substitute the proper years and copyright holder. @node Tags @section Tags Tables -@cindex tag tables +@cindex tags and tag tables A @dfn{tags table} is a description of how a multi-file program is broken up into files. It lists the names of the component files and the diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 331ec594bf0..f5151d3ac7b 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -50,9 +50,9 @@ Manual'', and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled ``GNU Free Documentation License'' in the Emacs manual. -(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify -this GNU Manual, like GNU software. Copies published by the Free -Software Foundation raise funds for GNU development.'' +(a) The FSF's Back-Cover Text is: ``You have the freedom to +copy and modify this GNU manual. Buying copies from the FSF +supports it in developing GNU and promoting software freedom.'' This document is part of a collection distributed under the GNU Free Documentation License. If you want to distribute this document |