[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 f589f5a: Yest another round of manual copyedits
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 f589f5a: Yest another round of manual copyedits |
Date: |
Sat, 3 Feb 2018 06:51:47 -0500 (EST) |
branch: emacs-26
commit f589f5ae6e19210b8520526fa3111243ca446b02
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Yest another round of manual copyedits
* doc/emacs/fixit.texi (Transpose, Spelling): Minor stylistic
changes. Suggested by myq larson <address@hidden> in
address@hidden
* doc/emacs/calendar.texi (Appointments, Time Intervals): Mention
relevant Org features. Suggested by Alex Branham
<address@hidden> in address@hidden
* doc/emacs/dired.texi (Operating on Files)
(Shell Commands in Dired, Image-Dired): Minor stylistic edits.
Suggested by Francis Wright <address@hidden> in
address@hidden
* doc/emacs/commands.texi (User Input): Explain "C-M-a".
Suggested by Martin Luethi <address@hidden> in
address@hidden
---
doc/emacs/calendar.texi | 11 +++++++++--
doc/emacs/commands.texi | 11 ++++++-----
doc/emacs/dired.texi | 11 ++++++-----
doc/emacs/fixit.texi | 37 ++++++++++++++++++++-----------------
4 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 7ce73a6..9145a72 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1435,7 +1435,11 @@ also updated whenever the diary file (or a file it
includes; see
@ifnottex
@ref{Fancy Diary Display})
@end ifnottex
-is saved.
+is saved. If you use the Org Mode and keep appointments in your Org
+agenda files, you can add those appointments to the list using the
address@hidden command. @xref{Weekly/daily agenda,
+Appointment reminders,,org, The Org Manual}, for more about that
+command.
@findex appt-add
@findex appt-delete
@@ -1581,10 +1585,13 @@ variables' values are 120.
@cindex time intervals, summing
@cindex summing time intervals
@cindex timeclock
address@hidden clocking time
The timeclock package adds up time intervals, so you can (for
instance) keep track of how much time you spend working on particular
-projects.
+projects. (A more advanced alternative is to use the Org Mode's
+facilities for clocking time, @pxref{Clocking work time,,,org, The Org
+Manual}).
@findex timeclock-in
@findex timeclock-out
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 2e65bfd..8b8b0c7 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -56,11 +56,12 @@ characters, e.g., @address@hidden or @address@hidden
@cindex @key{ESC} replacing @key{META} key
You can also type Meta characters using two-character sequences
starting with @key{ESC}. Thus, you can enter @kbd{M-a} by typing
address@hidden@key{ESC} a}. You can enter @kbd{C-M-a} by typing @address@hidden
-C-a}. Unlike @key{META}, @key{ESC} is entered as a separate
-character. You don't hold down @key{ESC} while typing the next
-character; instead, press @key{ESC} and release it, then enter the
-next character. This feature is useful on certain text terminals
address@hidden@key{ESC} a}. You can enter @kbd{C-M-a} (holding down both
address@hidden and @key{Alt}, then pressing @kbd{a}) by typing
address@hidden@key{ESC} C-a}. Unlike @key{META}, @key{ESC} is entered as a
+separate character. You don't hold down @key{ESC} while typing the
+next character; instead, press @key{ESC} and release it, then enter
+the next character. This feature is useful on certain text terminals
where the @key{META} key does not function reliably.
@cindex keys stolen by window manager
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 805f580..6b6ab3a 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -727,8 +727,8 @@ this.)
@vindex dired-chown-program
The variable @code{dired-chown-program} specifies the name of the
-program to use to do the work (different systems put @command{chown}
-in different places).
+program to use to do the work. (This variable is necessary because
+different systems put @command{chown} in different places).
@findex dired-do-touch
@kindex T @r{(Dired)}
@@ -898,7 +898,7 @@ treat it specially.
Otherwise, if the command string contains @samp{?} surrounded by
whitespace or @samp{`?`}, Emacs runs the shell command once
@emph{for each file}, substituting the current file name for @samp{?}
-and @samp{`?`} each time. You can use both @samp{?} or @samp{`?`} more
+and @samp{`?`} each time. You can use both @samp{?} and @samp{`?`} more
than once in the command; the same file name replaces each occurrence.
If you mix them with @samp{*} the command signals an error.
@@ -1391,7 +1391,7 @@ display the next image. Typing @key{DEL}
the previous thumbnail and displays that instead.
@vindex image-dired-external-viewer
- To view and the image in its original size, either provide a prefix
+ To view the image in its original size, either provide a prefix
argument (@kbd{C-u}) before pressing @key{RET}, or type
@address@hidden (@code{image-dired-thumbnail-display-external}) to
display the image in an external viewer. You must first configure
@@ -1426,7 +1426,8 @@ a comment from Dired
(@code{image-dired-dired-comment-files}).
Image-Dired also provides simple image manipulation. In the
thumbnail buffer, type @kbd{L} to rotate the original image 90 degrees
anti clockwise, and @kbd{R} to rotate it 90 degrees clockwise. This
-rotation is lossless, and uses an external utility called JpegTRAN.
+rotation is lossless, and uses an external utility called
address@hidden, which you need to install first.
@node Misc Dired Features
@section Other Dired Features
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index ced1ef9..aca85f3 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -159,9 +159,10 @@ last two characters on the line. So, if you catch your
transposition error
right away, you can fix it with just a @kbd{C-t}. If you don't catch it so
fast, you must move the cursor back between the two transposed
characters before you type @kbd{C-t}. If you transposed a space with
-the last character of the word before it, the word motion commands are
-a good way of getting there. Otherwise, a reverse search (@kbd{C-r})
-is often the best way. @xref{Search}.
+the last character of the word before it, the word motion commands
+(@kbd{M-f}, @kbd{M-b}, etc.) are a good way of getting there.
+Otherwise, a reverse search (@kbd{C-r}) is often the best way.
address@hidden
@kindex C-x C-t
@findex transpose-lines
@@ -181,22 +182,23 @@ punctuation characters between the words do not move.
For example,
@kbd{C-M-t} (@code{transpose-sexps}) is a similar command for
transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t}
(@code{transpose-lines}) exchanges lines. They work like @kbd{M-t}
-except as regards what units of text they transpose.
+except as regards the units of text they transpose.
A numeric argument to a transpose command serves as a repeat count: it
-tells the transpose command to move the character (word, expression, line)
-before or containing point across several other characters (words,
-expressions, lines). For example, @kbd{C-u 3 C-t} moves the character before
-point forward across three other characters. It would change
address@hidden@point{}oobar} into @address@hidden This is equivalent to
-repeating @kbd{C-t} three times. @kbd{C-u - 4 M-t} moves the word
-before point backward across four words. @kbd{C-u - C-M-t} would cancel
-the effect of plain @kbd{C-M-t}.
+tells the transpose command to move the character (or word or
+expression or line) before or containing point across several other
+characters (or words or expressions or lines). For example, @kbd{C-u
+3 C-t} moves the character before point forward across three other
+characters. It would change @address@hidden into
address@hidden@point{}ar}. This is equivalent to repeating @kbd{C-t}
+three times. @kbd{C-u - 4 M-t} moves the word before point backward
+across four words. @kbd{C-u - C-M-t} would cancel the effect of plain
address@hidden
A numeric argument of zero is assigned a special meaning (because
otherwise a command with a repeat count of zero would do nothing): to
-transpose the character (word, expression, line) ending after point
-with the one ending after the mark.
+transpose the character (or word or expression or line) ending after
+point with the one ending after the mark.
@node Fixing Case
@section Case Conversion
@@ -227,9 +229,10 @@ case-convert it and go on typing. @xref{Case}.
This section describes the commands to check the spelling of a
single word or of a portion of a buffer. These commands only work if
-the spelling checker program Hunspell, Aspell, Ispell or Enchant is installed.
-These programs are not part of Emacs, but one of them is usually
-installed in GNU/Linux and other free operating systems.
+a spelling checker program, one of Hunspell, Aspell, Ispell or
+Enchant, is installed. These programs are not part of Emacs, but one
+of them is usually installed in GNU/Linux and other free operating
+systems.
@ifnottex
@xref{Top, Aspell,, aspell, The Aspell Manual}.
@end ifnottex
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 f589f5a: Yest another round of manual copyedits,
Eli Zaretskii <=