summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2014-05-13 22:07:03 +0000
committerjmc <jmc@openbsd.org>2014-05-13 22:07:03 +0000
commit474424cc571910c448e11e7502f4ccefd33817c1 (patch)
treeae44ac7b2c9f30ea4e6f01224a9a47435aa255c6
parentWe don't need no stinkin' 'extern long dev_bsize;'. At least not since (diff)
downloadwireguard-openbsd-474424cc571910c448e11e7502f4ccefd33817c1.tar.xz
wireguard-openbsd-474424cc571910c448e11e7502f4ccefd33817c1.zip
sync some of the text of ENVIRONMENT with more(1), and cut some
verbiage; ok millert
-rw-r--r--usr.bin/less/less.139
1 files changed, 25 insertions, 14 deletions
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index bda3a669f83..d1488792e2c 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: less.1,v 1.40 2014/05/09 21:51:50 jmc Exp $
+.\" $OpenBSD: less.1,v 1.41 2014/05/13 22:07:03 jmc Exp $
.\"
.\" Copyright (C) 1984-2012 Mark Nudelman
.\"
@@ -23,7 +23,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 9 2014 $
+.Dd $Mdocdate: May 13 2014 $
.Dt LESS 1
.Os
.Sh NAME
@@ -1650,12 +1650,18 @@ over variables defined in the system-wide lesskey file.
.Bl -tag -width LESSANSIENDCHARS
.It Ev COLUMNS
Sets the number of columns on the screen.
-Takes precedence over the number of columns specified by the TERM variable.
-(But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
-the window system's idea of the screen size takes precedence over the
-LINES and COLUMNS environment variables.)
+Takes precedence over the number of columns specified by the
+.Ev TERM
+variable,
+but may be overridden by window systems which support
+.Dv TIOCGWINSZ .
.It Ev EDITOR
-The name of the editor (used for the v command).
+Specifies the default editor if
+.Ev VISUAL
+is not set.
+If neither are set,
+.Xr vi 1
+is used.
.It Ev HOME
Name of the user's home directory
(used to find a lesskey file).
@@ -1744,10 +1750,9 @@ Emulate the
command.
.It Ev LINES
Sets the number of lines on the screen.
-Takes precedence over the number of lines specified by the TERM variable.
-(But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
-the window system's idea of the screen size takes precedence over the
-LINES and COLUMNS environment variables.)
+Takes precedence over the number of lines specified by the TERM variable,
+but may be overridden by window systems which support
+.Dv TIOCGWINSZ .
.It Ev MORE
Options which are passed to
.Nm
@@ -1757,11 +1762,17 @@ compatible mode.
.It Ev SHELL
The shell used to execute the ! command, as well as to expand filenames.
.It Ev TERM
-The type of terminal on which
+Specifies the terminal type.
+Used by
.Nm
-is being run.
+to get the terminal characteristics necessary to manipulate the screen.
.It Ev VISUAL
-The name of the editor (used for the v command).
+Specifies the default editor.
+If not set,
+.Ev EDITOR is used;
+if that is not set,
+.Xr vi 1
+is used.
.El
.Sh SEE ALSO
.Xr lesskey 1 ,