merge from trunk

2 files changed, 3 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 16f3f5bd296..12eec54ef53 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,7 @@
 
         * text.texi (Maintaining Undo): Mention interactive call of
         buffer-disable-undo.
+        (Filling): Add cross-reference for hard newlines.
 
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 6205d10ce1b..babb5b71b8f 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1613,7 +1613,8 @@ Manual}.
 @defvar use-hard-newlines
 If this variable is non-@code{nil}, the filling functions do not delete
 newlines that have the @code{hard} text property.  These ``hard
-newlines'' act as paragraph separators.
+newlines'' act as paragraph separators.  @xref{Hard and Soft
+Newlines,, Hard and Soft Newlines, emacs, The GNU Emacs Manual}.
 @end defvar
 
 @node Margins