Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -31,6 +31,11 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20180730:
+	The default pager for man(1) has been changed to "less -s".  To
+	restore the old behavior, set MANPAGER="more -s" in your
+	environment.
+
 20180727:
 	Atmel AT91RM9200 and AT91SAM9, Cavium CNS 11xx and XScale
 	support has been removed from the tree. These ports were
Index: contrib/mdocml/apropos.1
===================================================================
--- contrib/mdocml/apropos.1
+++ contrib/mdocml/apropos.1
@@ -74,7 +74,7 @@
 If the standard output is a terminal device and
 .Fl c
 is not specified, use
-.Xr more 1
+.Xr less 1
 to paginate them.
 In
 .Fl a
@@ -334,7 +334,7 @@
 Any non-empty value of the environment variable
 .Ev MANPAGER
 is used instead of the standard pagination program,
-.Xr more 1 ;
+.Xr less 1 ;
 see
 .Xr man 1
 for details.
@@ -357,7 +357,7 @@
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
-.Xr more 1
+.Xr less 1
 .Fl s
 is used.
 Only used if
Index: contrib/mdocml/main.c
===================================================================
--- contrib/mdocml/main.c
+++ contrib/mdocml/main.c
@@ -1119,7 +1119,7 @@
 	if (pager == NULL || *pager == '\0')
 		pager = getenv("PAGER");
 	if (pager == NULL || *pager == '\0')
-		pager = "more -s";
+		pager = "less -s";
 	cp = mandoc_strdup(pager);
 
 	/*
Index: contrib/mdocml/man.1
===================================================================
--- contrib/mdocml/man.1
+++ contrib/mdocml/man.1
@@ -75,7 +75,7 @@
 for a description of the contents of this file.
 .It Fl c
 Copy the manual page to the standard output instead of using
-.Xr more 1
+.Xr less 1
 to paginate it.
 This is done by default if the standard output is not a terminal device.
 .It Fl f
@@ -233,7 +233,7 @@
 Any non-empty value of the environment variable
 .Ev MANPAGER
 is used instead of the standard pagination program,
-.Xr more 1 .
+.Xr less 1 .
 If
 .Xr less 1
 is used, the interactive
@@ -282,7 +282,7 @@
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
-.Xr more 1
+.Xr less 1
 .Fl s
 is used.
 Only used if
Index: contrib/mdocml/mandoc.1
===================================================================
--- contrib/mdocml/mandoc.1
+++ contrib/mdocml/mandoc.1
@@ -54,13 +54,13 @@
 If the standard output is a terminal device and
 .Fl c
 is not specified, use
-.Xr more 1
+.Xr less 1
 to paginate the output, just like
 .Xr man 1
 would.
 .It Fl c
 Copy the formatted manual pages to the standard output without using
-.Xr more 1
+.Xr less 1
 to paginate them.
 This is the default.
 It can be specified to override
@@ -578,7 +578,7 @@
 Any non-empty value of the environment variable
 .Ev MANPAGER
 is used instead of the standard pagination program,
-.Xr more 1 ;
+.Xr less 1 ;
 see
 .Xr man 1
 for details.
@@ -592,7 +592,7 @@
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
-.Xr more 1
+.Xr less 1
 .Fl s
 is used.
 Only used if
Index: contrib/tnftp/src/ftp_var.h
===================================================================
--- contrib/tnftp/src/ftp_var.h
+++ contrib/tnftp/src/ftp_var.h
@@ -189,7 +189,7 @@
 #define	GATE_SERVER	""	/* default server */
 #endif
 
-#define	DEFAULTPAGER	"more"	/* default pager if $PAGER isn't set */
+#define	DEFAULTPAGER	"less"	/* default pager if $PAGER isn't set */
 #define	DEFAULTPROMPT	"ftp> "	/* default prompt  if `set prompt' is empty */
 #define	DEFAULTRPROMPT	""	/* default rprompt if `set rprompt' is empty */
 
Index: etc/root/dot.cshrc
===================================================================
--- etc/root/dot.cshrc
+++ etc/root/dot.cshrc
@@ -18,7 +18,7 @@
 set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
 
 setenv	EDITOR	vi
-setenv	PAGER	more
+setenv	PAGER	less
 setenv	BLOCKSIZE	K
 
 if ($?prompt) then
Index: etc/root/dot.profile
===================================================================
--- etc/root/dot.profile
+++ etc/root/dot.profile
@@ -6,7 +6,7 @@
 export HOME
 TERM=${TERM:-xterm}
 export TERM
