diff options
| -rw-r--r-- | man/custom.texi | 3 | ||||
| -rw-r--r-- | man/files.texi | 19 | ||||
| -rw-r--r-- | man/misc.texi | 17 |
3 files changed, 18 insertions, 21 deletions
diff --git a/man/custom.texi b/man/custom.texi index 2811c4caa3c..6240504e5cb 100644 --- a/man/custom.texi +++ b/man/custom.texi @@ -923,7 +923,7 @@ the first line as well. @cindex shell scripts, and local file variables In shell scripts, the first line is used to identify the script -interpreter, so you cannot put any local variables there. To accomodate +interpreter, so you cannot put any local variables there. To accommodate for this, when Emacs visits a shell script, it looks for local variable specifications in the @emph{second} line. @@ -1030,7 +1030,6 @@ about to type @kbd{C-n C-d} forty times, you can speed your work by defining a keyboard macro to do @kbd{C-n C-d} and calling it with a repeat count of forty. -@c widecommands @table @kbd @item C-x ( Start defining a keyboard macro (@code{start-kbd-macro}). diff --git a/man/files.texi b/man/files.texi index 078cc5411a6..df35f996a6b 100644 --- a/man/files.texi +++ b/man/files.texi @@ -140,7 +140,6 @@ variable @code{file-name-coding-system} to a non-@code{nil} value. @section Visiting Files @cindex visiting files -@c WideCommands @table @kbd @item C-x C-f Visit a file (@code{find-file}). @@ -803,7 +802,7 @@ A @dfn{shadow cluster} is a group of hosts that share directories, so that copying to or from one of them is sufficient to update the file on all of them. Each shadow cluster has a name, and specifies the network address of a primary host (the one we copy files to), and a -regular expression that matches the hostnames of all the other hosts +regular expression that matches the host names of all the other hosts in the cluster. You can define a shadow cluster with @kbd{M-x shadow-define-cluster}. @@ -1927,7 +1926,7 @@ the repository, and picking up changes from other users into one's own working area, then works by direct interactions with the CVS server. One difficulty is that access to the CVS server is often slow, and -that developers might need to work offline as well. VC is designed +that developers might need to work off-line as well. VC is designed to reduce the amount of network interaction necessary. @menu @@ -2049,7 +2048,7 @@ that you can refer to it later if you wish.) While using local RCS, you can pick up recent changes from the CVS repository into your local file, or commit some of your changes back to CVS, without terminating local RCS version control. To do this, -switch to the CVS backend temporarily, with the @kbd{C-x v b} command: +switch to the CVS back end temporarily, with the @kbd{C-x v b} command: @table @kbd @item C-x v b @@ -2518,7 +2517,7 @@ automatically. users, but there is a mode called @dfn{non-strict locking} in which you can check-in changes without locking the file first. Use @samp{rcs -U} to switch to non-strict locking for a particular file, -see the @code{rcs} manpage for details. +see the @code{rcs} manual page for details. When deducing the version control state of an RCS file, VC first looks for an RCS version header string in the file (@pxref{Version @@ -2566,9 +2565,9 @@ locking. For one thing, you can set the @env{CVSREAD} environment variable (the value you use makes no difference). If this variable is defined, CVS makes your work files read-only by default. In Emacs, you must -type @kbd{C-x C-q} to make the file writeable, so that editing works +type @kbd{C-x C-q} to make the file writable, so that editing works in fact similar as if locking was used. Note however, that no actual -locking is performed, so several users can make their files writeable +locking is performed, so several users can make their files writable at the same time. When setting @env{CVSREAD} for the first time, make sure to check out all your modules anew, so that the file protections are set correctly. @@ -2578,7 +2577,7 @@ are set correctly. Another way to achieve something similar to locking is to use the @dfn{watch} feature of CVS. If a file is being watched, CVS makes it read-only by default, and you must also use @kbd{C-x C-q} in Emacs to -make it writable. VC calls @code{cvs edit} to make the file writeable, +make it writable. VC calls @code{cvs edit} to make the file writable, and CVS takes care to notify other developers of the fact that you intend to change the file. See the CVS documentation for details on using the watch feature. @@ -2606,7 +2605,7 @@ do in @code{vc-next-action} (@kbd{C-x v v}), just as it does for local repositories. It also does not make any version backups. You can also set @code{vc-cvs-stay-local} to a regular expression -that is matched against the repository hostname; VC then stays local +that is matched against the repository host name; VC then stays local only for repositories from hosts that match the pattern. @node Directories @@ -2898,7 +2897,7 @@ requires the appropriate uncompression program. the programs @code{arc}, @code{jar}, @code{lzh}, @code{zip}, and @code{zoo}, which have extensions corresponding to the program names. - The keybindings of Archive mode are similar to those in Tar mode, + The key bindings of Archive mode are similar to those in Tar mode, with the addition of the @kbd{m} key which marks a file for subsequent operations, and @kbd{M-@key{DEL}} which unmarks all the marked files. Also, the @kbd{a} key toggles the display of detailed file diff --git a/man/misc.texi b/man/misc.texi index 1676860ac50..ec1f53c95ee 100644 --- a/man/misc.texi +++ b/man/misc.texi @@ -1643,7 +1643,6 @@ any time is called the buffer's @dfn{restriction}. paragraph by eliminating clutter. It can also be used to restrict the range of operation of a replace command or repeating keyboard macro. -@c WideCommands @table @kbd @item C-x n n Narrow down to between point and mark (@code{narrow-to-region}). @@ -1969,11 +1968,11 @@ the order you choose. @cindex other editors @cindex EDT @cindex vi -@cindex PC keybindings +@cindex PC key bindings @cindex scrolling all windows -@cindex PC selecion -@cindex Motif keybindings -@cindex Macintosh keybindings +@cindex PC selection +@cindex Motif key bindings +@cindex Macintosh key bindings @cindex WordStar GNU Emacs can be programmed to emulate (more or less) most other @@ -1988,7 +1987,7 @@ editors. Standard facilities can emulate these: @cindex Brief emulation @cindex emulation of Brief @cindex mode, CRiSP -You can turn on keybindings to emulate the CRiSP/Brief editor with +You can turn on key bindings to emulate the CRiSP/Brief editor with @kbd{M-x crisp-mode}. Note that this rebinds @kbd{M-x} to exit Emacs unless you change the user option @code{crisp-override-meta-x}. You can also use the command @kbd{M-x scroll-all-mode} or set the user option @@ -2025,10 +2024,10 @@ to beginning and end of buffer and @kbd{C-Escape} does @cindex selection, PC The command @kbd{M-x pc-selection-mode} enables a global minor mode that emulates the mark, copy, cut and paste commands of various other -systems---an interface known as CUA. It establishes the keybindings +systems---an interface known as CUA. It establishes the key bindings of PC mode, and also modifies the bindings of the cursor keys and the @kbd{next}, @kbd{prior}, @kbd{home} and @kbd{end} keys. It does not -provide the full set of CUA keybindings---the fundamental Emacs keys +provide the full set of CUA key bindings---the fundamental Emacs keys @kbd{C-c}, @kbd{C-v} and @kbd{C-x} are not changed. The standard keys for moving around (@kbd{right}, @kbd{left}, @@ -2089,7 +2088,7 @@ not use it. @item WordStar (old wordprocessor) @findex wordstar-mode @kbd{M-x wordstar-mode} provides a major mode with WordStar-like -keybindings. +key bindings. @end table @node Hyperlinking, Dissociated Press, Emulation, Top |