[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 63c93f7: Fix typos and wording in the Emacs manua
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 63c93f7: Fix typos and wording in the Emacs manual |
Date: |
Fri, 16 Feb 2018 04:13:33 -0500 (EST) |
branch: emacs-26
commit 63c93f7ecd469cd8267f2c7c87530341a157b144
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix typos and wording in the Emacs manual
* doc/emacs/dired.texi (Marks vs Flags, Hiding Subdirectories):
* doc/emacs/maintaining.texi (Tag Syntax):
* doc/emacs/building.texi (Commands of GUD, Threads Buffer)
(Lisp Libraries):
* doc/emacs/windows.texi (Temporary Displays): Fix typos.
* doc/emacs/files.texi (Backup Copying): Fix wording. Reported by
Stefan Kamphausen <address@hidden> in
address@hidden
---
doc/emacs/building.texi | 10 +++++-----
doc/emacs/dired.texi | 9 +++++----
doc/emacs/files.texi | 11 ++++++-----
doc/emacs/maintaining.texi | 2 +-
doc/emacs/windows.texi | 2 +-
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 878d2f5..b6b664d 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -649,7 +649,7 @@ Set a breakpoint on the source line that point is on.
buffer, sets a debugger breakpoint on the current source line. This
command is available only after starting address@hidden If you call it in a
buffer that is not associated with any debugger subprocess, it signals
-a error.
+an error.
@kindex C-x C-a @r{(GUD)}
The following commands are available both in the GUD interaction
@@ -1096,9 +1096,9 @@ display the corresponding buffer in a new frame.
When you create a buffer showing information about some specific
thread, it becomes bound to that thread and keeps showing actual
information while you debug your program. The mode indicator for each
-GDB buffer shows the number of thread it is showing information about.
-The thread number is also included in the buffer name of bound
-buffers.
+GDB buffer shows the number of the thread whose information that
+buffer displays. The thread number is also included in the name of
+each bound buffer.
Further commands are available in the GDB Threads buffer which
depend on the mode of GDB that is used for controlling execution of
@@ -1449,7 +1449,7 @@ buffer). To disable this feature, change the variable
@vindex load-dangerous-libraries
@cindex Lisp files byte-compiled by XEmacs
By default, Emacs refuses to load compiled Lisp files which were
-compiled with XEmacs, a modified versions of Emacs---they can cause
+compiled with XEmacs, a modified version of Emacs---they can cause
Emacs to crash. Set the variable @code{load-dangerous-libraries} to
@code{t} if you want to try loading them.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 6b6ab3a..94a10fe 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -579,9 +579,10 @@ might be inconsistent with the file on disk if its
contents have changed
since it was last visited. If you don't want this, you may wish to
revert the files you have visited in your buffers, or to turn on
the @code{auto-revert} mode in those buffers, before invoking this
-command. @xref{Reverting}. If you prefer that this command always revisit
-the file, without having to revert the file or enable @code{auto-revert}
-mode, you might want to set @code{dired-always-read-filesystem} to
address@hidden
+command. @xref{Reverting}. If you prefer that this command always
+revisits the file, without having to revert the file or enable
address@hidden mode, you might want to set
address@hidden to address@hidden
@item C-/
@itemx C-x u
@@ -1173,7 +1174,7 @@ without having to remove the Dired marks on files in those
subdirectories.
@xref{Subdirectories in Dired}, for how to insert a subdirectory
-listing, and @pxref{Dired Updating} for how delete it.
+listing, and see @ref{Dired Updating}, for how to delete it.
@node Dired Updating
@section Updating the Dired Buffer
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 45db6d8..42cc4e7 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -694,11 +694,12 @@ Otherwise, renaming is the default choice.
When a file is managed with a version control system (@pxref{Version
Control}), Emacs does not normally make backups in the usual way for
-that file. But check-in and check-out are similar in some ways to
-making backups. One unfortunate similarity is that these operations
-typically break hard links, disconnecting the file name you visited from
-any alternate names for the same file. This has nothing to do with
-Emacs---the version control system does it.
+that file. But @dfn{committing} (a.k.a.@: @dfn{checking in},
address@hidden Concepts}) new versions of files is similar in some ways
+to making backups. One unfortunate similarity is that these
+operations typically break hard links, disconnecting the file name you
+visited from any alternate names for the same file. This has nothing
+to do with Emacs---the version control system does it.
@node Customize Save
@subsection Customizing Saving of Files
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 127c27c..1234db8 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2203,7 +2203,7 @@ In Ada, the same name can be used for different kinds of
entity
(e.g., for a procedure and for a function). Also, for things like
packages, procedures and functions, there is the spec (i.e., the
interface) and the body (i.e., the implementation). To make it
-easier to pick the definition you want, Ada tag name have suffixes
+easier to pick the definition you want, Ada tag names have suffixes
indicating the type of entity:
@table @samp
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 945b7cb..9f3b1b6 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -465,7 +465,7 @@ bottom of the selected frame, regardless of the number of
windows
already shown on that frame.
If you prefer Emacs to display a temporary buffer in a different
-fashion, we recommend to customize the variable
+fashion, we recommend customizing the variable
@code{display-buffer-alist} (@pxref{Choosing Window,,Choosing a Window
for Display, elisp, The Emacs Lisp Reference Manual}). For example,
to display @file{*Completions*} by splitting a window as described in
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 63c93f7: Fix typos and wording in the Emacs manual,
Eli Zaretskii <=