-PAGER=more
+PAGER=less
 export PAGER
 
 # Query terminal size; useful for serial lines.
Index: share/skel/dot.cshrc
===================================================================
--- share/skel/dot.cshrc
+++ share/skel/dot.cshrc
@@ -20,7 +20,7 @@
 # umask 22
 
 setenv	EDITOR	vi
-setenv	PAGER	more
+setenv	PAGER	less
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
Index: share/skel/dot.mailrc
===================================================================
--- share/skel/dot.mailrc
+++ share/skel/dot.mailrc
@@ -7,7 +7,7 @@
 
 set append ask autoprint 
 set indentprefix="> "
-set PAGER=more
+set PAGER=less
 set EDITOR=vi
 set VISUAL=vi
 set folder=Mail
Index: share/skel/dot.profile
===================================================================
--- share/skel/dot.profile
+++ share/skel/dot.profile
@@ -16,7 +16,7 @@
 # TERM=xterm; 	export TERM
 
 EDITOR=vi;   	export EDITOR
-PAGER=more;  	export PAGER
+PAGER=less;  	export PAGER
 
 # set ENV to a file invoked each time sh is started for interactive use.
 ENV=$HOME/.shrc; export ENV
Index: tools/tools/nanobsd/pcengines/Files/root/.cshrc
===================================================================
--- tools/tools/nanobsd/pcengines/Files/root/.cshrc
+++ tools/tools/nanobsd/pcengines/Files/root/.cshrc
@@ -17,7 +17,7 @@
 set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
 
 setenv	EDITOR	vi
-setenv	PAGER	more
+setenv	PAGER	less
 setenv	BLOCKSIZE	K
 
 if ($?prompt) then
Index: tools/tools/nanobsd/rescue/Files/root/.cshrc
===================================================================
--- tools/tools/nanobsd/rescue/Files/root/.cshrc
+++ tools/tools/nanobsd/rescue/Files/root/.cshrc
@@ -8,13 +8,13 @@
 	a la	ls -a
 	a lf	ls -FA
 	a ll	ls -lA
-	a lm	'll | more'
-	a m	more
+	a lm	'll | less'
+	a m	less
 
 set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin /usr/X11R6/bin /usr/local/jdk1.6.0/bin /usr/local/jdk1.5.0/bin $HOME/bin)
 setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man"
 
-setenv	PAGER	more
+setenv	PAGER	less
 setenv EDITOR	vi
 setenv	BLOCKSIZE	K
 setenv	FTP_PASSIVE_MODE YES
