diff options
author | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /doc/misc | |
parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.bz2 emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'doc/misc')
-rw-r--r-- | doc/misc/autotype.texi | 2 | ||||
-rw-r--r-- | doc/misc/cc-mode.texi | 2 | ||||
-rw-r--r-- | doc/misc/efaq.texi | 4 | ||||
-rw-r--r-- | doc/misc/eshell.texi | 2 | ||||
-rw-r--r-- | doc/misc/gnus-faq.texi | 8 | ||||
-rw-r--r-- | doc/misc/org.texi | 2 | ||||
-rw-r--r-- | doc/misc/sc.texi | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 026c57126d2..3d61d24fa9d 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -243,7 +243,7 @@ Interesting point. When wrapping skeletons around successive regions, they are put at these places. Point is left at first @code{_} where nothing is wrapped. @item @code{>} Indent line according to major mode. When following element is @code{_}, and -there is a interregion that will be wrapped here, indent that interregion. +there is an interregion that will be wrapped here, indent that interregion. @item @code{&} Logical and. If preceding element moved point, i.e., usually inserted something, do following element. diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 0132ab1775c..2de56fa05c0 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -2408,7 +2408,7 @@ could achieve this with code like this in your @file{.emacs}: @end group @end example -In a programming team, a hook is a also a good place for each member +In a programming team, a hook is also a good place for each member to put his own personal preferences. For example, you might be the only person in your team who likes Auto-newline minor mode. You could have it enabled by default by placing the following in your diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 5392748d00f..da6fda08833 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -753,7 +753,7 @@ privileges, you have several options: Info files don't actually need to be installed before being used. You can use a prefix argument for the @code{info} command and specify the name of the Info file in the minibuffer. This goes to the node -named @samp{Top} in that file. For example, to view a Info file named +named @samp{Top} in that file. For example, to view an Info file named @file{@var{info-file}} in your home directory, you can type this: @example @@ -3419,7 +3419,7 @@ version of Emacs, and see @ref{Current GNU distributions}, for a list of archive sites that make GNU software available. @node Finding a package with particular functionality -@section How do I find a Emacs Lisp package that does XXX? +@section How do I find an Emacs Lisp package that does XXX? @cindex Package, finding @cindex Finding an Emacs Lisp package @cindex Functionality, finding a particular package diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 43f8cd63811..1789767dbe2 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -1022,7 +1022,7 @@ So that the user can enter @samp{info chmod}, for example. @item Create a mode @code{eshell-browse} -It would treat the Eshell buffer as a outline. Collapsing the outline +It would treat the Eshell buffer as an outline. Collapsing the outline hides all of the output text. Collapsing again would show only the first command run in each directory diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 14c0117191e..26135b81de7 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -441,7 +441,7 @@ machine news.yourprovider.net login YourUserName password YourPassword @noindent . Make sure that the file isn't readable to others if you -work on a OS which is capable of doing so. (Under Unix +work on an OS which is capable of doing so. (Under Unix say @example chmod 600 ~/.authinfo @@ -1449,7 +1449,7 @@ all those email addresses? @subsubheading Answer -There's an very basic solution for this, mail aliases. +There's a very basic solution for this, mail aliases. You can store your mail addresses in a ~/.mailrc file using a simple alias syntax: @@ -2012,7 +2012,7 @@ server by typing @samp{J a}. If you make a mistake, or change your mind, you can undo this action by typing @samp{J r}. When you're done, type 'q' to return to the group buffer. -Now the next time you enter a group on a agentized +Now the next time you enter a group on an agentized server, the headers will be stored on disk and read from there the next time you enter the group. @@ -2293,7 +2293,7 @@ When the term Emacs is used in this FAQ, it means either GNU Emacs or XEmacs. @item Message -In this FAQ message means a either a mail or a posting to a +In this FAQ message means either a mail or a posting to a Usenet Newsgroup or to some other fancy back end, no matter of which kind it is. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 68aa01ca18c..17931905f1a 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -12989,7 +12989,7 @@ of these examples works: @subsubheading Embedding clickable images For clickable images, provide a link whose description is another link to an -image file. For example, to embed a image @file{org-mode-unicorn.png} which +image file. For example, to embed an image @file{org-mode-unicorn.png} which when clicked jumps to @uref{http://Orgmode.org} website, do the following @example diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index d8faad9099f..f214152b5f4 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -1340,7 +1340,7 @@ currently part of Supercite, but contributions are welcome! Regi works by interpreting frames with the function @code{regi-interpret}. A frame is a list of arbitrary size where each -element is a entry of the following form: +element is an entry of the following form: @example (@var{pred} @var{func} [@var{negate-p} [@var{case-fold-search}]]) @@ -1709,7 +1709,7 @@ of information from the info alist. @item @code{sc-mail-field-query} (@kbd{C-c C-p f}) Allows you to interactively view, modify, add, and delete info alist key-value pairs. With no argument, you are prompted (with completion) -for a info key. The value associated with that key is displayed in the +for an info key. The value associated with that key is displayed in the minibuffer. With an argument, this command will first ask if you want to view, modify, add, or delete an info key. Viewing is identical to running the command with no arguments. |