Switch the default pager for most commands to less

Finally, a pager for the nineties.

MFC after:	Never
Relnotes:	Yes
Differential Revision:	https://reviews.freebsd.org/D13465
Poll:		https://reviews.freebsd.org/V7

3 files changed, 12 insertions, 12 deletions

diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index 0f396a0a3298..6e39b8f31f00 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -3300,7 +3300,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PATH}
 
 # 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].
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 329e74d090d2..b37b173d3c67 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2017
+.Dd August 8, 2018
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -299,7 +299,7 @@ utility uses the
 .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 @@ comparison, use:
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr make 1 ,
-.Xr more 1 ,
+.Xr less 1 ,
 .Xr sdiff 1 ,
 .Xr pwd_mkdb 8
 .Pp
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 8561503a6d19..31904e8efa09 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -426,19 +426,19 @@ check_pager () {
     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 @@ check_pager () {
 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 @@ for COMPFILE in `find . -type f | sort`; do
     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