Merge from origin/emacs-26

9bff405 (origin/emacs-26) * doc/misc/org.texi (Installation): Fix clo...
613c9a5 Update Org to v9.1.9
1b075a9 ; Fix some tiny doc typos
441fe20 De-obsolete `if-let' and `when-let'
8696038 * lisp/htmlfontify.el (hfy-begin-span-handler): Doc fix.
930f7b1 * doc/lispref/functions.texi (Defining Functions): Improve in...
95ccf50 Fix crash after frame is freed on macOS (bug#30800)
45d0475 More manual editing
2acb9f0 Minor manual changes changes
d481cba * lisp/calculator.el (calculator-paste-decimals): Add version.
7d6c7d0 ; Use GNU not Gnu in docs
1bc4def More proofreading of the Emacs manual

Conflicts:
	doc/misc/org.texi
	etc/NEWS
	lisp/org/org-clock.el

1 files changed, 9 insertions, 2 deletions

diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index c6a84b5ab12..7021146e698 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -246,9 +246,11 @@ Scroll calendar one month forward (@code{calendar-scroll-left}).
 @item <
 Scroll calendar one month backward (@code{calendar-scroll-right}).
 @item C-v
+@itemx @key{PageDown}
 @itemx @key{next}
 Scroll forward by three months (@code{calendar-scroll-left-three-months}).
 @item M-v
+@itemx @key{PageUp}
 @itemx @key{prior}
 Scroll backward by three months (@code{calendar-scroll-right-three-months}).
 @end table
@@ -264,8 +266,12 @@ calendar contents one month forward in time.  @kbd{<} scrolls the
 contents one month backwards in time.
 
 @kindex C-v @r{(Calendar mode)}
+@kindex PageDown @r{(Calendar mode)}
+@kindex next @r{(Calendar mode)}
 @findex calendar-scroll-left-three-months
 @kindex M-v @r{(Calendar mode)}
+@kindex PageUp @r{(Calendar mode)}
+@kindex prior @r{(Calendar mode)}
 @findex calendar-scroll-right-three-months
   The commands @kbd{C-v} and @kbd{M-v} scroll the calendar by an entire
 screenful---three months---in analogy with the usual meaning of
@@ -275,8 +281,9 @@ repeat count; in particular, since @kbd{C-u} multiplies the next command
 by four, typing @kbd{C-u C-v} scrolls the calendar forward by a year and
 typing @kbd{C-u M-v} scrolls the calendar backward by a year.
 
-  The function keys @key{next} and @key{prior} are equivalent to
-@kbd{C-v} and @kbd{M-v}, just as they are in other modes.
+  The function keys @key{PageDown} (or @key{next}) and @key{PageUp}
+(or @key{prior}) are equivalent to @kbd{C-v} and @kbd{M-v}, just as
+they are in other modes.
 
 @node Counting Days
 @section Counting Days