diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-09-27 09:37:10 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-09-27 09:37:10 -0700 |
| commit | 2e8c9ede155668167e509ddb80c6a46dab8d70fe (patch) | |
| tree | 200d823eb9522f7531e8a31073ed003333cb34f4 /doc/emacs | |
| parent | a492013d07c59fab8eb9779924b384181e878a1a (diff) | |
| parent | f31c6792ab98c8be343838f59d96e35c05353521 (diff) | |
| download | emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.tar.gz emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.tar.bz2 emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.zip | |
Merge from origin/emacs-27
f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix. (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos
# Conflicts:
# etc/NEWS
# lisp/arc-mode.el
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog.1 | 4 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1 index 3513c6616f0..cf641beec1f 100644 --- a/doc/emacs/ChangeLog.1 +++ b/doc/emacs/ChangeLog.1 @@ -2206,7 +2206,7 @@ Describe group levels more clearly. (Gnus Group Buffer, Gnus Summary Buffer): New nodes, split from Summary of Gnus. - (Document View): Copyedits. Move zoom commads to DocView + (Document View): Copyedits. Move zoom commands to DocView Navigation node. (DocView Navigation, DocView Searching, DocView Slicing) (DocView Conversion): Nodes renamed from Navigation, etc. @@ -10290,7 +10290,7 @@ * buffers.texi (Misc Buffer): Explain use of M-x rename-uniquely for multiple compile and grep buffers. - (Indirect Buffers): Don't recommand clone-indirect-buffer + (Indirect Buffers): Don't recommend clone-indirect-buffer for multiple compile and grep buffers. 2004-02-29 Juanma Barranquero <lektu@terra.es> diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index a512fd14c80..81874a04aa7 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2679,7 +2679,7 @@ basename.) Emacs can also look in an XDG-compatible location for @file{init.el}, the default is the directory @file{~/.config/emacs}. This can be -overriden by setting @env{XDG_CONFIG_HOME} in your environment, its +overridden by setting @env{XDG_CONFIG_HOME} in your environment, its value replaces @file{~/.config} in the name of the default XDG init file. However @file{~/.emacs.d}, @file{~/.emacs}, and @file{~/.emacs.el} are always preferred if they exist, which means diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index a9b0da5aff6..1f10b68b8a7 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1458,7 +1458,7 @@ working tree to match the branch you switch to. Bazaar also supports co-located branches, in which case the @kbd{bzr switch} command will switch branches in the current directory. With Subversion, you switch to another branch using the @kbd{svn switch} command. With -Mercurial, command @kbd{hg update} is used to swith to another +Mercurial, command @kbd{hg update} is used to switch to another branch. The VC command to switch to another branch in the current directory |