summaryrefslogtreecommitdiffstats
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-09-28 10:47:08 -0700
committerZac Medico <zmedico@gentoo.org>2011-09-28 10:47:08 -0700
commit374aa37ece5d67d003da358e35f0326da3cd2397 (patch)
treef9dd056dbbe1f8bdaba2faadbd277b090ae792c3 /cnf
parent6ec1972b43512356f988fa23aa33c86b3629d16e (diff)
downloadportage-374aa37ece5d67d003da358e35f0326da3cd2397.tar.gz
portage-374aa37ece5d67d003da358e35f0326da3cd2397.tar.bz2
portage-374aa37ece5d67d003da358e35f0326da3cd2397.zip
etc-update: support PAGER env var for bug #384663
Diffstat (limited to 'cnf')
-rw-r--r--cnf/etc-update.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf
index cea21739e..970986251 100644
--- a/cnf/etc-update.conf
+++ b/cnf/etc-update.conf
@@ -21,9 +21,9 @@ mv_opts="-i"
# arguments used whenever cp is called
cp_opts="-i"
-# pager for use with diff commands
-pager="less"
-#pager=""
+# set the pager for use with diff commands (this will
+# cause the PAGER environment variable to be ignored)
+#pager="less"
# For emacs-users (see NOTE_2)
# diff_command="eval emacs -nw --eval=\'\(ediff\ \"%file1\"\ \"%file2\"\)\'"
@@ -47,9 +47,9 @@ merge_command="sdiff -s -o %merged %orig %new"
# pager:
#
# Examples of pager usage:
-# pager="" # don't use a pager
-# pager="less -E" # less
-# pager="more" # more
+# pager="cat" # don't use a pager
+# pager="less -E" # less
+# pager="more" # more
#
#
# diff_command: