* misc.texi (Navigation): Document doc-view-continuous.

3 files changed, 18 insertions, 6 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e40a37b46ce..821a318a783 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* misc.texi (Navigation): Document doc-view-continuous.
+
 2010-03-24  Glenn Morris  <rgm@gnu.org>
 
 	* ack.texi (Acknowledgments):
@@ -30,7 +34,6 @@
 	* xresources.texi (Table of Resources):
 	* mule.texi (Defining Fontsets, Charsets): Update xrefs.
 
->>>>>>> MERGE-SOURCE
 2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* custom.texi (Init Examples): Add xref to Locals.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index cdf46f0f151..29d529c2a86 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -84,11 +84,20 @@ When in DocView mode, you can scroll the current page using the usual
 Emacs movement keys: @kbd{C-p}, @kbd{C-n}, @kbd{C-b}, @kbd{C-f}, and
 the arrow keys.
 
+@vindex doc-view-continuous
+  By default, the line-motion keys @kbd{C-p} and @kbd{C-n} stop
+scrolling at the beginning and end of the current page, respectively.
+However, if you change the variable @code{doc-view-continuous} to a
+non-@code{nil} value, then @kbd{C-p} displays the previous page if you
+are already at the beginning of the current page, and @kbd{C-n}
+displays the next page if you are at the end of the current page.
+
 @findex doc-view-next-page
 @findex doc-view-previous-page
-  To display the next page, type @kbd{n}, @key{next} or @kbd{C-x ]}
-(@code{doc-view-next-page}).  To display the previous page, type
-@kbd{p}, @key{prior} or @kbd{C-x [} (@code{doc-view-previous-page}).
+  You can also display the next page by typing @kbd{n}, @key{next} or
+@kbd{C-x ]} (@code{doc-view-next-page}).  To display the previous
+page, type @kbd{p}, @key{prior} or @kbd{C-x [}
+(@code{doc-view-previous-page}).
 
 @findex doc-view-scroll-up-or-next-page
 @findex doc-view-scroll-down-or-previous-page
diff --git a/etc/NEWS b/etc/NEWS
index 6abb3e347ca..d950139ed27 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -148,7 +148,7 @@ subsequent kills are not duplicated in the `kill-ring'.
 +++
 *** The new completion-style `initials' is available.
 For instance, this can complete M-x lch to list-command-history.
-
+---
 *** The new variable `completions-format' determines how completions
 are displayed in the *Completions* buffer.  If you set it to
 `vertical', completions are sorted vertically in columns.
@@ -227,7 +227,7 @@ exempt buffers that do correspond to files, customize the value of
 Dired buffers to be reverted automatically on revisiting them.
 
 ** DocView
-
++++
 *** When `doc-view-continuous' is non-nil, scrolling a line
 on the page edge advances to the next/previous page.