2 files changed, 12 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 2d5a12a8828..fcbb9e859e7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1121,10 +1121,15 @@ INTEGER optionally contains a sign.
   #25rah 
     => 267
 
-** The function documentation-property now evaluates the value of
+** The function `documentation-property' now evaluates the value of
 the given property to obtain a a string if it doesn't refer to etc/DOC
 and isn't a string.
 
+** If called for a symbol, the function `documentation' now looks for
+a `function-documentation' property of that symbol.  If it has a non-nil
+value, the documentation is taken from that value.  If the value is
+not a string, it is evaluated to obtain a string.
+
 +++
 ** The last argument of `define-key-after' defaults to t for convenience.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 10948007c83..e95a87b3434 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2000-03-26  Gerd Moellmann  <gerd@gnu.org>
 
+        * doc.c (Qfunction_documentation): New variable.
+        (syms_of_doc): Initialize Qfunction_documentation.
+        (Fdocumentation): If FUNCTION is a symbol with non-nil
+        `function-documentation' property, return a documentation derived
+        from that.
+
         * buffer.c (syms_of_buffer): Add default-cursor-type.
         (init_buffer_once): Don't let cursor_type have a local value
         in every buffer.