Index: usr.bin/mail/cmd1.c
===================================================================
--- usr.bin/mail/cmd1.c
+++ usr.bin/mail/cmd1.c
@@ -311,7 +311,7 @@
 		if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) {
 			cp = value("PAGER");
 			if (cp == NULL || *cp == '\0')
-				cp = _PATH_MORE;
+				cp = _PATH_LESS;
 			obuf = Popen(cp, "w");
 			if (obuf == NULL) {
 				warnx("%s", cp);
Index: usr.bin/mail/mail.1
===================================================================
--- usr.bin/mail/mail.1
+++ usr.bin/mail/mail.1
@@ -1188,7 +1188,7 @@
 .Va crt
 variable is set.
 The default paginator
-.Xr more 1
+.Xr less 1
 is used if this option is not defined.
 .It Ev REPLYTO
 If set, will be used to initialize the Reply-To field for outgoing
Index: usr.bin/mail/pathnames.h
===================================================================
--- usr.bin/mail/pathnames.h
+++ usr.bin/mail/pathnames.h
@@ -37,4 +37,4 @@
 #define	_PATH_HELP	"/usr/share/misc/mail.help"
 #define	_PATH_TILDE	"/usr/share/misc/mail.tildehelp"
 #define	_PATH_MASTER_RC	"/usr/share/misc/mail.rc:/usr/local/etc/mail.rc:/etc/mail.rc"
-#define	_PATH_MORE	"/usr/bin/more"
+#define	_PATH_LESS	"/usr/bin/less"
Index: usr.bin/man/man.1
===================================================================
--- usr.bin/man/man.1
+++ usr.bin/man/man.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 25, 2018
+.Dd July 30, 2018
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -106,7 +106,7 @@
 Defaults to
 .Dq Li "less -sR"
 if color support is enabled, or
-.Dq Li "more -s" .
+.Dq Li "less -s" .
 Overrides the
 .Ev MANPAGER
 environment variable, which in turn overrides the
@@ -345,7 +345,7 @@
 .Ev PAGER
 is used.
 If that has no value either,
-.Dq Li "more -s"
+.Dq Li "less -s"
 is used.
 .El
 .Sh FILES
Index: usr.bin/man/man.sh
===================================================================
--- usr.bin/man/man.sh
+++ usr.bin/man/man.sh
@@ -901,7 +901,7 @@
 			if [ -n "$PAGER" ]; then
 				MANPAGER="$PAGER"
 			else
-				MANPAGER="more -s"
+				MANPAGER="less -s"
 			fi
 		fi
 	fi
Index: usr.bin/msgs/msgs.1
===================================================================
--- usr.bin/msgs/msgs.1
+++ usr.bin/msgs/msgs.1
@@ -28,7 +28,7 @@
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd April 28, 1995
+.Dd July 30, 2018
 .Dt MSGS 1
 .Os
 .Sh NAME
@@ -196,7 +196,7 @@
 file, useful for reviews of recent messages.
 .It Fl p
 Pipe long messages through
-.Xr more 1 .
+.Xr less 1 .
 .El
 .Pp
 Within
@@ -222,7 +222,7 @@
 .El
 .Sh SEE ALSO
 .Xr mail 1 ,
-.Xr more 1 ,
+.Xr less 1 ,
 .Xr aliases 5 ,
 .Xr periodic 8
 .Sh HISTORY
Index: usr.bin/msgs/pathnames.h
===================================================================
--- usr.bin/msgs/pathnames.h
+++ usr.bin/msgs/pathnames.h
@@ -35,6 +35,6 @@
 
 #define	_PATH_MSGS	"/var/msgs"
 #define	_PATH_MAIL	"/usr/bin/Mail -f %s"
-#define	_PATH_PAGER	"/usr/bin/more -%d"
+#define	_PATH_PAGER	"/usr/bin/less -%d"
 #undef _PATH_TMP
 #define	_PATH_TMP	"/tmp/msgXXXXXX"
Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh
+++ usr.sbin/freebsd-update/freebsd-update.sh
@@ -3300,7 +3300,7 @@
 
 # Set a pager if the user doesn't
 if [ -z "$PAGER" ]; then
-	PAGER=/usr/bin/more
+	PAGER=/usr/bin/less
 fi
 
 # Set LC_ALL in order to avoid problems with character ranges like [A-Z].
Index: usr.sbin/mergemaster/mergemaster.8
===================================================================
--- usr.sbin/mergemaster/mergemaster.8
+++ usr.sbin/mergemaster/mergemaster.8
@@ -299,7 +299,7 @@
 .Ev PAGER
 environment variable if set.
 Otherwise it uses
-.Xr more 1 .
+.Xr less 1 .
 If
 .Ev PAGER
 specifies a program outside
@@ -451,7 +451,7 @@
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr make 1 ,
-.Xr more 1 ,
+.Xr less 1 ,
 .Xr sdiff 1 ,
 .Xr pwd_mkdb 8
 .Pp
Index: usr.sbin/mergemaster/mergemaster.sh
===================================================================
--- usr.sbin/mergemaster/mergemaster.sh
+++ usr.sbin/mergemaster/mergemaster.sh
@@ -426,19 +426,19 @@
     echo ''
     echo "  or you may type an absolute path to PAGER for this run"
     echo ''
-    echo "  Default is to use plain old 'more' "
+    echo "  Default is to use 'less' "
     echo ''
-    echo -n "What should I do? [Use 'more'] "
+    echo -n "What should I do? [Use 'less'] "
     read FIXPAGER
 
     case "${FIXPAGER}" in
     [eE])
        exit 0
        ;;
-    [lL])
+    [lL]|'')
        PAGER=less
        ;;
-    [mM]|'')
+    [mM])
        PAGER=more
        ;;
     /*)
@@ -458,11 +458,11 @@
 esac
 
 # If user has a pager defined, or got assigned one above, use it.
-# If not, use more.
+# If not, use less.
 #
-PAGER=${PAGER:-more}
+PAGER=${PAGER:-less}
 
-if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then
+if [ -n "${VERBOSE}" -a ! "${PAGER}" = "less" ]; then
   echo " *** You have ${PAGER} defined as your pager so we will use that"
   echo ''
   sleep 3
@@ -1127,7 +1127,7 @@
     else
       # Ok, the files are different, so show the user where they differ.
       # Use user's choice of diff methods; and user's pager if they have one.
-      # Use more if not.
+      # Use less if not.
       # Use unified diffs by default.  Context diffs give me a headache. :)
       #
       # If the user chose the -F option, test for that before proceeding