diff options
| author | Eli Zaretskii | 2018-02-03 13:50:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-02-03 13:50:38 +0200 |
| commit | f589f5ae6e19210b8520526fa3111243ca446b02 (patch) | |
| tree | b1e039c055a48b7f7600696b1d6076ee266c51e0 /doc | |
| parent | 1ed408995a622a4c0cd7176f9bd0d81ebfbb5e43 (diff) | |
| download | emacs-f589f5ae6e19210b8520526fa3111243ca446b02.tar.gz emacs-f589f5ae6e19210b8520526fa3111243ca446b02.zip | |
Yest another round of manual copyedits
* doc/emacs/fixit.texi (Transpose, Spelling): Minor stylistic
changes. Suggested by myq larson <myqlarson@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/calendar.texi (Appointments, Time Intervals): Mention
relevant Org features. Suggested by Alex Branham
<alex.branham@gmail.com> in emacs-manual-bugs@gnu.org.
* doc/emacs/dired.texi (Operating on Files)
(Shell Commands in Dired, Image-Dired): Minor stylistic edits.
Suggested by Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.
* doc/emacs/commands.texi (User Input): Explain "C-M-a".
Suggested by Martin Luethi <martin.luethi@geo.uzh.ch> in
emacs-manual-bugs@gnu.org.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/calendar.texi | 11 | ||||
| -rw-r--r-- | doc/emacs/commands.texi | 11 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 11 | ||||
| -rw-r--r-- | 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 7ce73a662b8..9145a725e12 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 | |||
| 1435 | @ifnottex | 1435 | @ifnottex |
| 1436 | @ref{Fancy Diary Display}) | 1436 | @ref{Fancy Diary Display}) |
| 1437 | @end ifnottex | 1437 | @end ifnottex |
| 1438 | is saved. | 1438 | is saved. If you use the Org Mode and keep appointments in your Org |
| 1439 | agenda files, you can add those appointments to the list using the | ||
| 1440 | @code{org-agenda-to-appt} command. @xref{Weekly/daily agenda, | ||
| 1441 | Appointment reminders,,org, The Org Manual}, for more about that | ||
| 1442 | command. | ||
| 1439 | 1443 | ||
| 1440 | @findex appt-add | 1444 | @findex appt-add |
| 1441 | @findex appt-delete | 1445 | @findex appt-delete |
| @@ -1581,10 +1585,13 @@ variables' values are 120. | |||
| 1581 | @cindex time intervals, summing | 1585 | @cindex time intervals, summing |
| 1582 | @cindex summing time intervals | 1586 | @cindex summing time intervals |
| 1583 | @cindex timeclock | 1587 | @cindex timeclock |
| 1588 | @cindex clocking time | ||
| 1584 | 1589 | ||
| 1585 | The timeclock package adds up time intervals, so you can (for | 1590 | The timeclock package adds up time intervals, so you can (for |
| 1586 | instance) keep track of how much time you spend working on particular | 1591 | instance) keep track of how much time you spend working on particular |
| 1587 | projects. | 1592 | projects. (A more advanced alternative is to use the Org Mode's |
| 1593 | facilities for clocking time, @pxref{Clocking work time,,,org, The Org | ||
| 1594 | Manual}). | ||
| 1588 | 1595 | ||
| 1589 | @findex timeclock-in | 1596 | @findex timeclock-in |
| 1590 | @findex timeclock-out | 1597 | @findex timeclock-out |
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 2e65bfd3859..8b8b0c7aad9 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi | |||
| @@ -56,11 +56,12 @@ characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}. | |||
| 56 | @cindex @key{ESC} replacing @key{META} key | 56 | @cindex @key{ESC} replacing @key{META} key |
| 57 | You can also type Meta characters using two-character sequences | 57 | You can also type Meta characters using two-character sequences |
| 58 | starting with @key{ESC}. Thus, you can enter @kbd{M-a} by typing | 58 | starting with @key{ESC}. Thus, you can enter @kbd{M-a} by typing |
| 59 | @kbd{@key{ESC} a}. You can enter @kbd{C-M-a} by typing @kbd{@key{ESC} | 59 | @kbd{@key{ESC} a}. You can enter @kbd{C-M-a} (holding down both |
| 60 | C-a}. Unlike @key{META}, @key{ESC} is entered as a separate | 60 | @key{Ctrl} and @key{Alt}, then pressing @kbd{a}) by typing |
| 61 | character. You don't hold down @key{ESC} while typing the next | 61 | @kbd{@key{ESC} C-a}. Unlike @key{META}, @key{ESC} is entered as a |
| 62 | character; instead, press @key{ESC} and release it, then enter the | 62 | separate character. You don't hold down @key{ESC} while typing the |
| 63 | next character. This feature is useful on certain text terminals | 63 | next character; instead, press @key{ESC} and release it, then enter |
| 64 | the next character. This feature is useful on certain text terminals | ||
| 64 | where the @key{META} key does not function reliably. | 65 | where the @key{META} key does not function reliably. |
| 65 | 66 | ||
| 66 | @cindex keys stolen by window manager | 67 | @cindex keys stolen by window manager |
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 805f580086d..6b6ab3a0391 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi | |||
| @@ -727,8 +727,8 @@ this.) | |||
| 727 | 727 | ||
| 728 | @vindex dired-chown-program | 728 | @vindex dired-chown-program |
| 729 | The variable @code{dired-chown-program} specifies the name of the | 729 | The variable @code{dired-chown-program} specifies the name of the |
| 730 | program to use to do the work (different systems put @command{chown} | 730 | program to use to do the work. (This variable is necessary because |
| 731 | in different places). | 731 | different systems put @command{chown} in different places). |
| 732 | 732 | ||
| 733 | @findex dired-do-touch | 733 | @findex dired-do-touch |
| 734 | @kindex T @r{(Dired)} | 734 | @kindex T @r{(Dired)} |
| @@ -898,7 +898,7 @@ treat it specially. | |||
| 898 | Otherwise, if the command string contains @samp{?} surrounded by | 898 | Otherwise, if the command string contains @samp{?} surrounded by |
| 899 | whitespace or @samp{`?`}, Emacs runs the shell command once | 899 | whitespace or @samp{`?`}, Emacs runs the shell command once |
| 900 | @emph{for each file}, substituting the current file name for @samp{?} | 900 | @emph{for each file}, substituting the current file name for @samp{?} |
| 901 | and @samp{`?`} each time. You can use both @samp{?} or @samp{`?`} more | 901 | and @samp{`?`} each time. You can use both @samp{?} and @samp{`?`} more |
| 902 | than once in the command; the same file name replaces each occurrence. | 902 | than once in the command; the same file name replaces each occurrence. |
| 903 | If you mix them with @samp{*} the command signals an error. | 903 | If you mix them with @samp{*} the command signals an error. |
| 904 | 904 | ||
| @@ -1391,7 +1391,7 @@ display the next image. Typing @key{DEL} | |||
| 1391 | the previous thumbnail and displays that instead. | 1391 | the previous thumbnail and displays that instead. |
| 1392 | 1392 | ||
| 1393 | @vindex image-dired-external-viewer | 1393 | @vindex image-dired-external-viewer |
| 1394 | To view and the image in its original size, either provide a prefix | 1394 | To view the image in its original size, either provide a prefix |
| 1395 | argument (@kbd{C-u}) before pressing @key{RET}, or type | 1395 | argument (@kbd{C-u}) before pressing @key{RET}, or type |
| 1396 | @kbd{C-@key{RET}} (@code{image-dired-thumbnail-display-external}) to | 1396 | @kbd{C-@key{RET}} (@code{image-dired-thumbnail-display-external}) to |
| 1397 | display the image in an external viewer. You must first configure | 1397 | 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}). | |||
| 1426 | Image-Dired also provides simple image manipulation. In the | 1426 | Image-Dired also provides simple image manipulation. In the |
| 1427 | thumbnail buffer, type @kbd{L} to rotate the original image 90 degrees | 1427 | thumbnail buffer, type @kbd{L} to rotate the original image 90 degrees |
| 1428 | anti clockwise, and @kbd{R} to rotate it 90 degrees clockwise. This | 1428 | anti clockwise, and @kbd{R} to rotate it 90 degrees clockwise. This |
| 1429 | rotation is lossless, and uses an external utility called JpegTRAN. | 1429 | rotation is lossless, and uses an external utility called |
| 1430 | @command{jpegtran}, which you need to install first. | ||
| 1430 | 1431 | ||
| 1431 | @node Misc Dired Features | 1432 | @node Misc Dired Features |
| 1432 | @section Other Dired Features | 1433 | @section Other Dired Features |
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index ced1ef9dbfc..aca85f3de07 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 | |||
| 159 | right away, you can fix it with just a @kbd{C-t}. If you don't catch it so | 159 | right away, you can fix it with just a @kbd{C-t}. If you don't catch it so |
| 160 | fast, you must move the cursor back between the two transposed | 160 | fast, you must move the cursor back between the two transposed |
| 161 | characters before you type @kbd{C-t}. If you transposed a space with | 161 | characters before you type @kbd{C-t}. If you transposed a space with |
| 162 | the last character of the word before it, the word motion commands are | 162 | the last character of the word before it, the word motion commands |
| 163 | a good way of getting there. Otherwise, a reverse search (@kbd{C-r}) | 163 | (@kbd{M-f}, @kbd{M-b}, etc.) are a good way of getting there. |
| 164 | is often the best way. @xref{Search}. | 164 | Otherwise, a reverse search (@kbd{C-r}) is often the best way. |
| 165 | @xref{Search}. | ||
| 165 | 166 | ||
| 166 | @kindex C-x C-t | 167 | @kindex C-x C-t |
| 167 | @findex transpose-lines | 168 | @findex transpose-lines |
| @@ -181,22 +182,23 @@ punctuation characters between the words do not move. For example, | |||
| 181 | @kbd{C-M-t} (@code{transpose-sexps}) is a similar command for | 182 | @kbd{C-M-t} (@code{transpose-sexps}) is a similar command for |
| 182 | transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t} | 183 | transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t} |
| 183 | (@code{transpose-lines}) exchanges lines. They work like @kbd{M-t} | 184 | (@code{transpose-lines}) exchanges lines. They work like @kbd{M-t} |
| 184 | except as regards what units of text they transpose. | 185 | except as regards the units of text they transpose. |
| 185 | 186 | ||
| 186 | A numeric argument to a transpose command serves as a repeat count: it | 187 | A numeric argument to a transpose command serves as a repeat count: it |
| 187 | tells the transpose command to move the character (word, expression, line) | 188 | tells the transpose command to move the character (or word or |
| 188 | before or containing point across several other characters (words, | 189 | expression or line) before or containing point across several other |
| 189 | expressions, lines). For example, @kbd{C-u 3 C-t} moves the character before | 190 | characters (or words or expressions or lines). For example, @kbd{C-u |
| 190 | point forward across three other characters. It would change | 191 | 3 C-t} moves the character before point forward across three other |
| 191 | @samp{f@point{}oobar} into @samp{oobf@point{}ar}. This is equivalent to | 192 | characters. It would change @samp{f@point{}oobar} into |
| 192 | repeating @kbd{C-t} three times. @kbd{C-u - 4 M-t} moves the word | 193 | @samp{oobf@point{}ar}. This is equivalent to repeating @kbd{C-t} |
| 193 | before point backward across four words. @kbd{C-u - C-M-t} would cancel | 194 | three times. @kbd{C-u - 4 M-t} moves the word before point backward |
| 194 | the effect of plain @kbd{C-M-t}. | 195 | across four words. @kbd{C-u - C-M-t} would cancel the effect of plain |
| 196 | @kbd{C-M-t}. | ||
| 195 | 197 | ||
| 196 | A numeric argument of zero is assigned a special meaning (because | 198 | A numeric argument of zero is assigned a special meaning (because |
| 197 | otherwise a command with a repeat count of zero would do nothing): to | 199 | otherwise a command with a repeat count of zero would do nothing): to |
| 198 | transpose the character (word, expression, line) ending after point | 200 | transpose the character (or word or expression or line) ending after |
| 199 | with the one ending after the mark. | 201 | point with the one ending after the mark. |
| 200 | 202 | ||
| 201 | @node Fixing Case | 203 | @node Fixing Case |
| 202 | @section Case Conversion | 204 | @section Case Conversion |
| @@ -227,9 +229,10 @@ case-convert it and go on typing. @xref{Case}. | |||
| 227 | 229 | ||
| 228 | This section describes the commands to check the spelling of a | 230 | This section describes the commands to check the spelling of a |
| 229 | single word or of a portion of a buffer. These commands only work if | 231 | single word or of a portion of a buffer. These commands only work if |
| 230 | the spelling checker program Hunspell, Aspell, Ispell or Enchant is installed. | 232 | a spelling checker program, one of Hunspell, Aspell, Ispell or |
| 231 | These programs are not part of Emacs, but one of them is usually | 233 | Enchant, is installed. These programs are not part of Emacs, but one |
| 232 | installed in GNU/Linux and other free operating systems. | 234 | of them is usually installed in GNU/Linux and other free operating |
| 235 | systems. | ||
| 233 | @ifnottex | 236 | @ifnottex |
| 234 | @xref{Top, Aspell,, aspell, The Aspell Manual}. | 237 | @xref{Top, Aspell,, aspell, The Aspell Manual}. |
| 235 | @end ifnottex | 238 | @end ifnottex |