*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f778179b87f970d2eb887e083113b1838057eda1..5abac5d116b4e08bbad0c507aac0800331e68c79 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-23  Gerd Moellmann  <gerd@gnu.org>
+
+       * ffap.el (ffap-url-regexp): Add `https'.
+       
 2000-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * files.el (make-backup-file-name-1): Replace slashes with `!'

diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 69dfe2be5f7fb485cc2cc40b0c1b18c08a9444b1..c3fcec67213b4cbf800980d835d269c7cf94e515 100644 (file)
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -97,9 +97,8 @@ Reference Manual, corresponding to GNU Emacs version 21.1.
 @end ifnottex
 
 @menu
-* Copying::                 Conditions for copying and changing GNU Emacs.
 * Introduction::            Introduction and conventions used.
-* Standards: Coding Conventions.    Coding conventions for Emacs Lisp.
+* Standards: Coding Conventions::    Coding conventions for Emacs Lisp.
 
 * Lisp Data Types::         Data types of objects in Emacs Lisp.
 * Numbers::                 Numbers and arithmetic functions.
@@ -157,6 +156,8 @@ Reference Manual, corresponding to GNU Emacs version 21.1.
 Appendices
 
 * Antinews::                Info for users downgrading to Emacs 20.
+* GNU Free Documentation Licence:: The license for this documentation
+* Copying::                 Conditions for copying and changing GNU Emacs.
 * Tips::                    Advice and coding conventions for Emacs Lisp.
 * GNU Emacs Internals::     Building and dumping Emacs;
                               internal data structures.
@@ -955,6 +956,8 @@ Object Internals
 @c  REMOVE this:  include non-hacker.texi
 
 @include anti.texi
+@include doclicense.texi
+@include gpl.texi
 @include tips.texi
 @include internals.texi
 @include errors.texi

diff --git a/lispref/gpl.texi b/lispref/gpl.texi
index e6cd7e4d3c2a9ba7a2364ba6fe75267b5fe95e54..0217d3532e2a3d455d4c2be38af40b9099f43911 100644 (file)
--- a/lispref/gpl.texi
+++ b/lispref/gpl.texi
@@ -1,9 +1,9 @@
 @c -*-texinfo-*-
 @setfilename ../info/gpl
 
-@node Copying, , Top, Top
+@node GPL, , Top, Top
 @comment  node-name,  next,  previous,  up
-@appendix GNU GENERAL PUBLIC LICENSE
+@appendix GNU General Public License
 @center Version 2, June 1991
 
 @display
@@ -65,7 +65,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 modification follow.
 
 @iftex
-@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@unnumberedsec Terms and Conditions for Copying, Distribution and Modification
 @end iftex
 @ifinfo
 @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION