---
src/.iscreenrc | 30 +++++-----
src/ChangeLog | 32 +++++------
src/HACKING | 2 +-
src/INSTALL | 12 ++--
src/Makefile.in | 2 +-
src/NEWS.3.5 | 22 ++++----
src/NEWS.3.6 | 6 +-
src/NEWS.3.7 | 2 +-
src/NEWS.3.9 | 16 +++---
src/README | 10 ++--
src/TODO | 2 +-
src/acls.c | 20 +++----
src/acls.h | 6 +-
src/ansi.c | 16 +++---
src/attacher.c | 4 +-
src/configure.ac | 16 +++---
src/display.c | 10 ++--
src/display.h | 16 +++---
src/doc/FAQ | 42 +++++++-------
src/doc/README.DOTSCREEN | 10 ++--
src/doc/make.help | 4 +-
src/doc/screen.1 | 90 +++++++++++++++---------------
src/doc/screen.texinfo | 108 ++++++++++++++++++------------------
src/etc/completer.zsh | 6 +-
src/etc/etcscreenrc | 6 +-
src/etc/newsyntax38 | 4 +-
src/etc/screenrc | 4 +-
src/fileio.c | 2 +-
src/image.h | 2 +-
src/input.c | 4 +-
src/layer.h | 2 +-
src/list_display.c | 2 +-
src/list_generic.c | 14 ++---
src/list_window.c | 2 +-
src/logfile.c | 2 +-
src/logfile.h | 6 +-
src/mark.c | 12 ++--
src/mark.h | 4 +-
src/os.h | 8 +--
src/process.c | 14 ++---
src/resize.c | 2 +-
src/screen.c | 24 ++++----
src/screen.h | 14 ++---
src/search.c | 2 +-
src/socket.c | 8 +--
src/termcap.c | 4 +-
src/tests/test-winmsgbuf.c | 16 +++---
src/tests/test-winmsgcond.c | 2 +-
src/tty.c | 38 ++++++-------
src/utmp.c | 2 +-
src/window.c | 16 +++---
src/window.h | 8 +--
src/winmsg.c | 2 +-
src/winmsgbuf.c | 14 ++---
src/winmsgcond.c | 2 +-
55 files changed, 363 insertions(+), 363 deletions(-)
diff --git a/src/.iscreenrc b/src/.iscreenrc
index 802afbd..16e1729 100644
--- a/src/.iscreenrc
+++ b/src/.iscreenrc
@@ -12,12 +12,12 @@ password none # Same as not even mentioning it.
scrollback 200 # we have a 200 lines history buffer
markkeys "@=\177:@=^C" # our mad facit-twist terminal buffer overflow...
-markkeys "h=^B:l=^F:\$=^E" # some missing emacs style bindings in copymode
+markkeys "h=^B:l=^F:\$=^E" # some missing Emacs-style bindings in copymode
echo -n "booting screen"
# let it flash, not horn!
-#vbell on # "vbell" don't work any longer, sorry.
+#vbell on # "vbell" doesn't work any longer, sorry.
#vbell_msg " Wuff, Wuff!! " # this is the default message
#bell "Bimmmel No. %" # sounds the bell and shows a message
@@ -28,7 +28,7 @@ echo -n "."
# we have no termcap entry for screen on the target machine? Well then
# we tell a lie.
term screen # would be the obvious default here.
-#term vt100 # screen will understand vt100 for 99%.
+#term vt100 # screen will understand VT100 for 99%.
# we want to survive hangups
# note that the default setting is off now!
@@ -45,11 +45,11 @@ echo -n "."
# Printing in the leftmost column is not save. We express that fact as :LP@:
#
# Emacs tends to smear it's highlighted status bar across the screen, producing
-# ugly areas of bright background, if termcap is'nt perfectly sober.
+# ugly areas of bright background, if termcap isn't perfectly sober.
# Give a little :ms@: in the termcap, this may help.
#
# And who invented the initialisation for facit terminals? We tell him that
-# we non't like smooth scroll, by specifying :ti=\E[?l:.
+# we don't like smooth scroll, by specifying :ti=\E[?l:.
# \E[?3l 80 Zeichen
# \E[?3h 132 Zeichen
# LP Last column Printable
@@ -92,13 +92,13 @@ termcap xterm* WS=\E[8;%d;%dt
# ICL 6402 testing:
termcap icl* G0:S0=\E$[start]:E0=\E%[end]:C0=j9k<l6m3n?q\:t7u=v;w>x5
GS=\E(0^O:GE=\E(B^O:G1=k:G2=l:G3=m:G4=j:GV=x:GH=q:GR=u:GL=t:GU=w:GD=v:GC=n
-# Flowcontrol produces trouble. ^S und ^Q will never reach screen, as our
+# Flow control produces trouble. ^S und ^Q will never reach screen, as our
# terminals catch them locally. Who can explain that to me?:
#flow on|off|auto [interrupt]
-# Long Lines get wrapped around (the back of your terminal). This is the
-# default for vt100. But now programs make different asumptions about your
-# terminal. You may find two linefeeds where you'd expect one, or you may
+# Long lines get wrapped around (the back of your terminal). This is the
+# default for VT100. But now programs make different assumptions about your
+# terminal. You may find two line feeds where you'd expect one, or you may
# be confronted with a truncated line. Currently there is no fix, but pressing
# C-A r and doing a redraw.
#wrap on
@@ -106,10 +106,10 @@ termcap icl*
G0:S0=\E$[start]:E0=\E%[end]:C0=j9k<l6m3n?q\:t7u=v;w>x5 GS=\E(0^O:G
# the autoaka allows you to see the currently executing shell command in the
# window name field. To use that, your shell prompt must contain ^[k^[\ or
# you will see the string "(init)" as a name.
-# in my .cshrc I may use this for a wonderfull tcsh-prompt:
+# in my .cshrc I may use this for a wonderful tcsh-prompt:
# set prompt="%{^[k^[\\%}%h %c2(%m)%# "
#
-# defining a shellaka that contains a pipe-symbol (|) activites the
+# defining a shellaka that contains a pipe-symbol (|) activates the
# autoaka feature. To the left of that | you specify a constant part of
# your prompt as a trigger, to the right you may place a default string
# as in
@@ -121,10 +121,10 @@ shellaka '> |tc'
# ... now a little bit of key bindings
# In case we don't have write permission for /etc/utmp (no s-bit)
# we create even local windows via rlogin. -> Et voila: a utmp-slot
-# utmp-slots are strongly recomended to keep sccs and talk happy.
-# (thus we have ^A# or. ^Ac for windowcreation with or without utmp-slot.)
+# utmp-slots are strongly recommended to keep sccs and talk happy.
+# (thus we have ^A# or. ^Ac for window creation with or without utmp-slot.)
# but if we run suid-root, we produce all the rlogins with -ln,
-# as nobody shall refer to these pty's.
+# as nobody shall refer to these PTYs.
bind '!' screen -ln -k faui41 rlogin faui41
bind '@' screen -ln -k vme2 rlogin faui4_vme2
#bind '#' screen -k faui43
@@ -151,7 +151,7 @@ bind 'L'
# What happens, when you 'think emacs' and want to erase a whole
# line? You type ^A^K right? Under screen it should be ^Aa^K. But...
# killing the window would be a real punishment for a little mistyping.
-bind k #wow! I even amange to type ^Ak by accident.
+bind k #wow! I even manage to type ^Ak by accident.
#bind ^k
#bind K kill
diff --git a/src/ChangeLog b/src/ChangeLog
index 8872074..4913ada 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -174,9 +174,9 @@ patchlevel.h and newer changes are only documented there.
* Made a superb configure script.
-* BROKEN_PIPE, SOCK_NOT_IN_FS added for braindamaged systems.
+* BROKEN_PIPE, SOCK_NOT_IN_FS added for brain damaged systems.
-* multi display, multi user support.
+* multidisplay, multiuser support.
* process command. CS, CE switch cursorkeycap in application mode.
@@ -205,12 +205,12 @@ patchlevel.h and newer changes are only documented there.
15.07.92 -- 3.2.8
=================
-* ansi.c (WriteString): automatic character set switching for 8bit support
+* ansi.c (WriteString): automatic character set switching for 8-bit support
3.2.3-3.2.7
===========
-* concept changes: Display structure, Multi attacher
+* concept changes: Display structure, Multiattacher
...
@@ -238,7 +238,7 @@ patchlevel.h and newer changes are only documented there.
* screen.c (main): -v option prints version.
* screen.c (MakeWindow): ^A:screen /dev/ttya opens a character device
- instead of forking ShellProg with a pty pair.
+ instead of forking ShellProg with a PTY pair.
3.2.0
=====
@@ -312,13 +312,13 @@ screen 3.0 Patchlevel 6
=======================
.screenrc:
- screen now only opens the windows you explicitly ask for. if you
+ screen now only opens the windows you explicitly ask for. If you
specify none, you still get one window, of course.
screen 3.0. Patchlevel 5
========================
-Ansi prototyping by Christos.
+ANSI prototyping by Christos.
copy mode: CTRL-U / CTRL-D exchanged. code cleanup.
@@ -328,10 +328,10 @@ changes to screen 3.0 patchlevel 4
markkeys "string"
allows to rebind the keys used in copy/history mode.
string is made up of pairs "<oldchar>=<newchar>" which are separated
- by a colon. Oldchar and newchar are either single ascii characters,
- or the two character sequence ^x, where x is an ascii character, or
+ by a colon. Oldchar and newchar are either single ASCII characters,
+ or the two character sequence ^x, where x is an ASCII character, or
a 3 digit octal value prepended with '\'. the string "\040=.:^M=q"
- rebinds '.' to set marks, and the return rey will abort copy mode.
+ rebinds '.' to set marks, and the return key will abort copy mode.
set scrollback 100
resizes the scrollback history buffer to 100 lines. a default of 50
@@ -347,7 +347,7 @@ WriteString fixed, it did kill the display variable.
Yet another LP bugfix.
-non vt100 semi-graphics character support.
+non-VT100 semi-graphics character support.
waynes patch fixed
@@ -366,7 +366,7 @@ screen -wipe
^A : set vbell_msg "Wuff Wuff"
-Thousand enhancements: help resizible, copy'n'paste in main
+Thousand enhancements: help resizable, copy'n'paste in main
socket loop, and no more '\0' hackin'. :WS=\E8;%d;%dt:
screen can now resize windows under sunview.
@@ -394,18 +394,18 @@ pow_detach_msg "text string"
bind 'O' set login off
is valid in your .screenrc as well as typed at the ':' prompt.
a bonus is ":set all" which is synonym to ":help".
- At the Colon prompt also KeyNames can be entered, alothough that makes
+ At the Colon prompt also KeyNames can be entered, although that makes
not always sense.
^A x uses a builtin lockprg, if
a) we don't find our lockprg, or
- b) user supplies us with the environmet variable LOCKPRG set to "builtin"
+ b) user supplies us with the environment variable LOCKPRG set to "builtin"
the builtin locks until your login password is typed. on systems using
"shadow password files" you are prompted for a password.
markroutine can append joined.
-screen removes the "controlling tty" from utmp while ptys are attached.
+screen removes the "controlling TTY" from utmp while PTYs are attached.
markroutine performs CR+NL when '\n' is pressed
@@ -420,7 +420,7 @@ bug in SetForeWindow fixed.
rare markroutine bug fixed.
-we dont open every file the attacher tells us.
+we don't open every file the attacher tells us.
we have now our wonderful "Wuff, Wuff" visual_bell
diff --git a/src/HACKING b/src/HACKING
index b78d40f..9cd0d1a 100644
--- a/src/HACKING
+++ b/src/HACKING
@@ -4,7 +4,7 @@ WIP notes on hacking the Screen source.
The local variable nr is set to an integer value representing the
command to be evaluated; for every command `foo', there is an
integer value RC_FOO for use as nr's value to represent it. Find
- the matching case label to follow procesing of the command.
+ the matching case label to follow processing of the command.
The RC_FOO values are defined in comm.h, which is automatically
generated by comm.sh, based on the names of the commands
diff --git a/src/INSTALL b/src/INSTALL
index ddc8f2f..fe09966 100644
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -40,7 +40,7 @@ sysadmins discuss the location of SOCKDIR, whether it should
be in /tmp or
not. At least it must be on a filesystem that supports sockets/fifos.
SOCKDIR must not point into an AFS (Andrew File System) mounted directory.
If you are uncertain about your NFS implementation, use a UFS directory for
-SOCKDIR. Personally, I favour a users home directory and recommend the the
+SOCKDIR. Personally, I favour a user's home directory and recommend the
/tmp/ area.
The path for ETCSCREENRC may also need to be adapted.
@@ -58,16 +58,16 @@ You can then try 'make install' (if you dare).
--------------------
You may well run screen from your private binary directory and with a
private socket directory like $HOME/.screen. But to have a full featured
-screen and (from a users point of view) more secure pty's you should
+screen and (from a user's point of view) more secure PTYs you should
consult a system administrator and discuss installing screen setuid-root
in some globally accessible directory like /usr/local/bin.
Consider this, when deciding whether you install screen setuid-root:
-- On some machines root privileges are required to open pty's.
-- Pty's should be owned by the user, so that she can do chmod to prevent
+- On some machines root privileges are required to open PTYs.
+- PTYs should be owned by the user, so that she can do chmod to prevent
intruder attacks. The PTYs used by screen will remain world read-writable
if screen is not installed setuid-root.
-- Some commands only work properly when the pty is owned by the user.
+- Some commands only work properly when the PTY is owned by the user.
These include mesg and biff.
- The ^At feature may need to lseek and read the kernel file to retrieve
the load average.
@@ -94,7 +94,7 @@ If so, mail me.
The files screenrc and etc/etcscreenrc are instructive samples that
demonstrate what can/should be done from your private .screenrc and from
$ETCSCREENRC -- do not just copy them. Read them. Look through the
-etcscreenrc file for system wide defaults that you like to set. e.g.
+etcscreenrc file for system wide defaults that you like to set, e.g.
autodetach off, startup_message off, vbell on, ...
Since version 3.2.15 the screenrc file syntax changed slightly. All rc files
from previous versions should be run through the 'newsyntax' script that comes
diff --git a/src/Makefile.in b/src/Makefile.in
index 2d96983..09f1eb9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
#
# Makefile template for screen
#
-# See machine dependant config.h for more configuration options.
+# See machine dependent config.h for more configuration options.
#
srcdir = @srcdir@
diff --git a/src/NEWS.3.5 b/src/NEWS.3.5
index 74bb7bf..f7d95f5 100644
--- a/src/NEWS.3.5
+++ b/src/NEWS.3.5
@@ -17,17 +17,17 @@
* Unification of key bindings and screen commands. All keys now generate
commands.
-* Screen now reads/writes only in asyncronous mode.
+* Screen now reads/writes only in asynchronous mode.
-* Ansi parser speedup code resulting in much faster output of text.
+* ANSI parser speedup code resulting in much faster output of text.
* Changed the rc file syntax. Commands now directly affect the current
window. The default settings are changed with 'def...' commands.
The 'set' keyword no longer exists.
Please run the 'newsyntax' script on your old screenrc files!
-* Emacs style isearch added to copy mode. Try ^A ESC ^R screen ^R ^R
- to locate the last three occurences of the word 'screen' in the
+* Emacs-style isearch added to copy mode. Try ^A ESC ^R screen ^R ^R
+ to locate the last three occurrences of the word 'screen' in the
history buffer.
* New command 'silence'. Alarms the user whenever there was inactivity
@@ -48,9 +48,9 @@
cleared. Enable this with 'autonuke on'.
* Modifications to save memory: Empty attribute and font lines don't
- get allocated. This is very useful if you have a lage scrollback.
+ get allocated. This is very useful if you have a large scrollback.
-* Multi display support:
+* Multidisplay support:
You can now attach from more than one terminal to a session with
the '-x' option.
@@ -64,14 +64,14 @@
Of course he must be in the access control list for a successful
attach (see the acladd/acldel command).
-* Extension to the 'screen' command: You can now specify tty lines
+* Extension to the 'screen' command: You can now specify TTY lines
instead of programs. This can be used for console management.
- Added the command 'break' to send a break to the tty line.
+ Added the command 'break' to send a break to the TTY line.
Not really a new feature, but terminal initialisation now works
on suns.
* Input/output filters added. This has been implemented to allow the
- user to configure an open tty line, but got soon exended to allow
+ user to configure an open TTY line, but got soon exended to allow
all sorts of filters. For more information read the explanation
of the 'exec' command in the man page and check the 'fdpat.ps'
document.
@@ -85,7 +85,7 @@
* Windows can now be selected by akas, too. (Per default bound to the
>'< key.)
-* New terminal capabiliteise CS/CE for cursorkey control.
+* New terminal capabilities CS/CE for cursorkey control.
* setenv/unsetenv commands added.
@@ -114,6 +114,6 @@ Irix, OSF/1, Harris CX/UX, hpux, dynix/ptx, AIX.
And even more thanks to the brave who attempted to use the 'exec'
command features.
- Donnate patches, bugreports, suggestions, money, beer & pizza to
+ Donate patches, bugreports, suggestions, money, beer & pizza to
scr...@uni-erlangen.de
diff --git a/src/NEWS.3.6 b/src/NEWS.3.6
index 6d4360f..e83e45b 100644
--- a/src/NEWS.3.6
+++ b/src/NEWS.3.6
@@ -3,7 +3,7 @@
What's new in screen-3.6 ?
----------------------------
-* Input translation! This makes the vt100 emulation complete.
+* Input translation! This makes the VT100 emulation complete.
As an addition it is now possible to bind any command to any
(function-) key. See the man page for more details (bindkey
command).
@@ -23,10 +23,10 @@
a key.
* New paste syntax: Paste can now concatenate registers and paste
- either on screen or in anouther register.
+ either on screen or in another register.
This makes the old "ins_reg", "copy_reg" commands obsolete.
-* More architecures supported. Screen now runs on AIX3.2.5,
+* More architectures supported. Screen now runs on AIX3.2.5,
Solaris, NeXT and some other exotic platforms.
* Kanji support added. Screen understands JIS, EUC and SJIS coding.
diff --git a/src/NEWS.3.7 b/src/NEWS.3.7
index e398f95..126fb5c 100644
--- a/src/NEWS.3.7
+++ b/src/NEWS.3.7
@@ -20,7 +20,7 @@
%t - title
%n - number (a single % still works)
-* 'defhstatus' command to give everey window a default
+* 'defhstatus' command to give every window a default
hardstatus line. ^E is used as a string escape instead of %
(see above). Try 'defhstatus "Screen: window ^E (^Et)"'
diff --git a/src/NEWS.3.9 b/src/NEWS.3.9
index 4dc7891..abef633 100644
--- a/src/NEWS.3.9
+++ b/src/NEWS.3.9
@@ -4,7 +4,7 @@
* unicode combining character support
-* new encoding: chinese GBK
+* new encoding: Chinese GBK
* new 'backtick' command and string escape to embed command
output into e.g. the hardstatus line
@@ -32,9 +32,9 @@
'register', 'readreg', 'readbuf', 'writebuf' now understand
an extra encoding parameter
-* support for double utf-8 characters
+* support for double UTF-8 characters
-* lots of new string escapes and extensions to existsing ones:
+* lots of new string escapes and extensions to existing ones:
%LD, %LM, %Lw, %W, %-w, %+w, %H, %f, %F, %l, %=, %<, %>
* new commands: 'source', 'eval', 'deflog', 'ignorecase', 'setsid'
@@ -129,8 +129,8 @@
hardstatus [always]message
hardstatus [always]ignore
-* configurable window seperator and hardstatus strings
- The window (region) seperator and the hardstatus can be set to an
+* configurable window separator and hardstatus strings
+ The window (region) separator and the hardstatus can be set to an
arbitrary string containing screen's % escape sequences.
The window's hardstatus is just another escape sequence, '%h'.
New commands:
@@ -138,8 +138,8 @@
caption string [string]
The default strings are "%h" (hardstatus) and "%3n %t" (caption).
-* permanent window seperator
- The window seperator can be set to stay on screen even if
+* permanent window separator
+ The window separator can be set to stay on screen even if
the display contains only one region
New commands:
caption always
@@ -195,7 +195,7 @@
* support for history compaction
You can tell screen to suppress trailing blank lines when
- scolling up text into the history buffer. (Wayne Davison)
+ scrolling up text into the history buffer. (Wayne Davison)
New command:
compacthist
diff --git a/src/README b/src/README
index 8ccf699..0838cf7 100644
--- a/src/README
+++ b/src/README
@@ -10,7 +10,7 @@ Short introduction to screen (Version 4.3.0)
Send bugreports, fixes, enhancements, t-shirts, money, beer & pizza to
screen-devel@gnu.org
-Screen provides you with an ANSI/vt100 terminal emulator, which can multiplex
+Screen provides you with an ANSI/VT100 terminal emulator, which can multiplex
up to 10 pseudo-terminals. On startup, it executes $SHELL in window 0.
Then it reads $HOME/.screenrc to learn configuration, keybindings, and
possibly open more windows.
@@ -32,7 +32,7 @@ possibly open more windows.
C-a a (meta) Send a literal C-a/C-s/C-q to the
C-a s (xoff) process in the window.
- C-a q (xon) For instance, emacs uses C-a and C-s.
+ C-a q (xon) For instance, Emacs uses C-a and C-s.
C-a l (redisplay) Redraw this window.
@@ -49,7 +49,7 @@ possibly open more windows.
C-a C-[ (copy) Start copy mode. Move cursor with h,j,k,l.
Set 2 marks with SPACE or y. Abort with ESC.
- (C-[ is ESC.) Preceeding second mark with
+ (C-[ is ESC.) Preceding second mark with
an a appends the text to the copy buffer.
C-a C-] (paste) Output copy buffer to current window's stdin.
@@ -58,7 +58,7 @@ possibly open more windows.
C-a > (writebuf) Write the copy buffer to
/tmp/screen-exchange.
C-a d (detach) Detach screen. All processes continue
and may
- spool output to their pty's, but screen
+ spool output to their PTYs, but screen
disconnects from your terminal.
C-a D D (pow_detach) Power detach. Disconnect like C-a d but also
@@ -67,7 +67,7 @@ possibly open more windows.
C-a K (kill) Kill a window and send SIGHUP to its
process
group. Per default this would be C-a C-k,
but it is redefined in the demo .screenrc
- (think of killing a whole line in emacs).
+ (think of killing a whole line in Emacs).
C-a : (colon) Online configuration change.
diff --git a/src/TODO b/src/TODO
index 54b2b9f..5cf3871 100644
--- a/src/TODO
+++ b/src/TODO
@@ -1,6 +1,6 @@
- display size adaption (Activate)
- process.c cleanup via comm splitting
-- writelocks?
+- write locks?
- partial?
- type into several windows at once (for cluster admins)
- configurable digraph table
diff --git a/src/acls.c b/src/acls.c
index de7321f..f9ea88c 100644
--- a/src/acls.c
+++ b/src/acls.c
@@ -312,7 +312,7 @@ int UserDel(char *name, struct acluser **up)
UserFreeCopyBuffer(u);
free((char *)u);
if (!users) {
- Finit(0); /* Destroying whole session. Noone could ever
attach again. */
+ Finit(0); /* Destroying whole session. No one could ever
attach again. */
}
return 0;
}
@@ -321,7 +321,7 @@ int UserDel(char *name, struct acluser **up)
* =====================================================================
* UserFreeCopyBuffer-
* frees user buffer
- * Also removes any references into the users copybuffer
+ * Also removes any references into the user's copybuffer
* Returns:
* 0 - if the copy buffer was really deleted.
* -1 - cannot remove something that does not exist
@@ -392,7 +392,7 @@ int AclLinkUser(char *from, char *to)
/*
* The user pointer stored at *up will be substituted by a pointer
* to the named user's structure, if passwords match.
- * returns NULL if successfull, an static error string otherwise
+ * Returns NULL if successful, a static error string otherwise.
*/
char *DoSu(struct acluser **up, char *name, char *pw1, char *pw2)
{
@@ -440,19 +440,19 @@ char *DoSu(struct acluser **up, char *name, char *pw1,
char *pw2)
if (!PasswordMatches(pw2, pass)) {
sorry++;
}
- } else /* no pasword provided */ if (*pass) /* but need one
*/
+ } else /* no password provided */ if (*pass) /* but need one
*/
sorry++;
#endif /* CHECKLOGIN */
if (pw1 && *pw1 && *pw1 != '\377') { /* provided a screen
password */
if (!PasswordMatches(pw1, u->u_password)) {
sorry++;
}
- } else /* no pasword provided */ if (*u->u_password) /* but
need one */
+ } else /* no password provided */ if (*u->u_password) /* but
need one */
sorry++;
}
openlog("screen", LOG_PID, LOG_AUTHPRIV);
- syslog(LOG_NOTICE, "%s: \"su %s\" %s for \"%s\"", SocketPath, name,
sorry ? "failed" : "succeded", (*up)->u_name);
+ syslog(LOG_NOTICE, "%s: \"su %s\" %s for \"%s\"", SocketPath, name,
sorry ? "failed" : "succeeded", (*up)->u_name);
closelog();
if (sorry)
@@ -497,7 +497,7 @@ void FreeWindowAcl(Window *w)
free((char *)w->w_lio_notify);
}
-/* if mode starts with '-' we remove the users exec bit for cmd */
+/* if mode starts with '-' we remove the user's exec bit for cmd */
/*
* NOTE: before you make this function look the same as
* AclSetPermWin, try to merge both functions.
@@ -601,7 +601,7 @@ static int AclSetPermWin(struct acluser *uu, struct acluser
*u, char *mode, Wind
} else {
/*
* Hack. I do not want to duplicate all the above code
for
- * AclSetPermCmd. This asumes that there are not more
bits
+ * AclSetPermCmd. This assumes that there are not more
bits
* per cmd than per win.
*/
for (bit = 0; bit < ACL_BITS_PER_CMD; bit++)
@@ -613,7 +613,7 @@ static int AclSetPermWin(struct acluser *uu, struct acluser
*u, char *mode, Wind
}
/*
- * String is broken down into comand and window names, mode applies
+ * String is broken down into command and window names, mode applies
* A command name matches first, so do not use these as window names.
* uu should be NULL, except if you want to change his umask.
*/
@@ -766,7 +766,7 @@ int UsersAcl(struct acluser *uu, int argc, char **argv)
}
/*
- * Preprocess argments, so that umask can be set with UsersAcl
+ * Preprocess arguments, so that umask can be set with UsersAcl
*
* all current users umask ±rwxn
* one specific user umask user1±rwxn
diff --git a/src/acls.h b/src/acls.h
index 348754b..5c90078 100644
--- a/src/acls.h
+++ b/src/acls.h
@@ -54,7 +54,7 @@ typedef unsigned char * AclBits;
*/
struct aclusergroup
{
- struct acluser *u; /* the user who borrows us his rights */
+ struct acluser *u; /* the user who lends us his rights */
struct aclusergroup *next;
};
@@ -79,9 +79,9 @@ typedef struct acluser
char u_name[MAXLOGINLEN + 1]; /* login name how he showed up
*/
int u_detachwin; /* the window where he last detached */
int u_detachotherwin; /* window that was "other" when he detached */
- int u_Esc, u_MetaEsc; /* the users screen escape character */
+ int u_Esc, u_MetaEsc; /* the user's screen escape character */
struct plop u_plop;
- int u_id; /* a uniq index in the bitfields. */
+ int u_id; /* a unique index in the bitfields. */
AclBits u_umask_w_bits[ACL_BITS_PER_WIN]; /* his window create umask */
struct aclusergroup *u_group; /* linked list of pointers to other
users */
} User;
diff --git a/src/ansi.c b/src/ansi.c
index 9ee4ffa..afd755b 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -204,7 +204,7 @@ void SetCharsets(Window *win, char *s)
/*****************************************************************/
/*
- * Here comes the vt100 emulator
+ * Here comes the VT100 emulator
* - writes logfiles,
* - sets timestamp and flags activity in window.
* - record program output in window scrollback
@@ -1080,7 +1080,7 @@ static void DoCSI(Window *win, int c, int intermediate)
WNewAutoFlow(win, !i);
#endif /* !TIOCPKT */
break;
- case 2: /* ANM: ansi/vt52 mode */
+ case 2: /* ANM: ANSI/VT52 mode */
if (i) {
if (win->w_encoding)
break;
@@ -1138,7 +1138,7 @@ static void DoCSI(Window *win, int c, int intermediate)
/* case 36: HEM: hebrew encoding */
/* case 38: TeK Mode */
/* case 40: 132 col enable */
- /* case 42: NRCM: 7bit NRC character mode
*/
+ /* case 42: NRCM: 7-bit NRC character
mode */
/* case 44: margin bell enable */
case 47: /* xterm-like alternate screen */
case 1047: /* xterm-like alternate screen */
@@ -1334,7 +1334,7 @@ static void PrintStart(Window *win)
{
win->w_pdisplay = NULL;
- /* find us a nice display to print on, fore prefered */
+ /* find us a nice display to print on, fore preferred */
display = win->w_lastdisp;
if (!(display && win== D_fore && (printcmd || D_PO)))
for (display = displays; display; display = display->d_next)
@@ -1686,7 +1686,7 @@ static void ASetMode(Window *win, bool on)
LAY_DISPLAYS(&win->w_layer, InsertMode(on));
break;
/* case 12: SRM: Echo mode on */
- case 20: /* LNM: Linefeed mode */
+ case 20: /* LNM: Line feed mode */
win->w_autolf = on;
break;
case 34:
@@ -1729,8 +1729,8 @@ static void SelectRendition(Window *win)
}
continue;
}
- /* truecolor (24bit) colour space; example escape
\e[48;5;12;13;14m
- * where 12;13;14 are rgb values */
+ /* True color (24-bit) colour space; example escape
\e[48;5;12;13;14m
+ * where 12;13;14 are RGB values */
if ((j == 38 || j == 48) && i + 4 < win->w_NumArgs &&
win->w_args[i + 1] == 2) {
uint8_t r, g, b;
@@ -1876,7 +1876,7 @@ static void RestorePosRendition(Window *win)
static void Report(Window *win, char *fmt, int n1, int n2)
{
int len;
- char rbuf[40]; /* enough room for all replys */
+ char rbuf[40]; /* enough room for all replies */
sprintf(rbuf, fmt, n1, n2);
len = strlen(rbuf);
diff --git a/src/attacher.c b/src/attacher.c
index d8de9d4..7560de0 100644
--- a/src/attacher.c
+++ b/src/attacher.c
@@ -89,7 +89,7 @@ static void QueryResultFail(int sigsig)
* MSG_CONT, MSG_WINCH and nothing else!
*
* if type == MSG_ATTACH and sockets are used, attaches
- * tty filedescriptor.
+ * TTY file descriptor.
*/
static int WriteMessage(int sock, Message *msg)
@@ -237,7 +237,7 @@ int Attach(int how)
ContinuePlease = false;
if (how != MSG_ATTACH)
return 0; /* we detached it. jw. */
- sleep(1); /* we dont want to overrun our poor backend.
jw. */
+ sleep(1); /* we don't want to overrun our poor backend.
jw. */
if ((lasts = MakeClientSocket(0)) == -1)
Panic(0, "Cannot contact screen again. Sigh.");
m.type = how;
diff --git a/src/configure.ac b/src/configure.ac
index 05b9c39..e8853c0 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -36,10 +36,10 @@ AH_TEMPLATE([SOCKET_DIR], [Path to socket directory])
dnl -
AH_TEMPLATE([SYSTEM_SCREENRC], [Path to system screenrc])
-dnl - pty settings
-AH_TEMPLATE([PTY_MODE], [Default mode for pty devices])
-AH_TEMPLATE([PTY_GROUP], [Default group for pty devices])
-AH_TEMPLATE([PTY_ROFS], [pty devices are on read only filesystem])
+dnl - PTY settings
+AH_TEMPLATE([PTY_MODE], [Default mode for PTY devices])
+AH_TEMPLATE([PTY_GROUP], [Default group for PTY devices])
+AH_TEMPLATE([PTY_ROFS], [PTY devices are on read-only filesystem])
dnl
@@ -224,15 +224,15 @@ echo " utmp support: .............................
$enable_utmp"
echo " global socket directory: .................. $enable_socket_dir"
echo ""
echo " system screenrc location: ................. $with_system_screenrc"
-echo " pty mode: ................................. $with_pty_mode"
-echo " pty group: ................................ $with_pty_group"
-echo " pty on read only file system: ............. $with_pty_rofs"
+echo " PTY mode: ................................. $with_pty_mode"
+echo " PTY group: ................................ $with_pty_group"
+echo " PTY on read-only file system: ............. $with_pty_rofs"
echo ""
AS_IF([test "x$enable_pam" != "xyes"], [
echo "!!! WARNING !!!"
echo "YOU ARE DISABLING PAM SUPPORT!"
- echo "FOR screen TO WORK IT WILL NEED TO RUN AS SUID root BINARY"
+ echo "FOR screen TO WORK IT WILL NEED TO RUN AS SUID-root BINARY"
echo "THIS CONFIGURATION IS _HIGHLY_ NOT RECOMMENDED!"
echo "!!! WARNING !!!"
])
diff --git a/src/display.c b/src/display.c
index 0ec6c33..1fe0b69 100644
--- a/src/display.c
+++ b/src/display.c
@@ -728,7 +728,7 @@ void GotoPos(int x2, int y2)
/* Calculate the cost to move the cursor to the right x position */
costx = EXPENSIVE;
- if (x1 >= 0) { /* relativ x positioning only if we know where
we are */
+ if (x1 >= 0) { /* relative x positioning only if we know where
we are */
if (dx > 0) {
if (D_CRI && (dx > 1 || !D_ND)) {
costx = CalcCost(tgoto(D_CRI, 0, dx));
@@ -1170,7 +1170,7 @@ void SetAttr(int new)
AddCStr(D_SE);
if ((typ & ATYP_M)) {
AddCStr(D_ME);
- /* ansi attrib handling: \E[m resets color, too */
+ /* ANSI attrib handling: \E[m resets color, too */
if (D_hascolor)
D_rend.colorbg = D_rend.colorfg = 0;
if (!D_CG0) {
@@ -1273,7 +1273,7 @@ int color256to88(int color)
/*
* SetColor - Sets foreground and background color
* 0x00000000 <- default color ("transparent")
- * one note here that "null" variable is pointer to array of 0 and that's
one of reasons to use it this way
+ * one note here that "null" variable is pointer to array of 0 and that's
one of the reasons to use it this way
* 0x0100000x <- 16 base color
* 0x020000xx <- 256 color
* 0x04xxxxxx <- truecolor
@@ -1691,7 +1691,7 @@ void ShowHStatus(char *str)
}
/*
- * Refreshes the harstatus of the fore window. Shouldn't be here...
+ * Refreshes the hardstatus of the fore window. Shouldn't be here...
*/
void RefreshHStatus(void)
{
@@ -2395,7 +2395,7 @@ void NukePending(void)
}
}
-/* linux' select can't handle flow control, so wait 100ms if
+/* linux' select can't handle flow control, so wait 100 ms if
* we get EAGAIN
*/
static void disp_writeev_eagain(Event *event, void *data)
diff --git a/src/display.h b/src/display.h
index 531b9c8..d73b531 100644
--- a/src/display.h
+++ b/src/display.h
@@ -98,7 +98,7 @@ struct Display {
/* >0: block after nonblock secs */
char d_termname[MAXTERMLEN + 1]; /* $TERM */
char *d_tentry; /* buffer for tgetstr */
- char d_tcinited; /* termcap inited flag */
+ char d_tcinited; /* termcap initialised flag */
int d_width, d_height; /* width/height of the screen */
int d_defwidth, d_defheight; /* default width/height of
windows */
int d_top, d_bot; /* scrollregion start/end */
@@ -142,18 +142,18 @@ struct Display {
int d_kaablamm; /* display kaablamm msg */
struct action *d_ESCseen; /* Was the last char an ESC (^a) */
pid_t d_userpid; /* pid of attacher */
- char d_usertty[MAXPATHLEN]; /* tty we are attached to */
- int d_userfd; /* fd of the tty */
+ char d_usertty[MAXPATHLEN]; /* TTY we are attached to */
+ int d_userfd; /* fd of the TTY */
Event d_readev; /* userfd read event */
Event d_writeev; /* userfd write event */
Event d_blockedev; /* blocked timeout */
- struct mode d_OldMode; /* tty mode when screen was started */
- struct mode d_NewMode; /* New tty mode */
- int d_flow; /* tty's flow control on/off flag*/
+ struct mode d_OldMode; /* TTY mode when screen was started */
+ struct mode d_NewMode; /* New TTY mode */
+ int d_flow; /* TTY's flow control on/off flag */
int d_intrc; /* current intr when flow is on */
char *d_obuf; /* output buffer */
int d_obuflen; /* len of buffer */
- int d_obufmax; /* len where we are blocking the pty */
+ int d_obufmax; /* len where we are blocking the PTY */
int d_obuflenmax; /* len - max */
char *d_obufp; /* pointer in buffer */
int d_obuffree; /* free bytes in buffer */
@@ -306,7 +306,7 @@ struct Display {
#define GRAIN 4096 /* Allocation grain size for output buffer */
#define OBUF_MAX 256 /* default for obuflimit */
-#define OUTPUT_BLOCK_SIZE 256 /* Block size of output to tty */
+#define OUTPUT_BLOCK_SIZE 256 /* Block size of output to TTY */
#define AddChar(c) \
do \
diff --git a/src/doc/FAQ b/src/doc/FAQ
index 07af9a5..af1d404 100644
--- a/src/doc/FAQ
+++ b/src/doc/FAQ
@@ -15,7 +15,7 @@ A: Screen always interprets control-sequences sent
by the
cannot be switched off. Even if it were possible to switch
screen into a completely transparent mode, you could never switch
between windows, while kermit/sz/rz is downloading a file. You
- must wait til the end as kermit/sz/rz will not transmit your
+ must wait till the end as kermit/sz/rz will not transmit your
input during a file transfer and as kermit/sz/rz would be very
confused if screen switched away the window containing the
other kermit/sz/rz. Simply detach your screen session for each
@@ -43,16 +43,16 @@ Q: For some unknown reason, the fifo in
/tmp/screens/S-myname is
A: Screen checks the fifo/socket whenever it receives a SIGCHLD
signal. If missing, the fifo/socket is recreated then. If screen
- is running non set-uid the user can issue a 'kill -CHLD
+ is running non setuid the user can issue a 'kill -CHLD
screenpid' directly (it is -CHILD on some systems). Screenpid is
the process-id of the screen process found in a 'ps -x' listing.
But usually this won't work, as screen should be installed set-
uid root. In this case you will not be able to send it a signal,
but the kernel will. It does so, whenever a child of screen
changes its state. Find the process-id (shellpid below) of the
- "least important" shell running inside screen. The try 'kill
+ "least important" shell running inside screen. Then try 'kill
-STOP shellpid'. If the fifo/socket does not reappear, destroy
- the shell process. You sacrify one shell to save the rest. If
+ the shell process. You sacrifice one shell to save the rest. If
nothing works, please do not forget to remove all processes
running in the lost screen session.
@@ -62,15 +62,15 @@ Q: When you start "screen" a page of text comes up to
start you
A: Just put the following line in your ~/.screenrc:
startup_message off
- Many peole ask this, although it is in the man page, too :-)
+ Many people ask this, although it is in the man page, too :-)
-Q: Start "screen emacs" and run emacs function suspend-emacs
- (ctrl-z). The window containing emacs vanishes.
+Q: Start "screen emacs" and run Emacs function suspend-emacs
+ (ctrl-z). The window containing Emacs vanishes.
-A: This is a known bug. Unfortunatly there is no easy fix
+A: This is a known bug. Unfortunately there is no easy fix
because this is specified in the POSIX standard. When a new
window is created Screen opens up a new session because the
- window has to get the pty as a controlling terminal (a
+ window has to get the PTY as a controlling terminal (a
session can only have one controlling terminal). With the
setsid() call the process also creates a new process
group. This process group is orphaned, because there is no
@@ -95,7 +95,7 @@ A: Before you start screen: Check with 'stty -a' what the
terminal
driver thinks about rows and columns. Check the environment
variables LINES and COLUMNS. Then from within screen check with
the info command (CTRL-A i) what size screen thinks your terminal
- is. If correcting tty driver setting and environment variables
+ is. If correcting TTY driver setting and environment variables
does not help, look up the terminal capability definition. First
the TERMCAP environment variable. If this is not set, look up the
terminals name as defined in the environment variable TERM in
@@ -120,7 +120,7 @@ A: Probably you got the termcap/terminfo entries wrong.
Fixing this
should check the terminfo/termcap databases there. If you cannot
tell if terminfo or termcap is used (or you just want to be
save), the do all steps in stage 3 in parallel for both
- systems (on all envolved hosts). Second: Understand the basic
+ systems (on all involved hosts). Second: Understand the basic
rules how screen does its terminal emulation. When screen is
started or reattached, it relies on the TERM environment variable
to correctly reflect the terminal type you have physically
@@ -156,7 +156,7 @@ A: Probably you got the termcap/terminfo entries wrong.
Fixing this
Q: I cannot configure screen. Sed does not work.
-A: The regular expressions used in our configure scrip are too
+A: The regular expressions used in our configure script are too
complicated for GNU sed version 2.03. In this regard it is bug
compatible with Ultrix 3.1 "sed": GNU sed version 2.03 dumps
core with our configure script. Try an older release. E.g. from
@@ -175,12 +175,12 @@ A: Under unix every process has its own environment.
The environ-
Screen is a means for keeping processes alive.
Q: About once every 5 times I ran the program, rather than getting
- a "screen," I got someone elses IRC output/input.
+ a "screen," I got someone else's IRC output/input.
A: What probably happened is that an IRC process was left running on
- a pseudo tty in such a way that the kernel thought the tty was
+ a pseudo-TTY in such a way that the kernel thought the TTY was
available for reallocation. You can fix this behaviour by
- applying the SunOS 4.1.x tty jumbo patch (100513-04).
+ applying the SunOS 4.1.x TTY jumbo patch (100513-04).
Q: Screen compiled on SunOS 5.3 cannot reattach a detached session.
@@ -195,12 +195,12 @@ A: Talk and several other programs rely on entries
in the Utmp-
writable, on others it is not. If it is not, screen must be
installed with the appropriate permissions (user or group s-bit)
just like any program that uses PTYs (rlogin, xterm, ...). When
- screen cannot write to utmp, you will see messages on you display
- which do not belong to any screen window.
+ screen cannot write to utmp, you will see messages on your
+ display which do not belong to any screen window.
When screen can update utmp, it is not guaranteed that it does as
you expect. First this depends on the config.h file defining
ENABLE_UTMP, LOGINDEFAULT, and perhaps CAREFULUTMP. Second it
- depends on the screenrc files (system wide and per user), if utmp
+ depends on the screenrc files (system-wide and per user), if utmp
entries are done. Third, you can control whether windows are
logged in with screens ``login'' command.
@@ -219,16 +219,16 @@ A: You display the current working directory in
xterm's title bar,
or in an cd alias. In Xterm the coding is
ESC ] n ; string_to_display ^G
where n = 1, 2, 3 selects the location of the displayed string.
- Screen misinterprets this as the ansi operating system comment
+ Screen misinterprets this as the ANSI operating system command
sequence:
ESC ] osc_string
- and waits (according to ansi) for the string terminator
+ and waits (according to ANSI) for the string terminator
ESC \
Screen versions after 3.5.12 may provide a workaround.
Q: Mesg or biff cannot be turned on or off while running screen.
-A: Screen failed to change the owner of the pty it uses. You need to
+A: Screen failed to change the owner of the PTY it uses. You need to
install screen setuid-root. See the file INSTALL for details.
Q: The cursor left key deletes the characters instead of just moving the
diff --git a/src/doc/README.DOTSCREEN b/src/doc/README.DOTSCREEN
index f17fa37..75ad441 100644
--- a/src/doc/README.DOTSCREEN
+++ b/src/doc/README.DOTSCREEN
@@ -44,16 +44,16 @@ Quick introduction to dotscreen
1. Introduction
===============
-Dotscreen, is a system which allow a person direct access to unix via
+Dotscreen, is a system which allows a person direct access to unix via
a braille display. The emphasis is on direct, because the braille
display is connected directly to the serial port on the unix
machine. You no longer must use a dos machine running a terminal
emulation logged into a unix machine. Dotscreen is built on top of
-screen, a powerful full-screen window manager for unix tty terminals.
+screen, a powerful full-screen window manager for unix TTY terminals.
Screen keeps track of what is being displayed in each window that it
is managing so that it can easily switch back and forth between these
windows. Dotscreen makes this stored window information available via
-a braille display. Dotscreen only allows access to tty terminal
+a braille display. Dotscreen only allows access to TTY terminal
sessions, it does not allow access to X-Windows, however, it will run
in an xterm window. Currently, it works with the TSI Navigator 40 and
the TSI PowerBraille 40 braille displays. We plan to support other
@@ -103,10 +103,10 @@ bd_start_braille on/off # Starts/stops using braille
features on screen
bd_link on/off # links/unlinks braille cursor to/from screen
cursor
bd_bell on/off # turn on/off sending bell-signal to terminal
bd_scroll on/off # enables/disables scrolling
-bd_skip on/off # skip/don't skip balnk lines
+bd_skip on/off # skip/don't skip blank lines
bd_width <integer-value> # number of braille cells that user want to use,
# this value is always <= total number of cells
-bd_ncrc <interger-value> # number of cells displayed on the right side
+bd_ncrc <integer-value> # number of cells displayed on the right side
# of physical cursor (default = 1)
bd_info <integer-value> # displays braille/screen cursor position
# depending on its value, (no info: 0, only
diff --git a/src/doc/make.help b/src/doc/make.help
index 5871773..708eea2 100644
--- a/src/doc/make.help
+++ b/src/doc/make.help
@@ -25,8 +25,8 @@
# -fomit-frame-pointer -finline-functions -bsd # NeXT
#M_CFLAGS= -qlanglvl=ansi # RS6000/AIX
#M_CFLAGS= -qlanglvl=ansi -D_AIX32 # RS6000/AIX 3.2
-#M_CFLAGS= -ansi # sgi/IRIX 3.x ansi
-#M_CFLAGS= -xansi # sgi/IRIX 4.x ext ansi
+#M_CFLAGS= -ansi # sgi/IRIX 3.x ANSI
+#M_CFLAGS= -xansi # sgi/IRIX 4.x ext ANSI
#M_CFLAGS= -YBSD # Ultrix 4.x
#M_CFLAGS= -DSVR4=1 # Bob Kline r...@blink.att.com 80386 Unix SVR4.0
#M_CFLAGS= -D_CX_UX # Ken Beal kb...@amber.ssd.csd.harris.com Harris CX/UX
diff --git a/src/doc/screen.1 b/src/doc/screen.1
index ecd5632..a923851 100644
--- a/src/doc/screen.1
+++ b/src/doc/screen.1
@@ -400,7 +400,7 @@ See the \fB-r\fP flag for a description how to construct
matches.
.B \-x
Attach to a not detached
.I screen
-session. (Multi display mode).
+session. (Multidisplay mode).
.I Screen
refuses to attach from within itself.
But when cascading multiple screens, loops are not detected; take care.
@@ -838,10 +838,10 @@ Enable users to fully access this screen session.
\fIUsernames\fP can be one
user or a comma separated list of users. This command enables to attach to the
.I screen
session and performs the equivalent of `aclchg \fIusernames\fP +rwx \&"#?\&"'.
-executed. To add a user with restricted access, use the `aclchg' command below.
+To add a user with restricted access, use the `aclchg' command below.
If an optional second parameter is supplied, it should be a crypted password
for the named user(s). `Addacl' is a synonym to `acladd'.
-Multi user mode only.
+Multiuser mode only.
.RE
.TP
.BI aclchg " usernames permbits list"
@@ -858,9 +858,9 @@ all known users are affected.
.PP
A command can be executed when the user has the `x' bit for it.
The user can type input to a window when he has its `w' bit set and no other
-user obtains a writelock for this window.
+user obtains a write lock for this window.
Other bits are currently ignored.
-To withdraw the writelock from another user in window 2:
+To withdraw the write lock from another user in window 2:
`aclchg \fIusername\fP \-w+w 2'.
To allow read-only access to the session: `aclchg \fIusername\fP
\-w \&"#\&"'. As soon as a user's name is known to
@@ -872,7 +872,7 @@ Rights of the special username
.B nobody
cannot be changed (see the \*Qsu\*U command).
`Chacl' is a synonym to `aclchg'.
-Multi user mode only.
+Multiuser mode only.
.RE
.TP
.BI acldel " username"
@@ -882,7 +882,7 @@ Remove a user from
.IR screen 's
access control list. If currently attached, all the
user's displays are detached from the session. He cannot attach again.
-Multi user mode only.
+Multiuser mode only.
.RE
.TP
.BI aclgrp " username " \fR[\fP groupname \fR]\fP
@@ -967,7 +967,7 @@ non-unique context, the command will be executed multiple
times. If the first
parameter is of the form `\fIidentifier\fP*' then identifier is matched against
user names. The command is executed once for each display of the selected
user(s). If the first parameter is of the form `\fIidentifier\fP%' identifier
-is matched against displays. Displays are named after the ttys they
+is matched against displays. Displays are named after the TTYs they
attach. The prefix `/dev/' or `/dev/tty' may be omitted from the identifier.
If \fIidentifier\fP has a `#' or nothing appended it is matched against
window numbers and titles. Omitting an identifier in front of the `#', `*' or
@@ -1193,7 +1193,7 @@ name (selectable with the
option).
.PP
Some keys on a VT100 terminal can send a different
-string if application mode is turned on (e.g the cursor keys).
+string if application mode is turned on (e.g. the cursor keys).
Such keys have two entries in the translation table. You can
select the application mode entry by specifying the
.B \-a
@@ -1254,7 +1254,7 @@ escape (besides ^A).
.RS 0
.PP
Send a break signal for \fIduration\fP*0.25 seconds to this window.
-For non-Posix systems the time interval may be rounded up to full seconds.
+For non-POSIX systems the time interval may be rounded up to full seconds.
Most useful if a character device is attached to the window rather than
a shell process (See also chapter \*QWINDOW TYPES\*U). The maximum duration of
a break signal is limited to 15 seconds.
@@ -1519,8 +1519,8 @@ _
\fBB\fP, \fBE\fP@move the cursor WORD by WORD (as in vi).
_
\fBf/F\fP, \fBt/T\fP@T{
-move the cursor forward/backward to the next occurence of the
-target. (eg, '3fy' will move the cursor to the 3rd 'y' to the right.)
+move the cursor forward/backward to the next occurrence of the
+target. (e.g. '3fy' will move the cursor to the 3rd 'y' to the right.)
T}
_
\fB;\fP and \fB,\fP@T{
@@ -1541,11 +1541,11 @@ _
_
.TE
.\"\fBf\fP,\fBt\fP, \fBF\fP, \fBT\fP@T{
-.\"move the cursor forward/backward to the next occurence of the target.
+.\"move the cursor forward/backward to the next occurrence of the target.
.\"T}
.PP
-Note: Emacs style movement keys can be customized by a .screenrc
+Note: Emacs-style movement keys can be customized by a .screenrc
command. (E.\|g. markkeys "h=^B:l=^F:$=^E") There is no simple method
for a full emacs-style keymap, as this involves multi-character codes.
.PP
@@ -1573,7 +1573,7 @@ is taken as a repeat count.
Example: \*QC-a C-[ H 10 j 5 Y\*U will copy lines
11 to 15 into the paste buffer.
.PP
-The folllowing search keys are defined:
+The following search keys are defined:
.IP
\fB/\fP \fIVi\fP-like search forward.
.IP
@@ -1791,7 +1791,7 @@ is changed. This is initialized with `on' as distributed
(see config.h.in).
.BI "defmode " mode
.RS 0
.PP
-The mode of each newly allocated pseudo-tty is set to \fImode\fP.
+The mode of each newly allocated pseudo-TTY is set to \fImode\fP.
\fIMode\fP is an octal number.
When no \*Qdefmode\*U command is given, mode 0622 is used.
.RE
@@ -1872,7 +1872,7 @@ windows is changed. Initially line-wrap is on and can be
toggled with the
.RS 0
.PP
Same as the \fBwritelock\fP command except that the default setting for new
-windows is changed. Initially writelocks will off.
+windows is changed. Initially write locks are off.
.RE
.TP
.BR "detach " [ \-h ]
@@ -1986,7 +1986,7 @@ Window permissions indicators
lsssss
l l l l l l.
Indicators of permissions suppressed by a foreign wlock
-\fBR\fR:read only:\fB.\fR:no write::
+\fBR\fR:read-only:\fB.\fR:no write::
.TE
.PP
.RS
@@ -2099,7 +2099,7 @@ Parses and executes each argument as separate command.
.PP
Run a unix subprocess (specified by an executable path \fInewcommand\fP and
its
optional arguments) in the current window. The flow of data between
-newcommands stdin/stdout/stderr, the process originally started in the window
+newcommand's stdin/stdout/stderr, the process originally started in the window
(let us call it "application-process") and screen itself (window) is
controlled by the file descriptor pattern fdpat.
This pattern is basically a three character sequence representing stdin, stdout
@@ -2124,8 +2124,8 @@ windows process.
Refer to the postscript file `doc/fdpat.ps' for a confusing illustration
of all 21 possible combinations. Each drawing shows the digits 2,1,0
representing the three file descriptors of newcommand. The box marked
-`W' is the usual pty that has the application-process on its slave side.
-The box marked `P' is the secondary pty that now has
+`W' is the usual PTY that has the application-process on its slave side.
+The box marked `P' is the secondary PTY that now has
.I screen
at its master side.
.PP
@@ -2154,7 +2154,7 @@ exec ! stty 19200
.TP
!!stty 19200
.sp 1
-Set the speed of the window's tty. If your stty command operates on stdout,
+Set the speed of the window's TTY. If your stty command operates on stdout,
then add another `!'.
.TP
exec !..| less
@@ -2168,7 +2168,7 @@ window's process. This works, because
listens on stderr (a behavior that
.I screen
would not expect without the `|')
-when its stdin is not a tty.
+when its stdin is not a TTY.
.I Less
versions newer than 177 fail miserably here; good old
.I pg
@@ -2255,7 +2255,7 @@ Note that \fBk\fP is traditionally bound to the
\fIkill\fP command.
This forces any currently selected region to be automatically
resized at least a certain \fIwidth\fP and \fIheight\fP. All
other surrounding regions will be resized in order to accommodate.
-This constraint follows everytime the \*Qfocus\*U command is
+This constraint follows every time the \*Qfocus\*U command is
used. The \*Qresize\*U command can be used to increase either
dimension of a region, but never below what is set with
\*Qfocusminsize\*U. The underscore `_' is a synonym for
@@ -2595,7 +2595,7 @@ regions. This arrangement is restored when a \fIscreen\fP
session
is reattached or switched back from a different layout. If the
session ends or the \fIscreen\fP process dies, the layout
arrangements are lost. The \fBlayout dump\fP command should help
-in this siutation. If a number
+in this situation. If a number
or title is supplied, \fIscreen\fP will remember the arrangement of
that particular layout. Without any options, \fIscreen\fP will
remember the current layout.
@@ -2607,7 +2607,7 @@ Saving your regions can be done automatically by using the
.BR "layout autosave " [\fBon|off\fP]
.RS 0
.PP
-Change or display the status of automatcally saving layouts. The
+Change or display the status of automatically saving layouts. The
default is \fBon\fP, meaning when \fIscreen\fP is detached or
changed to a different layout, the arrangement of regions and windows
will be remembered at the time of change and restored upon return.
@@ -2752,7 +2752,7 @@ Like mapdefault, but don't even look in the default
bindkey table.
Set the inter-character timer for input sequence detection to a timeout
of
.I timeout
-ms. The default timeout is 300ms. Maptimeout with no arguments shows
+ms. The default timeout is 300 ms. Maptimeout with no arguments shows
the current setting.
See also \*Qbindkey\*U.
.RE
@@ -2957,7 +2957,7 @@ Other registers can be filled with the \fIregister\fP,
\fIreadreg\fP and
\fIpaste\fP commands.
If \fIpaste\fP is called with a second argument, the contents of the specified
registers is pasted into the named destination register rather than
-the window. If '.' is used as the second argument, the displays paste buffer is
+the window. If '.' is used as the second argument, the display's paste buffer
is
the destination.
Note, that \*Qpaste\*U uses a wide variety of resources: Whenever a second
argument is specified no current window is needed. When the source
specification
@@ -2973,7 +2973,7 @@ Tell
.I screen
to include font information in the paste buffer. The
default is not to do so. This command is especially useful for
-multi character fonts like kanji.
+multicharacter fonts like kanji.
.RE
.TP
.B pow_break
@@ -3018,7 +3018,7 @@ If
is not an empty string,
.I screen
will not use the terminal capabilities
-\*Qpo/pf\*U if it detects an ansi print sequence
+\*Qpo/pf\*U if it detects an ANSI print sequence
.BR "ESC [ 5 i" ,
but pipe the output into
.IR cmd .
@@ -3026,7 +3026,7 @@ This should normally be a command like \*Qlpr\*U or
\*Q'cat > /tmp/scrprint'\*U.
.B printcmd
without a command displays the current setting.
-The ansi sequence
+The ANSI sequence
.B "ESC \e"
ends printing and closes the pipe.
.PP
@@ -3188,7 +3188,7 @@ Without any arguments,
.I screen
will prompt for how you would like to resize the current region.
-See \*Qfocusminsize\*U if you want to restrict the minimun size a region
+See \*Qfocusminsize\*U if you want to restrict the minimum size a region
can have.
.RE
.RE
@@ -3273,7 +3273,7 @@ environment variables will still reflect the old name in
pre-existing
shells. This may result in confusion. Use of this command is generally
discouraged. Use the \*Q\-S\*U command-line option if you want to
name a new session.
-The default is constructed from the tty and host names.
+The default is constructed from the TTY and host names.
.RE
.TP
.IR "\fBsetenv\fR " [ var " [" string ]]
@@ -3301,7 +3301,7 @@ only in rare circumstances.
.PP
Set the command to be used to create a new shell.
This overrides the value of the environment variable $SHELL.
-This is useful if you'd like to run a tty-enhancer which is expecting to
+This is useful if you'd like to run a TTY-enhancer which is expecting to
execute the program specified in $SHELL.
If the command begins with a '\-' character, the shell will be started as a
login-shell. Typical shells do only minimal initialization when not started as
a login-shell.
@@ -3837,7 +3837,7 @@ In addition to access control lists, not all users may be
able to write to
the same window at once. Per default, writelock is in `auto' mode and
grants exclusive input permission to the user who is the first to switch
to the particular window. When he leaves the window, other users may obtain
-the writelock (automatically). The writelock of the current window is disabled
+the write lock (automatically). The write lock of the current window is
disabled
by the command \*Qwritelock off\*U. If the user issues the command
\*Qwritelock on\*U he keeps the exclusive write permission while switching
to other windows.
@@ -3865,7 +3865,7 @@ If the mode is set to \*Qpass\*U, screen will relay all
data
to the attacher until the end of the transmission is reached.
In \*Qcatch\*U mode screen acts as a zmodem endpoint and starts
the corresponding rz/sz commands. If the mode is set to \*Qauto\*U,
-screen will use \*Qcatch\*U if the window is a tty (e.g. a serial line),
+screen will use \*Qcatch\*U if the window is a TTY (e.g. a serial line),
otherwise it will use \*Qpass\*U.
.PP
You can define the templates screen uses in \*Qcatch\*U mode
@@ -3954,7 +3954,7 @@ other system command that could be executed from a shell
(e.g.
etc...)
.IP \(bu
-If a tty (character special device) name (e.g. \*Q/dev/ttya\*U)
+If a TTY (character special device) name (e.g. \*Q/dev/ttya\*U)
is specified as the first parameter, then the window is directly connected to
this device.
This window type is similar to \*Qscreen cu \-l /dev/ttya\*U.
@@ -3979,7 +3979,7 @@ options cause the terminal driver to make up the
parameter values of the
connection. These values are system dependent and may be in defaults or values
saved from a previous connection.
.PP
-For tty windows, the
+For TTY windows, the
.B info
command shows some of the modem control lines
in the status line. These may include `RTS', `CTS', 'DTR', `DSR', `CD' and
more.
@@ -3995,7 +3995,7 @@ inside curly braces ({ and }).
When the CRTSCTS or TIOCSOFTCAR bit is set, the signals `CTS' or `CD'
are shown in parenthesis, respectively.
.PP
-For tty windows, the command
+For TTY windows, the command
.B break
causes the Data transmission line (TxD) to go low for a specified period of
time. This is expected to be interpreted as break signal on the other side.
@@ -4238,7 +4238,7 @@ and 'automatic' interactively with the \*Qflow\*U command
bound to "C-a f".
.PP
The automatic flow-switching mode deals with
flow control using the TIOCPKT mode (like \*Qrlogin\*U does). If
-the tty driver does not support TIOCPKT,
+the TTY driver does not support TIOCPKT,
.I screen
tries to find out
the right mode based on the current setting of the application
@@ -4860,7 +4860,7 @@ Ps = \fB4\fP (A)
Insert Mode
.TP 27
Ps = \fB20\fP (A)
-\fIAutomatic Linefeed\fP Mode
+\fIAutomatic Line feed\fP Mode
.TP 27
Ps = \fB34\fP
Normal Cursor Visibility
@@ -5097,7 +5097,7 @@ The things in braces may be repeated any number of times.
A \fI<charset-mapping>\fP tells
.I screen
how to map characters
-in font \fI<designator>\fP ('B': Ascii, 'A': UK, 'K': German, etc.)
+in font \fI<designator>\fP ('B': ASCII, 'A': UK, 'K': German, etc.)
to strings. Every \fI<mapping>\fP describes to what string a single
character will be translated. A template mechanism is used, as
most of the time the codes have a lot in common (for example
@@ -5340,8 +5340,8 @@ capabilities to $TERMCAP may not have any effects.
does not make use of hardware tabs.
.IP \(bu
.I Screen
-must be installed as set-uid with owner root on most systems in order
-to be able to correctly change the owner of the tty device file for
+must be installed as setuid with owner root on most systems in order
+to be able to correctly change the owner of the TTY device file for
each window.
Special permission may also be required to write the file \*Q/etc/utmp\*U.
.IP \(bu
@@ -5352,7 +5352,7 @@ This will cause some programs (like "w" or "rwho")
to advertise that a user is logged on who really isn't.
.IP \(bu
.I Screen
-may give a strange warning when your tty has no utmp entry.
+may give a strange warning when your TTY has no utmp entry.
.IP \(bu
When the modem line was hung up,
.I screen
diff --git a/src/doc/screen.texinfo b/src/doc/screen.texinfo
index 18689a1..e2ad02a 100644
--- a/src/doc/screen.texinfo
+++ b/src/doc/screen.texinfo
@@ -443,7 +443,7 @@ This option is equivalent to the @code{shelltitle} command
(@pxref{Shell}).
@item -T @var{term}
-Set the $TERM enviroment variable using the specified @emph{term} as
+Set the $TERM environment variable using the specified @emph{term} as
opposed to the default setting of @code{screen}.
@item -U
@@ -633,12 +633,12 @@ Allow the user to enter a title for the current window.
@item @kbd{C-a b}
@itemx @kbd{C-a C-b}
(break)@*
-Send a break to the tty.
+Send a break to the TTY.
@xref{Break}.
@item @kbd{C-a B}
(pow_break)@*
-Close and reopen the tty-line.
+Close and reopen the TTY-line.
@xref{Break}.
@item @kbd{C-a c}
@@ -954,7 +954,7 @@ Specify the default for generating breaks. @xref{Break}.
@item defc1 @var{state}
Select default c1 processing behavior. @xref{Character Processing}.
@item defcharset [@var{set}]
-Change defaul character set slot designation. @xref{Character Processing}.
+Change default character set slot designation. @xref{Character Processing}.
@item defencoding @var{enc}
Select default window encoding. @xref{Character Processing}.
@item defescape @var{xy}
@@ -970,7 +970,7 @@ Select default window logging behavior. @xref{Log}.
@item deflogin @var{state}
Select default utmp logging behavior. @xref{Login}.
@item defmode @var{mode}
-Select default file mode for ptys. @xref{Mode}.
+Select default file mode for PTYs. @xref{Mode}.
@item defmonitor @var{state}
Select default activity monitoring behavior. @xref{Monitor}.
@item defmousetrack @var{on}|@var{off}
@@ -992,7 +992,7 @@ Select default character encoding. @xref{Character
Processing}.
@item defwrap @var{state}
Set default line-wrapping behavior. @xref{Wrap}.
@item defwritelock @var{on|off|auto}
-Set default writelock behavior. @xref{Multiuser Session}.
+Set default write lock behavior. @xref{Multiuser Session}.
@item zombie_timeout [@var{seconds}]
Try to reconnect dead windows after timeout. @xref{Zombie}.
@item detach [-h]
@@ -1112,7 +1112,7 @@ Set minimum message wait. @xref{Message Wait}.
@item msgwait @var{sec}
Set default message wait. @xref{Message Wait}.
@item multiuser @var{state}
-Go into single or multi user mode. @xref{Multiuser Session}.
+Go into single or multiuser mode. @xref{Multiuser Session}.
@item next
Switch to the next window. @xref{Selecting}.
@item nonblock [@var{state}|@var{numsecs}]
@@ -1178,7 +1178,7 @@ Name this session. @xref{Session Name}.
@item setenv [@var{var} [@var{string}]]
Set an environment variable for new windows. @xref{Setenv}.
@item setsid @var{state}
-Controll process group creation for windows. @xref{Setsid}.
+Control process group creation for windows. @xref{Setsid}.
@item shell @var{command}
Set the default program for new windows. @xref{Shell}.
@item shelltitle @var{title}
@@ -1358,7 +1358,7 @@ Unset an environment variable.
(none)@*
Set the command to be used to create a new shell. This overrides the
value of the environment variable @code{$SHELL}. This is useful if
-you'd like to run a tty-enhancer which is expecting to execute the
+you'd like to run a TTY-enhancer which is expecting to execute the
program specified in @code{$SHELL}.
If the command begins with a @samp{-} character, the shell will be started as a
login-shell. Typical shells do only minimal initialization when not started as
a login-shell.
@@ -1406,7 +1406,7 @@ or any other system command that could be executed from a
shell.
(e.g. @samp{slogin}, etc...).
@item
-If a tty (character special device) name (e.g. @samp{/dev/ttya})
+If a TTY (character special device) name (e.g. @samp{/dev/ttya})
is specified as the first parameter, then the window is directly
connected to this device.
This window type is similar to @samp{screen cu -l /dev/ttya}.
@@ -1435,7 +1435,7 @@ Unspecified options cause the terminal driver to make up
the parameter
values of the connection. These values are system-dependent and may be
in defaults or values saved from a previous connection.
-For tty windows, the @code{info} command shows some of the modem
+For TTY windows, the @code{info} command shows some of the modem
control lines in the status line.
These may include @samp{RTS}, @samp{CTS}, @samp{DTR}, @samp{CD} and
more. This depends rather on on the available @code{ioctl()}'s and system
@@ -1448,7 +1448,7 @@ placed inside curly braces (@samp{@{} and @samp{@}}).
When the @code{CRTSCTS} or @code{TIOCSOFTCAR} bit is true, the signals
@samp{CTS} or @samp{CD} are shown in parenthesis, respectively.
-For tty windows, the command @code{break} causes the Data transmission
+For TTY windows, the command @code{break} causes the Data transmission
line (TxD) to go low for a specified period of time. This is expected
to be interpreted as break signal on the other side.
No data is sent and no modem control line is changed when a
@@ -1517,7 +1517,7 @@ current group is displayed.
Using groups in combination with layouts will help create a
multi-desktop experience. One group can be assigned for each
layout made. Windows can be made, split, and organized within each
-group as desired. Afterwhich, switching between groups can be as easy
+group as desired. After which, switching between groups can be as easy
as switching layouts.
@node Selecting, Session Management, New Window, Top
@@ -1794,7 +1794,7 @@ described here.
@menu
* Multiuser:: Enable / Disable multiuser mode.
* Acladd:: Enable a specific user.
-* Aclchg:: Change a users permissions.
+* Aclchg:: Change a user's permissions.
* Acldel:: Disable a specific user.
* Aclgrp:: Grant a user permissions to other users.
* Displays:: List all active users at their displays.
@@ -1842,8 +1842,8 @@ to all commands. If @var{usernames} consists of a single
@samp{*}, all
known users are affected.
A command can be executed when the user has the @samp{x} bit for it. The user
can type input to a window when he has its @samp{w} bit set and no other
-user obtains a writelock for this window. Other bits are currently ignored.
-To withdraw the writelock from another user in e.g. window 2:
+user obtains a write lock for this window. Other bits are currently ignored.
+To withdraw the write lock from another user in e.g. window 2:
@samp{aclchg @var{username} -w+w 2}. To allow read-only access
to the session: @samp{aclchg @var{username} -w "#"}. As soon as a user's name
is known to screen, he can attach to the session and (per default) has full
@@ -1948,7 +1948,7 @@ The legend is as follows:
(1st character)
@samp{-} : no read
@samp{r} : read
- @samp{R} : read only due to foreign wlock
+ @samp{R} : read-only due to foreign wlock
(2nd character)
@samp{-} : no write
@samp{.} : write suppressed by foreign wlock
@@ -1983,7 +1983,7 @@ be changed (see the @code{su} command).
@end deffn
-@node Wall, Writelock, Umask, Multiuser Session
+@node Wall, Write lock, Umask, Multiuser Session
@subsection Wall
@deffn Command wall @var{message}
(none)@*
@@ -1991,15 +1991,15 @@ Write a message to all displays. The message will
appear in the terminal's
status line.
@end deffn
-@node Writelock, Su , Wall, Multiuser Session
-@subsection Writelock
+@node Write lock, Su , Wall, Multiuser Session
+@subsection Write lock
@deffn Command writelock @var{on|off|auto}
(none)@*
In addition to access control lists, not all users may be able to write to
-the same window at once. Per default, writelock is in @samp{auto} mode and
+the same window at once. Per default, write lock is in @samp{auto} mode and
grants exclusive input permission to the user who is the first to switch
to the particular window. When he leaves the window, other users may obtain
-the writelock (automatically). The writelock of the current window is disabled
+the write lock (automatically). The write lock of the current window is
disabled
by the command @code{writelock off}. If the user issues the command
@code{writelock on} he keeps the exclusive write permission while switching
to other windows.
@@ -2007,11 +2007,11 @@ to other windows.
@deffn Command defwritelock @var{on|off|auto}
(none)@*
-Sets the default writelock behavior for new windows. Initially all windows
-will be created with no writelocks.
+Sets the default write lock behavior for new windows. Initially all windows
+will be created with no write locks.
@end deffn
-@node Su, , Writelock, Multiuser Session
+@node Su, , Write lock, Multiuser Session
@subsection Su
@deffn Command su [@var{username} [@var{password} [@var{password2}]]]
(none)@*
@@ -2041,7 +2041,7 @@ environment variable will still reflect the old name in
pre-existing
shells. This may result in
confusion. Use of this command is generally
discouraged. Use the @code{-S} command-line option if you want to
-name a new session.The default is constructed from the tty and host names.
+name a new session. The default is constructed from the TTY and host names.
@end deffn
@node Suspend, Quit, Session Name, Session Management
@@ -2216,7 +2216,7 @@ resize min minimize current region
Without any arguments, @code{screen} will prompt for how you would
like to resize the current region.
-See @code{focusminsize} if you want to restrict the minimun size a region can
have.
+See @code{focusminsize} if you want to restrict the minimum size a region can
have.
@end deffn
@@ -2360,7 +2360,7 @@ regions. This arrangement is restored when a
@code{screen} session
is reattached or switched back from a different layout. If the
session ends or the @code{screen} process dies, the layout
arrangements are lost. The @code{layout dump} command should help
-in this siutation. If a number
+in this situation. If a number
or title is supplied, @code{screen} will remember the arrangement of
that particular layout. Without any options, @code{screen} will
remember the current layout.
@@ -2630,7 +2630,7 @@ login off} will map these keys to be @kbd{C-a I} and
@kbd{C-a O}
@section Mode
@deffn Command defmode mode
(none)@*
-The mode of each newly allocated pseudo-tty is set to @var{mode}.
+The mode of each newly allocated pseudo-TTY is set to @var{mode}.
@var{mode} is an octal number as used by chmod(1). Defaults to 0622 for
windows which are logged in, 0600 for others (e.g. when @code{-ln} was
specified for creation, @pxref{Screen Command}).
@@ -2911,7 +2911,7 @@ ESC [ Pn ^ same as above
ESC [ Ps ;...; Ps h Set Mode
ESC [ Ps ;...; Ps l Reset Mode
Ps = 4 (A) Insert Mode
- 20 (A) @samp{Automatic Linefeed} Mode.
+ 20 (A) @samp{Automatic Line feed} Mode.
34 Normal Cursor Visibility
?1 (V) Application Cursor Keys
?3 (V) Change Terminal Width to 132 columns
@@ -3544,7 +3544,7 @@ with @samp{-U}, otherwise @code{off}.
@deffn Command cjkwidth [state]
(none)@*
-Toggle how ambiguoous characters are treated. If cjkwidth is on screen
+Toggle how ambiguous characters are treated. If cjkwidth is on screen
interprets them as double (full) width characters. If off then they are seen
as one cell (half) width characters.
@end deffn
@@ -3693,7 +3693,7 @@ or last non-whitespace character on the line.
@noindent
@kbd{f}/@kbd{F}, @kbd{t}/@kbd{T} move the cursor forward/backward to the
-next occurence of the target. (eg, '3fy' will move the cursor to the 3rd
+next occurrence of the target. (e.g. '3fy' will move the cursor to the 3rd
'y' to the right.)
@noindent
@@ -3874,7 +3874,7 @@ paste buffer exists once for every user.
(none)@*
Stuff the string @var{string} in the input buffer of the current window.
This is like the @code{paste} command, but with much less overhead.
-Without a paramter, @code{screen} will prompt for a string to stuff.
+Without a parameter, @code{screen} will prompt for a string to stuff.
You cannot paste large buffers with the @code{stuff} command. It is most
useful for key bindings. @xref{Bindkey}.
@end deffn
@@ -3882,7 +3882,7 @@ useful for key bindings. @xref{Bindkey}.
@deffn Command pastefont [state]
Tell screen to include font information in the paste buffer. The
default is not to do so. This command is especially useful for
-multi character fonts like kanji.
+multicharacter fonts like kanji.
@end deffn
@deffn Command slowpaste msec
@@ -4021,7 +4021,7 @@ Use with care!
(none)@*
Run a unix subprocess (specified by an executable path @var{newcommand} and
its optional arguments) in the current window. The flow of data between
-newcommands stdin/stdout/stderr, the process originally started (let us call
it
+newcommand's stdin/stdout/stderr, the process originally started (let us call
it
"application-process") and
screen itself (window) is controlled by the file descriptor pattern
@var{fdpat}.
This pattern is basically a three character sequence representing stdin, stdout
@@ -4044,8 +4044,8 @@ the windows process. Only one subprocess a time can be
running in each window.
Refer to the postscript file @file{doc/fdpat.ps} for a confusing
illustration of all 21 possible combinations. Each drawing shows the digits
2, 1, 0 representing the three file descriptors of newcommand. The box
-marked `W' is usual pty that has the application-process on its slave side.
-The box marked `P' is the secondary pty that now has screen at its master
+marked `W' is usual PTY that has the application-process on its slave side.
+The box marked `P' is the secondary PTY that now has screen at its master
side.
@end deffn
@@ -4088,7 +4088,7 @@ running. Output of both shells is displayed and user
input is sent to the new
@itemx exec!stty 19200
@itemx exec !.. stty 19200
All of the above are equivalent.
-Set the speed of the window's tty. If your stty command operates on stdout,
+Set the speed of the window's TTY. If your stty command operates on stdout,
then add another @samp{!}. This is a useful command, when a screen window
is directly connected to a serial line that needs to be configured.
@@ -4099,7 +4099,7 @@ This adds a pager to the window output. The special
character @samp{|} is
needed to give the user control over the pager although it gets its input from
the window's process. This works, because @samp{less} listens on stderr
(a behavior that @code{screen} would not expect without the @samp{|})
-when its stdin is not a tty. @code{Less} versions newer than 177 fail miserably
+when its stdin is not a TTY. @code{Less} versions newer than 177 fail miserably
here; good old @code{pg} still works.
@item !:sed -n s/.*Error.*/\007/p
@@ -4347,7 +4347,7 @@ Like mapdefault, but don't even look in the default
bindkey table.
@deffn Command maptimeout n
(none)@*
Set the inter-character timer for input sequence detection to a timeout
-of @var{n} ms. The default timeout is 300ms. Maptimeout with no
+of @var{n} ms. The default timeout is 300 ms. Maptimeout with no
arguments shows the current setting.
@end deffn
@@ -4389,7 +4389,7 @@ between the three states 'fixed on', 'fixed off' and
'automatic'
interactively with the @code{flow} command bound to @kbd{C-a f}.
The automatic flow-switching mode deals with flow control using the
-TIOCPKT mode (like @code{rlogin} does). If the tty driver does not
+TIOCPKT mode (like @code{rlogin} does). If the TTY driver does not
support TIOCPKT, screen tries to determine the right mode based on the
current setting of the application keypad --- when it is enabled,
flow-control is turned off and visa versa. Of course, you can still
@@ -4846,7 +4846,7 @@ Syntax:
The things in braces may be repeated any number of times.
A @var{<charset-mapping>} tells screen how to map characters
-in font @var{<designator>} (@samp{B}: Ascii, @samp{A}: UK,
+in font @var{<designator>} (@samp{B}: ASCII, @samp{A}: UK,
@samp{K}: german, etc.)
to strings. Every @var{<mapping>} describes to what string a single
character will be translated. A template mechanism is used, as
@@ -5156,7 +5156,7 @@ the command will be executed multiple times. If the first
parameter is of the
form @samp{@var{identifier}*} then identifier is matched against user names.
The command is executed once for each display of the selected user(s).
If the first parameter is of the form @samp{@var{identifier}%} identifier is
-matched against displays. Displays are named after the ttys they attach. The
+matched against displays. Displays are named after the TTYs they attach. The
prefix @samp{/dev/} or @samp{/dev/tty} may be omitted from the identifier.
If @var{identifier} has a @code{#} or nothing appended it is matched against
window numbers and titles. Omitting an identifier in front of the @code{#},
@@ -5186,7 +5186,7 @@ work correctly under @code{at} looping over windows.
@deffn Command break [duration]
(@kbd{C-a b}, @kbd{C-a C-b})@*
Send a break signal for @var{duration}*0.25 seconds to this window.
-For non-Posix systems the time interval is rounded up to full seconds.
+For non-POSIX systems the time interval is rounded up to full seconds.
Most useful if a character device is attached to the window rather than
a shell process (@pxref{Window Types}). The maximum duration of
a break signal is limited to 15 seconds.
@@ -5336,12 +5336,12 @@ It only works if zombie keys are defined via
@code{zombie} command.
@deffn Command printcmd [@var{cmd}]
(none)@*
If @var{cmd} is not an empty string, screen will not use the terminal
-capabilities @code{po/pf} for printing if it detects an ansi print
+capabilities @code{po/pf} for printing if it detects an ANSI print
sequence @code{ESC [ 5 i}, but pipe the output into @var{cmd}.
This should normally be a command like @samp{lpr} or
@samp{cat > /tmp/scrprint}.
@code{Printcmd} without an argument displays the current setting.
-The ansi sequence @code{ESC \} ends printing and closes the pipe.
+The ANSI sequence @code{ESC \} ends printing and closes the pipe.
Warning: Be careful with this command! If other user have write
access to your terminal, they will be able to fire off print commands.
@@ -5459,7 +5459,7 @@ Sets a command that is run after the specified number of
seconds inactivity is reached. This command will normally
be the @code{blanker} command to create a screen blanker, but
it can be any screen command. If no command is specified,
-only the timeout is set. A timeout of zero (ot the special
+only the timeout is set. A timeout of zero (or the special
timeout @code{off}) disables the timer. If no arguments are
given, the current settings are displayed.
@end deffn
@@ -5496,7 +5496,7 @@ relay all data to the attacher until the end of the
transmission is reached. In @code{catch} mode screen acts as a
zmodem endpoint and starts the corresponding rz/sz commands.
If the mode is set to @code{auto}, screen will use @code{catch} if
-the window is a tty (e.g. a serial line), otherwise it
+the window is a TTY (e.g. a serial line), otherwise it
will use @code{pass}.
You can define the templates screen uses in @code{catch} mode
@@ -5903,9 +5903,9 @@ capabilities to @code{$TERMCAP} may not have any effects.
@code{screen} does not make use of hardware tabs.
@item
-@code{screen} must be installed setuid root on most systems
+@code{screen} must be installed setuid-root on most systems
in order to be able to
-correctly change the owner of the tty device file for each window.
+correctly change the owner of the TTY device file for each window.
Special permission may also be required to write the file
@file{/etc/utmp}.
@@ -5915,7 +5915,7 @@ with SIGKILL. This will cause some programs (like "w" or
"rwho") to
advertise that a user is logged on who really isn't.
@item
-@code{screen} may give a strange warning when your tty has no utmp
+@code{screen} may give a strange warning when your TTY has no utmp
entry.
@item
@@ -5935,7 +5935,7 @@ windows.
@item
When attaching to a multiuser session, the user's @file{.screenrc} file is not
-sourced. Each users personal settings have to be included in the
+sourced. Each user's personal settings have to be included in the
@file{.screenrc} file from which the session is booted, or have to be
changed manually.
@@ -5973,7 +5973,7 @@ If you want to help, send a note to screen-devel@@gnu.org.
@chapter Installation
@cindex installation
-Since @code{screen} uses pseudo-ttys, the select system call, and
+Since @code{screen} uses pseudo-TTYs, the select system call, and
UNIX-domain sockets/named pipes, it will not run under a system that
does not include these features of 4.2 and 4.3 BSD UNIX.
@@ -5989,7 +5989,7 @@ does not include these features of 4.2 and 4.3 BSD UNIX.
The socket directory defaults either to @file{$HOME/.screen} or simply to
@file{/tmp/screens} or preferably to @file{/usr/local/screens} chosen at
compile-time. If @code{screen} is installed
-setuid root, then the administrator should compile screen with an
+setuid-root, then the administrator should compile screen with an
adequate (not NFS mounted) @code{SOCKDIR}. If @code{screen} is not
running setuid-root, the user can specify any mode 700 directory in the
environment variable @code{$SCREENDIR}.
diff --git a/src/etc/completer.zsh b/src/etc/completer.zsh
index 1d9e928..653425f 100644
--- a/src/etc/completer.zsh
+++ b/src/etc/completer.zsh
@@ -16,7 +16,7 @@
'-dmS:Start as daemon: Screen session in detached mode.' \
'-D:Detach and logout remote (with -r: reattach here).' \
'-e:Change command characters.' \
- '-f-:Flow control on, -fn = off, -fa = auto.:((n\:Flow\ conrol\
off a\:Flow\ conrol\ auto))' \
+ '-f-:Flow control on, -fn = off, -fa = auto.:((n\:Flow\
control\ off a\:Flow\ control\ auto))' \
'-h:Set the size of the scrollback history buffer.' \
'-i[Interrupt output sooner when flow control is on.]' \
'-l[Login mode on (update /var/run/utmp), -ln = off.]' \
@@ -24,7 +24,7 @@
'-ls[Do nothing, just list our SocketDir.]' \
"-L[Terminal's last character can be safely updated.]" \
'-m[ignore $STY variable, do create a new screen session.]' \
- '-O[Choose optimal output rather than exact vt100 emulation.]' \
+ '-O[Choose optimal output rather than exact VT100 emulation.]' \
'-p:Preselect the named window if it exists.' \
'-q[Quiet startup. Exits with non-zero return code if
unsuccessful.]' \
'-r[Reattach to a detached screen process.]:Handling Tag
sessionname:->sessionname' \
@@ -36,7 +36,7 @@
'-U[Tell screen to use UTF-8 encoding.]' \
'-v[Print "Screen version 3.09.11beta (FAU) 11-Oct-01".]' \
'-wipe[Do nothing, just clean up SocketDir.]' \
- '-x[Attach to a not detached screen. (Multi display mode).]' \
+ '-x[Attach to a not detached screen. (Multidisplay mode).]' \
'-X[Execute <cmd> as a screen command in the specified
session.]:Handling Tag screencmd:( acladd addacl aclchg acldel aclgrp
aclumask activity allpartial at attrcolor autodetach autonuke bce
bell_msg bind bindkey break breaktype bufferfile c1 caption charset
chdir clear colon command compacthist console copy copy_reg crlf debug
defc1 defautonuke defbce defbreaktype defcharset defescape defflow
defgr defhstatus defkanji deflogin defmode defmonitor defobuflimit
defscrollback defshell defsilence defslowpaste defutf8 defwrap
defwritelock detach dinfo displays digraph dumptermcap echo escape exec
fit flow focus gr hardcopy hardcopy_append hardcopydir hardstatus
height help history hstatus info ins_reg kill lastmsg license
lockscreen log logfile login logtstamp mapdefault mapnotnext maptimeout
markkeys meta monitor msgminwait msgwait multiuser next nonblock number
obu!
!
flimit only other partial password paste pastefont pow_break
pow_detach pow_detach_msg prev printcmd process quit readbuf readreg
redisplay register remove removebuf reset resize screen scrollback
select sessionname setenv shell shelltitle silence silencewait sleep
slowpaste sorendition split startup_message stuff su term termcap
terminfo termcapinfo time title unsetenv utf8 vbell vbell_msg vbellwait
verbose version wall width windows wrap writebuf writelock xoff xon
zombie)'
diff --git a/src/etc/etcscreenrc b/src/etc/etcscreenrc
index a51d64a..4e2acb2 100644
--- a/src/etc/etcscreenrc
+++ b/src/etc/etcscreenrc
@@ -18,7 +18,7 @@ vbell_msg " Wuff ---- Wuff!! "
# all termcap entries are now duplicated as terminfo entries.
# only difference should be the slightly modified syntax, and check for
-# terminfo entries, that are already corected in the database.
+# terminfo entries, that are already corrected in the database.
#
# G0 we have a SEMI-GRAPHICS-CHARACTER-MODE
# WS this sequence resizes our window.
@@ -39,7 +39,7 @@ vbell_msg " Wuff ---- Wuff!! "
termcap facit|vt100|xterm LP:G0
terminfo facit|vt100|xterm LP:G0
-#the vt100 description does not mention "dl". *sigh*
+#the VT100 description does not mention "dl". *sigh*
termcap vt100 dl=5\E[M
terminfo vt100 dl=5\E[M
@@ -66,7 +66,7 @@ termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
#
-# Do not use xterms alternate window buffer.
+# Do not use xterm's alternate window buffer.
# This one would not add lines to the scrollback buffer.
termcap xterm|xterms|xs ti=\E7\E[?47l
terminfo xterm|xterms|xs ti=\E7\E[?47l
diff --git a/src/etc/newsyntax38 b/src/etc/newsyntax38
index b22850d..fc45f59 100755
--- a/src/etc/newsyntax38
+++ b/src/etc/newsyntax38
@@ -42,8 +42,8 @@ echo "# by the newsyntax script." >> $1
# termcap and terminfo lines can only be folded when there is no parameter
# expansion in the codes. Parameters are denoted differently in
-# termcap and termcap syntax. Everything else is identical, I assume.
-# Thus codes not containing '%' can be savely folded.
+# termcap and terminfo syntax. Everything else is identical, I assume.
+# Thus codes not containing '%' can be safely folded.
sed < $1.old > $1.dups \
-e 's/^\([ #]*\)aka/\1title/' \
diff --git a/src/etc/screenrc b/src/etc/screenrc
index e50e742..ca8400c 100644
--- a/src/etc/screenrc
+++ b/src/etc/screenrc
@@ -27,7 +27,7 @@ pow_detach_msg "Screen session of $LOGNAME detached."
# shellaka '> |tcsh'
# shellaka '$ |sh'
-# set every new windows hardstatus line to somenthing descriptive
+# set every new windows hardstatus line to something descriptive
# defhstatus "screen: ^En (^Et)"
defscrollback 1000
@@ -99,7 +99,7 @@ termcapinfo wy*
CS=\E[?1h:CE=\E[?1l:vi=\E[?25l:ve=\E[?25h:VR=\E[?5h:VN=\E[?5l:cb
# make hp700 termcap/info better
termcapinfo hp700
'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
-# Extend the vt100 desciption by some sequences.
+# Extend the VT100 description by some sequences.
termcap vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC
terminfo vt100*
ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC
termcapinfo linux C8
diff --git a/src/fileio.c b/src/fileio.c
index 75db976..3a7822f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -150,7 +150,7 @@ int StartRc(char *rcfilename, int nopanic)
/* always fix termcap/info capabilities */
extra_incap = CatExtra("TF", extra_incap);
- /* Special settings for vt100 and others */
+ /* Special settings for VT100 and others */
if (display && (!strncmp(D_termname, "vt", 2) || !strncmp(D_termname,
"xterm", 5)))
extra_incap =
CatExtra
diff --git a/src/image.h b/src/image.h
index 29a4e9a..457f2ed 100644
--- a/src/image.h
+++ b/src/image.h
@@ -39,7 +39,7 @@ struct mchar {
uint32_t font; /* font :) */
uint32_t colorbg; /* background color */
uint32_t colorfg; /* foreground color */
- uint32_t mbcs; /* used for multi byte character sets; TODO:
possible to remove? use image now that it has 32 bits*/
+ uint32_t mbcs; /* used for multibyte character sets; TODO:
possible to remove? use image now that it has 32 bits*/
};
struct mline {
diff --git a/src/input.c b/src/input.c
index 904293f..fcf0f42 100644
--- a/src/input.c
+++ b/src/input.c
@@ -44,7 +44,7 @@ static void InpRedisplayLine(int, int, int, int);
struct inpline {
char buf[MAXSTR + 1]; /* text buffer */
- size_t len; /* length of the editible string */
+ size_t len; /* length of the editable string */
size_t pos; /* cursor position in editable string */
struct inpline *next, *prev;
};
@@ -103,7 +103,7 @@ void inp_setprompt(char *p, char *s)
}
/*
- * We dont use HS status line with Input().
+ * We don't use HS status line with Input().
* If we would use it, then we should check e_tgetflag("es") if
* we are allowed to use esc sequences there.
*
diff --git a/src/layer.h b/src/layer.h
index 4284fba..c057090 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -34,7 +34,7 @@
#include <stdlib.h>
/*
- * This is the overlay structure. It is used to create a seperate
+ * This is the overlay structure. It is used to create a separate
* layer over the current windows.
*/
diff --git a/src/list_display.c b/src/list_display.c
index 2098219..9289c16 100644
--- a/src/list_display.c
+++ b/src/list_display.c
@@ -104,7 +104,7 @@ static int gl_Display_row(ListData *ldata, ListRow *lrow)
/* w->w_dlist->next */ 0 ? '&' : ' ',
/*
* The rwx triple:
- * -,r,R no read, read, read only due to foreign
wlock
+ * -,r,R no read, read, read-only due to foreign
wlock
* -,.,w,W no write, write suppressed by foreign
wlock,
* write, own wlock
* -,x no execute, execute
diff --git a/src/list_generic.c b/src/list_generic.c
index 3e5c648..f0b9acf 100644
--- a/src/list_generic.c
+++ b/src/list_generic.c
@@ -30,7 +30,7 @@
#include "misc.h"
#include "input.h"
-/* Deals with a generic list display */
+/* deals with a generic list display */
static void ListProcess(char **, size_t *);
static void ListAbort(void);
@@ -50,7 +50,7 @@ const struct LayFuncs ListLf = {
ListFree
};
-/** Returns non-zero on success. */
+/* Returns non-zero on success. */
ListData *glist_display(const GenericList *list, const char *name)
{
ListData *ldata;
@@ -59,7 +59,7 @@ ListData *glist_display(const GenericList *list, const char
*name)
return NULL;
ldata = flayer->l_data;
- ldata->name = name; /* We do not SaveStr, since the strings should
be all static literals */
+ ldata->name = name; /* we do not SaveStr, since the strings should
be all static literals */
ldata->list_fn = list;
flayer->l_mode = 1;
@@ -87,7 +87,7 @@ static ListRow *glist_search_dir(ListData *ldata, ListRow
*start, int dir)
if (dir == 1)
row = ldata->root;
else {
- /* First, go to the end */
+ /* first, go to the end */
if (!start->next)
row = start;
else
@@ -180,15 +180,15 @@ static void ListProcess(char **ppbuf, size_t *plen)
case 0220: /* up */
case 16: /* ^P */
case 'k':
- if (!ldata->selected->prev) /* There's no where to
go */
+ if (!ldata->selected->prev) /* there's no where to
go */
break;
ldata->selected = old->prev;
break;
case 0216: /* down */
- case 14: /* ^N like emacs */
+ case 14: /* ^N like Emacs */
case 'j':
- if (!ldata->selected->next) /* Nothing to do */
+ if (!ldata->selected->next) /* nothing to do */
break;
ldata->selected = old->next;
break;
diff --git a/src/list_window.c b/src/list_window.c
index ef9efa8..13ad5ba 100644
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -546,7 +546,7 @@ static void WListUpdate(Window *p, ListData *ldata)
/* OK, so we keep the window in the list. Update the ordering.
* First, find the row where this window should go to. Then, either
create
- * a new row for that window, or move the exising row for the window to
the
+ * a new row for that window, or move the existing row for the window
to the
* correct place. */
before = NULL;
if (wdata->order == WLIST_MRU) {
diff --git a/src/logfile.c b/src/logfile.c
index 65e7205..ced4cdb 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -61,7 +61,7 @@ static void changed_logfile(Log *l)
/*
* Requires fd to be open and need_fd to be closed.
* If possible, need_fd will be open afterwards and refer to
- * the object originally reffered by fd. fd will be closed then.
+ * the object originally referred by fd. fd will be closed then.
* Works just like ``fcntl(fd, DUPFD, need_fd); close(fd);''
*
* need_fd is returned on success, else -1 is returned.
diff --git a/src/logfile.h b/src/logfile.h
index dbc9c2c..64934b6 100644
--- a/src/logfile.h
+++ b/src/logfile.h
@@ -35,7 +35,7 @@
typedef struct Log Log;
struct Log {
Log *next;
- FILE *fp; /* a hopefully uniq filepointer to the log file */
+ FILE *fp; /* a hopefully unique filepointer to the log file */
char *name; /* the name. used to reopen, when stat fails. */
int opencount; /* synchronize logfopen() and logfclose() */
int writecount; /* increments at logfwrite(), counts write() and
fflush() */
@@ -45,7 +45,7 @@ struct Log {
/*
* open a logfile, The second argument must be NULL, when the named file
- * is already a logfile or must be a appropriatly opened file pointer
+ * is already a logfile or must be a appropriately opened file pointer
* otherwise.
* example: l = logfopen(name, islogfile(name) : NULL ? fopen(name, "a"));
*/
@@ -73,7 +73,7 @@ int logfflush (Log *ifany);
/*
* Your custom reopen function is required to reuse the exact
- * filedescriptor.
+ * file descriptor.
* See logfile.c for further specs and an example.
*
* lf_move_fd may help you here, if you do not have dup2(2).
diff --git a/src/mark.c b/src/mark.c
index 685429f..323b731 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -344,7 +344,7 @@ static int rem(int x1, int y1, int x2, int y2, int
redisplay, char *pt, int yend
*pt++ = ' ';
l++;
break;
- case 3: /* seperate by comma, for csh junkies */
+ case 3: /* separate by comma, for csh junkies */
if (pt)
*pt++ = ',';
l++;
@@ -532,7 +532,7 @@ static void MarkProcess(char **inbufp, size_t *inlenp)
* If we break, rep_cnt will be reset, so we
* continue instead. It might be cleaner to
* store the rep_count in f_cmd and
- * break here so later followon code will be
+ * break here so later follow-on code will be
* hit.
*/
markdata->f_cmd.flag = 1;
@@ -612,7 +612,7 @@ static void MarkProcess(char **inbufp, size_t *inlenp)
rep_cnt = 1;
revto(cx + rep_cnt, cy);
break;
- case '\001': /* CTRL-A from tcsh/emacs */
+ case '\001': /* CTRL-A from tcsh/Emacs */
case '0':
revto(markdata->left_mar, cy);
break;
@@ -624,11 +624,11 @@ static void MarkProcess(char **inbufp, size_t *inlenp)
case '$':
revto(lineend(cy), cy);
break;
- case '\022': /* CTRL-R emacs style backwards search */
+ case '\022': /* CTRL-R Emacs-style backwards search */
ISearch(-1);
in_mark = 0;
break;
- case '\023': /* CTRL-S emacs style search */
+ case '\023': /* CTRL-S Emacs-style search */
ISearch(1);
in_mark = 0;
break;
@@ -637,7 +637,7 @@ static void MarkProcess(char **inbufp, size_t *inlenp)
rep_cnt = (fore->w_height + 1) >> 1;
revto_line(cx, cy - rep_cnt, W2D(cy));
break;
- case '\007': /* CTRL-G show cursorpos */
+ case '\007': /* CTRL-G show cursor position */
if (markdata->left_mar == 0 && markdata->right_mar ==
fore->w_width - 1)
LMsg(0, "Column %d Line %d(+%d)", cx + 1,
W2D(cy) + 1, markdata->hist_offset);
else
diff --git a/src/mark.h b/src/mark.h
index c5e5ea2..29578e9 100644
--- a/src/mark.h
+++ b/src/mark.h
@@ -34,8 +34,8 @@
struct markdata {
Window *md_window;/* pointer to window we are working on */
- struct acluser *md_user; /* The user who brought us up */
- int cx, cy; /* cursor Position in WIN coords*/
+ struct acluser *md_user; /* the user who brought us up */
+ int cx, cy; /* cursor position in WIN coords */
int x1, y1; /* first mark in WIN coords */
int second; /* first mark dropped flag */
int left_mar, right_mar, nonl;
diff --git a/src/os.h b/src/os.h
index b350e43..cfab1ef 100644
--- a/src/os.h
+++ b/src/os.h
@@ -103,8 +103,8 @@ typedef char* slot_t; /* used internally in utmp.c */
* signal stuff
*/
-/* apparently NSIG is not part of standard, but it's present some form in most
- * libc headers, if not define sane default
+/* apparently NSIG is not part of standard, but it's present in some form in
most
+ * libc headers; if not, define sane default
*/
#if !defined(NSIG)
# if defined(_NSIG)
@@ -144,7 +144,7 @@ typedef char* slot_t; /* used internally in utmp.c */
#endif
/*****************************************************************
- * user defineable stuff
+ * user definable stuff
*/
#ifndef TERMCAP_BUFSIZE
@@ -154,7 +154,7 @@ typedef char* slot_t; /* used internally in utmp.c */
/*
* you may try to vary this value. Use low values if your (VMS) system
* tends to choke when pasting. Use high values if you want to test
- * how many characters your pty's can buffer.
+ * how many characters your PTYs can buffer.
*/
#define IOSIZE 4096
diff --git a/src/process.c b/src/process.c
index c3dcdfc..d18faea 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1353,7 +1353,7 @@ static void DoCommandAt(struct action *act)
* while looping through windows, we
have fore AND
* display context. This will confuse
users who try to
* set up loops inside of loops, but
often allows to do
- * what you mean, even when you adress
your context wrong.
+ * what you mean, even when you address
your context wrong.
*/
i = 0;
/* XXX: other displays? */
@@ -2030,7 +2030,7 @@ static void DoCommandWritelock(struct action *act)
}
/*
* user may have permission to change the writelock setting,
- * but he may never aquire the lock himself without write
permission
+ * but he may never acquire the lock himself without write
permission
*/
if (!AclCheckPermWin(D_user, ACL_WRITE, fore))
fore->w_wlockuser = D_user;
@@ -3422,7 +3422,7 @@ static void DoCommandDefmode(struct action *act)
if (ParseBase(act, *args, &n, 8, "octal"))
return;
if (n < 0 || n > 0777) {
- OutputMsg(0, "%s: mode: Invalid tty mode %o", rc_name, n);
+ OutputMsg(0, "%s: mode: Invalid TTY mode %o", rc_name, n);
return;
}
TtyMode = n;
@@ -5283,7 +5283,7 @@ void DoCommand(char **argv, int *argl)
const char *cmd = *argv;
act.quiet = 0;
- /* For now, we actually treat both 'supress error' and 'suppress normal
message' as the
+ /* For now, we actually treat both 'suppress error' and 'suppress
normal message' as the
* same, and ignore all messages on either flag. If we wanted to do
otherwise, we would
* need to change the definition of 'OutputMsg' slightly. */
if (*cmd == '@') { /* Suppress error */
@@ -6587,9 +6587,9 @@ void DoScreen(char *fn, char **av)
* CompileKeys must be called before Markroutine is first used.
* to initialise the keys with defaults, call CompileKeys(NULL, mark_key_tab);
*
- * s is an ascii string in a termcap-like syntax. It looks like
+ * s is an ASCII string in a termcap-like syntax. It looks like
* "j=u:k=d:l=r:h=l: =.:" and so on...
- * this example rebinds the cursormovement to the keys u (up), d (down),
+ * this example rebinds the cursor movement to the keys u (up), d (down),
* l (left), r (right). placing a mark will now be done with ".".
*/
int CompileKeys(char *s, int sl, unsigned char *array)
@@ -6950,7 +6950,7 @@ static int ChangeCanvasSize(Canvas *fcv, int abs, int
diff, bool gflag, int perc
/* Canvas *fcv; make this canvas bigger
int abs; mode: 0:rel 1:abs 2:max
int diff; change this much
- bool gflag; go up if neccessary
+ bool gflag; go up if necessary
int percent; */
{
Canvas *cv;
diff --git a/src/resize.c b/src/resize.c
index 99218ba..c44d7aa 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -568,7 +568,7 @@ int ChangeWindowSize(Window *p, int wi, int he, int hi)
continue;
}
- /* calculate lenght */
+ /* calculate length */
for (l = p->w_width - 1; l > 0; l--)
if (mlf->image[l] != ' ' || mlf->attr[l])
break;
diff --git a/src/screen.c b/src/screen.c
index 8ef3a0e..1d1f589 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -93,9 +93,9 @@ int attach_fd = -1;
char *attach_term;
char *LoginName;
struct mode attach_Mode;
-/* Indicator whether the current tty exists in another namespace. */
+/* Indicator whether the current TTY exists in another namespace. */
bool attach_tty_is_in_new_ns = false;
-/* Content of the tty symlink when attach_tty_is_in_new_ns == true. */
+/* Content of the TTY symlink when attach_tty_is_in_new_ns == true. */
char attach_tty_name_in_ns[MAXPATHLEN];
char SocketPath[MAXPATHLEN];
@@ -250,7 +250,7 @@ static void exit_with_usage(char *myname, char *message,
char *arg)
printf("-L Turn on output logging.\n");
printf("-Logfile file Set logfile name.\n");
printf("-m ignore $STY variable, do create a new screen
session.\n");
- printf("-O Choose optimal output rather than exact vt100
emulation.\n");
+ printf("-O Choose optimal output rather than exact VT100
emulation.\n");
printf("-p window Preselect the named window if it exists.\n");
printf("-q Quiet startup. Exits with non-zero return code if
unsuccessful.\n");
printf("-Q Commands will send the response to the stdout of
the querying process.\n");
@@ -263,7 +263,7 @@ static void exit_with_usage(char *myname, char *message,
char *arg)
printf("-U Tell screen to use UTF-8 encoding.\n");
printf("-v Print \"Screen version %s\".\n", version);
printf("-wipe [match] Do nothing, just clean up SocketDir [on possible
matches].\n");
- printf("-x Attach to a not detached screen. (Multi display
mode).\n");
+ printf("-x Attach to a not detached screen. (Multidisplay
mode).\n");
printf("-X Execute <cmd> as a screen command in the
specified session.\n");
if (message && *message) {
printf("\nError: ");
@@ -662,7 +662,7 @@ int main(int argc, char **argv)
multi_home = SaveStr(mppp->pw_dir);
if (strlen(multi_home) > MAXPATHLEN - 10)
Panic(0, "home directory path too long");
- /* always fake multi attach mode */
+ /* always fake multiattach mode */
if (rflag || lsflag)
xflag = 1;
detached = false;
@@ -670,7 +670,7 @@ int main(int argc, char **argv)
}
/* Special case: effective user is multiuser. */
if (eff_uid && (multi_uid != eff_uid))
- Panic(0, "Must run suid root for multiuser support.");
+ Panic(0, "Must run suid-root for multiuser support.");
}
if (SocketMatch && *SocketMatch == 0)
SocketMatch = NULL;
@@ -736,7 +736,7 @@ int main(int argc, char **argv)
/* In case the pts device exists in another namespace
we directly operate
* on the symbolic link itself. However, this means
that we need to keep
* the fd open since we have no direct way of
identifying the associated
- * pts device accross namespaces. This is ok though
since keeping fds open
+ * pts device across namespaces. This is ok though
since keeping fds open
* is done in the codebase already.
*/
if (attach_tty_is_in_new_ns)
@@ -1169,13 +1169,13 @@ static void DoWait(void)
if (WIFSTOPPED(wstat)) {
#ifdef SIGTTIN
if (WSTOPSIG(wstat) == SIGTTIN) {
- Msg(0, "Suspended (tty input)");
+ Msg(0, "Suspended (TTY input)");
continue;
}
#endif
#ifdef SIGTTOU
if (WSTOPSIG(wstat) == SIGTTOU) {
- Msg(0, "Suspended (tty
output)");
+ Msg(0, "Suspended (TTY
output)");
continue;
}
#endif
@@ -1398,7 +1398,7 @@ void Detach(int mode)
(void)chsock();
/*
* tell father what to do. We do that after we
- * freed the tty, thus getty feels more comfortable on hpux
+ * freed the TTY, thus getty feels more comfortable on hpux
* if it was a power detach.
*/
Kill(pid, sign);
@@ -1873,7 +1873,7 @@ static void SetTtyname(bool fatal, struct stat *st)
attach_tty_is_in_new_ns = true;
ret = readlink(attach_tty, attach_tty_name_in_ns,
ARRAY_SIZE(attach_tty_name_in_ns));
if (ret < 0 || (size_t)ret >=
ARRAY_SIZE(attach_tty_name_in_ns))
- Panic(0, "Bad tty '%s'", attach_tty);
+ Panic(0, "Bad TTY '%s'", attach_tty);
} else if (fatal) {
Panic(0, "Must be connected to a terminal.");
} else {
@@ -1892,6 +1892,6 @@ static void SetTtyname(bool fatal, struct stat *st)
* another namespace.
*/
if (saved_errno != ENODEV && CheckTtyname(attach_tty))
- Panic(0, "Bad tty '%s'", attach_tty);
+ Panic(0, "Bad TTY '%s'", attach_tty);
}
}
diff --git a/src/screen.h b/src/screen.h
index 5f6f373..bda6d95 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -113,7 +113,7 @@ typedef struct Message Message;
struct Message {
int protocol_revision; /* reduce harm done by incompatible messages */
int type;
- char m_tty[MAXPATHLEN]; /* ttyname */
+ char m_tty[MAXPATHLEN]; /* TTY name */
union {
struct {
int lflag;
@@ -168,14 +168,14 @@ struct Message {
#define BELL_ON 0 /* No bell has occurred in the window */
#define BELL_FOUND 1 /* A bell has occurred, but user not yet notified */
-#define BELL_DONE 2 /* A bell has occured, user has been notified */
+#define BELL_DONE 2 /* A bell has occurred, user has been notified */
-#define BELL_VISUAL 3 /* A bell has occured in fore win, notify him
visually */
+#define BELL_VISUAL 3 /* A bell has occurred in fore win, notify him
visually */
#define MON_OFF 0 /* Monitoring is off in the window */
#define MON_ON 1 /* No activity has occurred in the window */
-#define MON_FOUND 2 /* Activity has occured, but user not yet notified */
-#define MON_DONE 3 /* Activity has occured, user has been notified */
+#define MON_FOUND 2 /* Activity has occurred, but user not yet notified */
+#define MON_DONE 3 /* Activity has occurred, user has been notified */
#define DUMP_TERMCAP 0 /* WriteFile() options */
#define DUMP_HARDCOPY 1
@@ -233,7 +233,7 @@ void setbacktick (int, int, int, char **);
/* global variables */
-/* Content of the tty symlink when attach_tty_is_in_new_ns == true. */
+/* Content of the TTY symlink when attach_tty_is_in_new_ns == true. */
extern char attach_tty_name_in_ns[];
extern char strnomem[];
extern char HostName[];
@@ -275,7 +275,7 @@ extern bool lsflag;
extern bool quietflag;
extern bool wipeflag;
extern bool xflag;
-/* Indicator whether the current tty exists in another namespace. */
+/* Indicator whether the current TTY exists in another namespace. */
extern bool attach_tty_is_in_new_ns;
extern int af;
diff --git a/src/search.c b/src/search.c
index 071ff0c..463a053 100644
--- a/src/search.c
+++ b/src/search.c
@@ -168,7 +168,7 @@ static int matchword(char *pattern, int y, int sx, int ex)
}
/********************************************************************
- * Emacs style ISearch
+ * Emacs-style ISearch
*/
static char *isprompts[] = {
diff --git a/src/socket.c b/src/socket.c
index 7ba231a..a610652 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -607,7 +607,7 @@ static int CreateTempDisplay(Message *m, int recvfd, Window
*win)
}
if (strcmp(ttyname_in_ns, m->m_tty)) {
Msg(errno, "Attach: passed fd does not match "
- "tty: %s - %s!",
+ "TTY: %s - %s!",
ttyname_in_ns,
m->m_tty[0] != '\0' ? m->m_tty : "(null)");
close(i);
@@ -626,7 +626,7 @@ static int CreateTempDisplay(Message *m, int recvfd, Window
*win)
m->m_tty[ARRAY_SIZE(m->m_tty) - 1] = 0;
} else if (myttyname == NULL || strcmp(myttyname, m->m_tty)) {
Msg(errno,
- "Attach: passed fd does not match tty: %s - %s!",
+ "Attach: passed fd does not match TTY: %s - %s!",
m->m_tty, myttyname ? myttyname : "NULL");
close(i);
Kill(pid, SIG_BYE);
@@ -982,7 +982,7 @@ static void FinishAttach(Message *m)
/*
* we set the Utmp slots again, if we were detached normally
* and if we were detached by ^Z.
- * don't log zomies back in!
+ * don't log zombies back in!
*/
RemoveLoginSlot();
if (displays->d_next == NULL)
@@ -1351,7 +1351,7 @@ static void DoCommandMsg(Message *mp)
if (!display)
display = fore->w_layer.l_cvlist ?
fore->w_layer.l_cvlist->c_display : NULL;
- /* If the window is not visibile in any display, then
do not use the originating window as
+ /* If the window is not visible in any display, then do
not use the originating window as
* the foreground window for the command. This way, if
there is an existing display, then
* the command will execute from the foreground window
of that display. This is necessary so
* that commands that are relative to the window (e.g.
'next' etc.) do the right thing. */
diff --git a/src/termcap.c b/src/termcap.c
index b49818b..de6bafd 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -161,8 +161,8 @@ int InitTermcap(int width, int height)
D_LI = 24;
if (D_CTF) {
- /* standard fixes for xterms etc */
- /* assume color for everything that looks ansi-compatible */
+ /* standard fixes for xterms etc. */
+ /* assume color for everything that looks ANSI-compatible */
if (!D_CAF && D_ME && (strstr(D_ME, "\033[m") || strstr(D_ME,
"\033[0m"))) {
D_CAF = "\033[3%p1%dm";
D_CAB = "\033[4%p1%dm";
diff --git a/src/tests/test-winmsgbuf.c b/src/tests/test-winmsgbuf.c
index acf8386..6baea4e 100644
--- a/src/tests/test-winmsgbuf.c
+++ b/src/tests/test-winmsgbuf.c
@@ -56,7 +56,7 @@ int main(void)
ASSERT(*wmb_contents(wmb) == '\0');
/* TODO: rendition state */
- /* buffer shall be expandable to accomodate a minimum number of
bytes */
+ /* buffer shall be expandable to accommodate a minimum number
of bytes */
size_t old = wmb_size(wmb);
size_t want = old + 3;
ASSERT_REALLOC(>= want, ASSERT(wmb_expand(wmb, want) >= want));
@@ -85,7 +85,7 @@ int main(void)
ASSERT_GCC(FAILLOC(wmb_create()) == NULL);
}
- /* scenerio: writing to single buffer via separate contexts---while
+ /* scenario: writing to single buffer via separate contexts---while
* maintaining separate pointers between them---and retrieving a final
* result */
{
@@ -143,7 +143,7 @@ int main(void)
wmb_free(wmb);
}
- /* scenerio: write bytes and move around the buffer */
+ /* scenario: write bytes and move around the buffer */
{
WinMsgBuf *wmb = wmb_create();
WinMsgBufContext *wmbc = wmbc_create(wmb);
@@ -191,7 +191,7 @@ int main(void)
wmb_free(wmb);
}
- /* scenerio: write past end of buffer to trigger buffer expansion rather
+ /* scenario: write past end of buffer to trigger buffer expansion rather
* than overflow */
{
WinMsgBuf *wmb = wmb_create();
@@ -223,7 +223,7 @@ int main(void)
wmb_free(wmb);
}
- /* scenerio: copy strings into buffer, also attempting to expand buffer
*/
+ /* scenario: copy strings into buffer, also attempting to expand buffer
*/
{
WinMsgBuf *wmb = wmb_create();
WinMsgBufContext *wmbc = wmbc_create(wmb);
@@ -277,7 +277,7 @@ int main(void)
wmb_free(wmb);
}
- /* scenerio: formatted strings into buffer, also triggering expansion */
+ /* scenario: formatted strings into buffer, also triggering expansion */
{
WinMsgBuf *wmb = wmb_create();
WinMsgBufContext *wmbc = wmbc_create(wmb);
@@ -325,7 +325,7 @@ int main(void)
free(expect2);
}
- /* scenerio: merging the contents of two separate buffers, also
+ /* scenario: merging the contents of two separate buffers, also
* triggering expansion */
{
WinMsgBuf *wmb1 = wmb_create();
@@ -350,7 +350,7 @@ int main(void)
ASSERT(*wmbc_mergewmb(wmbc1, wmb2) == *str2);
ASSERT(STREQ(wmbc_finish(wmbc1), expected));
- /* we futher expect to have advanced the pointer by the length
of
+ /* we further expect to have advanced the pointer by the length
of
* the merged buffer, sans the terminating null byte */
ASSERT(wmbc_offset(wmbc1) == strlen(expected));
/* TODO: rendition state */
diff --git a/src/tests/test-winmsgcond.c b/src/tests/test-winmsgcond.c
index f0eed4d..f373485 100644
--- a/src/tests/test-winmsgcond.c
+++ b/src/tests/test-winmsgcond.c
@@ -161,7 +161,7 @@ int main(void)
wmc_end(&wmc, pos, &chg);
ASSERT(!chg);
- /* similarily, test the reverse---else branch taken */
+ /* similarly, test the reverse---else branch taken */
wmc_init(&wmc, pos);
wmc_set(&wmc);
wmc_else(&wmc, pos, &chg);
diff --git a/src/tty.c b/src/tty.c
index de5b8cd..c08bdfd 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -87,7 +87,7 @@ static void SigAlrmDummy( __attribute__ ((unused))
}
/*
- * Carefully open a character device. Not used to open display ttys.
+ * Carefully open a character device. Not used to open display TTYs.
* The second parameter is parsed for a few stty style options.
*/
@@ -111,7 +111,7 @@ int OpenTTY(char *line, char *opt)
return -1;
}
if (!isatty(f)) {
- Msg(0, "'%s' is not a tty", line);
+ Msg(0, "'%s' is not a TTY", line);
alarm(0);
xsignal(SIGALRM, sigalrm);
close(f);
@@ -119,7 +119,7 @@ int OpenTTY(char *line, char *opt)
}
/*
* We come here exclusively. This is to stop all kermit and cu type
things
- * accessing the same tty line.
+ * accessing the same TTY line.
* Perhaps we should better create a lock in some /usr/spool/locks
directory?
*/
#if defined(TIOCEXCL) && defined(TIOCNXCL)
@@ -128,7 +128,7 @@ int OpenTTY(char *line, char *opt)
Msg(errno, "%s: ioctl TIOCEXCL failed", line);
#endif /* TIOCEXCL && TIOCNXCL */
/*
- * We create a sane tty mode. We do not copy things from the display tty
+ * We create a sane TTY mode. We do not copy things from the display TTY
*/
InitTTY(&Mode, W_TYPE_PLAIN);
@@ -166,7 +166,7 @@ int CloseTTY(int fd)
}
/*
- * Tty mode handling
+ * TTY mode handling
*/
void InitTTY(struct mode *m, int ttyflag)
@@ -191,9 +191,9 @@ void InitTTY(struct mode *m, int ttyflag)
/* #if defined(IMAXBEL)
* m->tio.c_iflag |= IMAXBEL;
* #endif
- * sorry, this one is ridiculus. jw */
+ * sorry, this one is ridiculous. jw */
- if (!ttyflag) { /* may not even be good for ptys.. */
+ if (!ttyflag) { /* may not even be good for PTYs */
#if defined(ICRNL)
m->tio.c_iflag |= ICRNL;
#endif /* ICRNL */
@@ -226,7 +226,7 @@ void InitTTY(struct mode *m, int ttyflag)
* m->tio.c_cflag |= B9600 << IBSHIFT;
* #endif
*
- * We hope that we have the posix calls to do it right:
+ * We hope that we have the POSIX calls to do it right:
* If these are not available you might try the above.
*/
#if defined(B9600)
@@ -427,11 +427,11 @@ void SetMode(struct mode *op, struct mode *np, int flow,
int interrupt)
/*
* Unfortunately, the master process never will get SIGINT if the real
- * terminal is different from the one on which it was originaly started
- * (process group membership has not been restored or the new tty could
not
+ * terminal is different from the one on which it was originally started
+ * (process group membership has not been restored or the new TTY could
not
* be made controlling again). In my solution, it is the attacher who
* receives SIGINT (because it is always correctly associated with the
real
- * tty) and forwards it to the master [kill(MasterPid, SIGINT)].
+ * TTY) and forwards it to the master [kill(MasterPid, SIGINT)].
* Marc Boucher (m...@cam.org)
*/
if (interrupt)
@@ -439,10 +439,10 @@ void SetMode(struct mode *op, struct mode *np, int flow,
int interrupt)
else
np->tio.c_lflag &= ~ISIG;
/*
- * careful, careful catche monkey..
- * never set VMIN and VTIME to zero, if you want blocking io.
+ * careful, careful, catchee monkey.
+ * never set VMIN and VTIME to zero, if you want blocking I/O.
*
- * We may want to do a VMIN > 0, VTIME > 0 read on the ptys too, to
+ * We may want to do a VMIN > 0, VTIME > 0 read on the PTYs too, to
* reduce interrupt frequency. But then we would not know how to
* handle read returning 0. jw.
*/
@@ -723,7 +723,7 @@ static void DoSendBreak(int fd, int n, int type)
}
/*
- * Send a break for n * 0.25 seconds. Tty must be PLAIN.
+ * Send a break for n * 0.25 seconds. TTY must be PLAIN.
* The longest possible break allowed here is 15 seconds.
*/
@@ -743,7 +743,7 @@ void SendBreak(Window * wp, int n, int closeopen)
(void)tcflush(wp->w_ptyfd, TCIOFLUSH);
if (closeopen) {
- /* if we got exclusive access on tty, remove it */
+ /* if we got exclusive access on TTY, remove it */
#if defined(TIOCEXCL) && defined(TIOCNXCL)
errno = 0;
if (ioctl(wp->w_ptyfd, TIOCNXCL, NULL) < 0)
@@ -856,11 +856,11 @@ int TtyGrabConsole(int fd, bool on, char *rc_name)
#else
/* special linux workaround for a too restrictive kernel */
if ((consredirfd[0] = OpenPTY(&slave)) < 0) {
- Msg(errno, "%s: could not open detach pty master", rc_name);
+ Msg(errno, "%s: could not open detach PTY master", rc_name);
return -1;
}
if ((consredirfd[1] = open(slave, O_RDWR | O_NOCTTY)) < 0) {
- Msg(errno, "%s: could not open detach pty slave", rc_name);
+ Msg(errno, "%s: could not open detach PTY slave", rc_name);
close(consredirfd[0]);
return -1;
}
@@ -884,7 +884,7 @@ int TtyGrabConsole(int fd, bool on, char *rc_name)
}
/*
- * Read modem control lines of a physical tty and write them to buf
+ * Read modem control lines of a physical TTY and write them to buf
* in a readable format.
* Will not write more than 256 characters to buf.
* Returns buf;
diff --git a/src/utmp.c b/src/utmp.c
index d4effeb..cab27d0 100644
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -178,7 +178,7 @@ void InitUtmp(void)
}
/*
- * the utmp entry for tty is located and removed.
+ * the utmp entry for TTY is located and removed.
* it is stored in D_utmp_logintty.
*/
void RemoveLoginSlot(void)
diff --git a/src/window.c b/src/window.c
index 9f5e2d4..d5d689a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -236,7 +236,7 @@ static void WinProcess(char **bufpp, size_t *lenp)
if (display && fore->w_wlock == WLOCK_AUTO && !fore->w_wlockuser &&
!AclCheckPermWin(D_user, ACL_WRITE, fore)) {
fore->w_wlockuser = D_user;
}
- /* if w_wlock is set, only one user may write, else we check acls */
+ /* if w_wlock is set, only one user may write, else we check ACLs */
if (display && ((fore->w_wlock == WLOCK_OFF) ?
AclCheckPermWin(D_user, ACL_WRITE, fore) : (D_user !=
fore->w_wlockuser))) {
Msg(0, "write: permission denied (user %s)", D_user->u_name);
@@ -727,7 +727,7 @@ int MakeWindow(struct NewWindow *newwin)
/*
* Resurrect a window from Zombie state.
* The command vector is therefore stored in the window structure.
- * Note: The terminaltype defaults to screenterm again, the current
+ * Note: The terminal type defaults to screenterm again, the current
* working directory is lost.
*/
int RemakeWindow(Window *window)
@@ -803,7 +803,7 @@ void CloseDevice(Window *window)
}
switch (window->w_type) {
case W_TYPE_PTY:
- /* pty 4 SALE */
+ /* PTY 4 SALE */
(void)chmod(window->w_tty, 0666);
(void)chown(window->w_tty, 0, 0);
ClosePTY(window->w_ptyfd);
@@ -954,7 +954,7 @@ int OpenDevice(char **args, int lflag, int *typep, char
**namep)
/*
* Tenebreux (z...@ns.acadiacom.net) has Linux 1.3.70 where select
* gets confused in the following condition:
- * Open a pty-master side, request a flush on it, then set packet
+ * Open a PTY-master side, request a flush on it, then set packet
* mode and call select(). Select will return a possible read, where
* the one byte response to the flush can be found. Select will
* thereafter return a possible read, which yields I/O error.
@@ -1007,7 +1007,7 @@ int OpenDevice(char **args, int lflag, int *typep, char
**namep)
/*
* Fields w_width, w_height, aflag, number (and w_tty)
* are read from Window *win. No fields written.
- * If pwin is nonzero, filedescriptors are distributed
+ * If pwin is nonzero, file descriptors are distributed
* between win->w_tty and open(ttyn)
*
*/
@@ -1085,7 +1085,7 @@ static int ForkWindow(Window *win, char **args, char
*ttyn)
close(2);
newfd = -1;
/*
- * distribute filedescriptors between the ttys
+ * distribute file descriptors between the TTYs
*/
pat = pwin ? pwin->p_fdpat : ((F_PFRONT << (F_PSHIFT * 2)) |
(F_PFRONT << F_PSHIFT) | F_PFRONT);
wfdused = 0;
@@ -1117,7 +1117,7 @@ static int ForkWindow(Window *win, char **args, char
*ttyn)
if (wfdused) {
/*
* the pseudo window process should not be surprised
with a
- * nonblocking filedescriptor. Poor Backend!
+ * nonblocking file descriptor. Poor Backend!
*/
if (fcntl(win->w_ptyfd, F_SETFL, 0))
Msg(errno, "Warning: clear NBLOCK fcntl
failed");
@@ -1870,7 +1870,7 @@ int SwapWindows(int old, int dest)
add_window_to_list(win_b, tmp);
}
- /* exchange the acls for these windows. */
+ /* exchange the ACLs for these windows */
#ifdef ENABLE_UTMP
/* exchange the utmp-slots for these windows */
if ((win_a->w_slot != (slot_t) - 1) && (win_a->w_slot != (slot_t) 0)) {
diff --git a/src/window.h b/src/window.h
index bc08c6c..7706960 100644
--- a/src/window.h
+++ b/src/window.h
@@ -155,7 +155,7 @@ struct Window {
Event w_silenceev; /* silence event */
Event w_zombieev; /* event to try to resurrect window */
int w_poll_zombie_timeout;
- int w_ptyfd; /* fd of the master pty */
+ int w_ptyfd; /* fd of the master PTY */
char w_inbuf[IOSIZE];
size_t w_inlen;
char w_outbuf[IOSIZE];
@@ -175,7 +175,7 @@ struct Window {
struct acluser *w_wlockuser; /* NULL when unlocked or user who
writes */
AclBits w_userbits[ACL_BITS_PER_WIN];
AclBits w_lio_notify; /* whom to tell when lastio+seconds <
time() */
- AclBits w_mon_notify; /* whom to tell monitor statis */
+ AclBits w_mon_notify; /* whom to tell monitor status */
enum state_t w_state; /* parser state */
enum string_t w_StringType;
@@ -205,7 +205,7 @@ struct Window {
bool w_revvid; /* reverse video */
int w_curinv; /* cursor invisible */
int w_curvvis; /* cursor very visible */
- int w_autolf; /* automatic linefeed */
+ int w_autolf; /* automatic line feed */
char *w_hstatus; /* hardstatus line */
int w_gr; /* enable GR flag */
bool w_c1; /* enable C1 flag */
@@ -221,7 +221,7 @@ struct Window {
int w_monitor; /* monitor status */
int w_silencewait; /* wait for silencewait secs */
int w_silence; /* silence status (Lloyd Zusman) */
- char w_norefresh; /* dont redisplay when switching to
that win */
+ char w_norefresh; /* don't redisplay when switching to
that win */
char w_xtermosc[5][2560]; /* special xterm/rxvt escapes */
int w_mouse; /* mouse mode 0,9,1000 */
int w_extmouse; /* extended mouse mode 0,1006 */
diff --git a/src/winmsg.c b/src/winmsg.c
index 53f3261..88b10ea 100644
--- a/src/winmsg.c
+++ b/src/winmsg.c
@@ -57,7 +57,7 @@ WinMsgBuf *g_winmsg;
#define WINMSG_BT_ESC '\005'
/* redundant definition abstraction for escape character handlers; note that
- * a variable varadic macro name is a gcc extension and is not portable, so
+ * a variable variadic macro name is a gcc extension and is not portable, so
* we instead use two separate macros */
#define WINMSG_ESC_PARAMS \
__attribute__((unused)) WinMsgEsc *esc, \
diff --git a/src/winmsgbuf.c b/src/winmsgbuf.c
index b847f98..be317d8 100644
--- a/src/winmsgbuf.c
+++ b/src/winmsgbuf.c
@@ -175,7 +175,7 @@ static bool _wmbc_expand(WinMsgBufContext *wmbc, size_t
size)
* dynamically resized as needed. */
void wmbc_putchar(WinMsgBufContext *wmbc, char c)
{
- /* attempt to accomodate this character, but bail out silenty if it
cannot
+ /* attempt to accommodate this character, but bail out silently if it
cannot
* fit */
if (!wmbc_bytesleft(wmbc)) {
if (!_wmbc_expand(wmbc, wmbc->buf->size + 1)) {
@@ -187,7 +187,7 @@ void wmbc_putchar(WinMsgBufContext *wmbc, char c)
}
/* Copies a string into the buffer, dynamically resizing the buffer as needed
to
- * accomodate length N. If S is shorter than N characters in length, the
+ * accommodate length N. If S is shorter than N characters in length, the
* remaining bytes are filled will nulls. The context pointer is adjusted to
the
* terminating null byte. A pointer to the first copied character in the buffer
* is returned; it shall not be used to modify the buffer. */
@@ -195,7 +195,7 @@ const char *wmbc_strncpy(WinMsgBufContext *wmbc, const char
*s, size_t n)
{
size_t l = wmbc_bytesleft(wmbc);
- /* silently fail in the event that we cannot accomodate */
+ /* silently fail in the event that we cannot accommodate */
if (l < n) {
size_t size = wmbc->buf->size + (n - l);
if (!_wmbc_expand(wmbc, size)) {
@@ -211,8 +211,8 @@ const char *wmbc_strncpy(WinMsgBufContext *wmbc, const char
*s, size_t n)
}
/* Copies a string into the buffer, dynamically resizing the buffer as needed
to
- * accomodate the length of the string sans its terminating null byte. The
- * context pointer is adjusted to the the terminiating null byte. A pointer to
+ * accommodate the length of the string sans its terminating null byte. The
+ * context pointer is adjusted to the terminating null byte. A pointer to
* the first copied character in the destination buffer is returned; it shall
* not be used to modify the buffer. */
const char *wmbc_strcpy(WinMsgBufContext *wmbc, const char *s)
@@ -221,7 +221,7 @@ const char *wmbc_strcpy(WinMsgBufContext *wmbc, const char
*s)
}
/* Write data to the buffer using a printf-style format string. If needed, the
- * buffer will be automatically expanded to accomodate the resulting string and
+ * buffer will be automatically expanded to accommodate the resulting string
and
* is therefore protected against overflows. */
int wmbc_printf(WinMsgBufContext *wmbc, const char *fmt, ...)
{
@@ -236,7 +236,7 @@ int wmbc_printf(WinMsgBufContext *wmbc, const char *fmt,
...)
va_end(ap);
/* more space is needed if vsnprintf returns a larger number than our
max,
- * in which case we should accomodate by dynamically resizing the
buffer and
+ * in which case we should accommodate by dynamically resizing the
buffer and
* trying again */
if (n > max) {
if (!_wmbc_expand(wmbc, wmb_size(wmbc->buf) + n - max)) {
diff --git a/src/winmsgcond.c b/src/winmsgcond.c
index fcebb20..1ee462c 100644
--- a/src/winmsgcond.c
+++ b/src/winmsgcond.c
@@ -69,7 +69,7 @@ bool wmc_is_set(const WinMsgCond *cond)
return cond->state;
}
-/* "else" encounted */
+/* "else" encountered */
int wmc_else(WinMsgCond *cond, int offset, bool *changed)
{
assert(wmc_is_active(cond));
--
2.28.0
