aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris2018-02-17 07:50:28 -0800
committerGlenn Morris2018-02-17 07:50:28 -0800
commit4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch)
tree6c0a7893b3aab0166b35938338fa289c3a01df74 /doc/misc
parentcb3863370cbe574810f796726faa39ba0de0a429 (diff)
parente5a29330aae4491fd384bacaff6f453c6434d322 (diff)
downloademacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz
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.texi2
-rw-r--r--doc/misc/cc-mode.texi2
-rw-r--r--doc/misc/efaq.texi4
-rw-r--r--doc/misc/eshell.texi2
-rw-r--r--doc/misc/gnus-faq.texi8
-rw-r--r--doc/misc/org.texi2
-rw-r--r--doc/misc/sc.texi4
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
243put at these places. Point is left at first @code{_} where nothing is wrapped. 243put at these places. Point is left at first @code{_} where nothing is wrapped.
244@item @code{>} 244@item @code{>}
245Indent line according to major mode. When following element is @code{_}, and 245Indent line according to major mode. When following element is @code{_}, and
246there is a interregion that will be wrapped here, indent that interregion. 246there is an interregion that will be wrapped here, indent that interregion.
247@item @code{&} 247@item @code{&}
248Logical and. If preceding element moved point, i.e., usually inserted 248Logical and. If preceding element moved point, i.e., usually inserted
249something, do following element. 249something, 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}:
2408@end group 2408@end group
2409@end example 2409@end example
2410 2410
2411In a programming team, a hook is a also a good place for each member 2411In a programming team, a hook is also a good place for each member
2412to put his own personal preferences. For example, you might be the 2412to put his own personal preferences. For example, you might be the
2413only person in your team who likes Auto-newline minor mode. You could 2413only person in your team who likes Auto-newline minor mode. You could
2414have it enabled by default by placing the following in your 2414have 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:
753Info files don't actually need to be installed before being used. 753Info files don't actually need to be installed before being used.
754You can use a prefix argument for the @code{info} command and specify 754You can use a prefix argument for the @code{info} command and specify
755the name of the Info file in the minibuffer. This goes to the node 755the name of the Info file in the minibuffer. This goes to the node
756named @samp{Top} in that file. For example, to view a Info file named 756named @samp{Top} in that file. For example, to view an Info file named
757@file{@var{info-file}} in your home directory, you can type this: 757@file{@var{info-file}} in your home directory, you can type this:
758 758
759@example 759@example
@@ -3419,7 +3419,7 @@ version of Emacs, and see @ref{Current GNU distributions}, for a list of
3419archive sites that make GNU software available. 3419archive sites that make GNU software available.
3420 3420
3421@node Finding a package with particular functionality 3421@node Finding a package with particular functionality
3422@section How do I find a Emacs Lisp package that does XXX? 3422@section How do I find an Emacs Lisp package that does XXX?
3423@cindex Package, finding 3423@cindex Package, finding
3424@cindex Finding an Emacs Lisp package 3424@cindex Finding an Emacs Lisp package
3425@cindex Functionality, finding a particular package 3425@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.
1022 1022
1023@item Create a mode @code{eshell-browse} 1023@item Create a mode @code{eshell-browse}
1024 1024
1025It would treat the Eshell buffer as a outline. Collapsing the outline 1025It would treat the Eshell buffer as an outline. Collapsing the outline
1026hides all of the output text. Collapsing again would show only the 1026hides all of the output text. Collapsing again would show only the
1027first command run in each directory 1027first command run in each directory
1028 1028
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
441@noindent 441@noindent
442. 442.
443Make sure that the file isn't readable to others if you 443Make sure that the file isn't readable to others if you
444work on a OS which is capable of doing so. (Under Unix 444work on an OS which is capable of doing so. (Under Unix
445say 445say
446@example 446@example
447chmod 600 ~/.authinfo 447chmod 600 ~/.authinfo
@@ -1449,7 +1449,7 @@ all those email addresses?
1449 1449
1450@subsubheading Answer 1450@subsubheading Answer
1451 1451
1452There's an very basic solution for this, mail aliases. 1452There's a very basic solution for this, mail aliases.
1453You can store your mail addresses in a ~/.mailrc file using a simple 1453You can store your mail addresses in a ~/.mailrc file using a simple
1454alias syntax: 1454alias syntax:
1455 1455
@@ -2012,7 +2012,7 @@ server by typing @samp{J a}. If you
2012make a mistake, or change your mind, you can undo this 2012make a mistake, or change your mind, you can undo this
2013action by typing @samp{J r}. When 2013action by typing @samp{J r}. When
2014you're done, type 'q' to return to the group buffer. 2014you're done, type 'q' to return to the group buffer.
2015Now the next time you enter a group on a agentized 2015Now the next time you enter a group on an agentized
2016server, the headers will be stored on disk and read from 2016server, the headers will be stored on disk and read from
2017there the next time you enter the group. 2017there the next time you enter the group.
2018 2018
@@ -2293,7 +2293,7 @@ When the term Emacs is used in this FAQ, it means either GNU
2293Emacs or XEmacs. 2293Emacs or XEmacs.
2294 2294
2295@item Message 2295@item Message
2296In this FAQ message means a either a mail or a posting to a 2296In this FAQ message means either a mail or a posting to a
2297Usenet Newsgroup or to some other fancy back end, no matter 2297Usenet Newsgroup or to some other fancy back end, no matter
2298of which kind it is. 2298of which kind it is.
2299 2299
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:
12989 12989
12990@subsubheading Embedding clickable images 12990@subsubheading Embedding clickable images
12991For clickable images, provide a link whose description is another link to an 12991For clickable images, provide a link whose description is another link to an
12992image file. For example, to embed a image @file{org-mode-unicorn.png} which 12992image file. For example, to embed an image @file{org-mode-unicorn.png} which
12993when clicked jumps to @uref{http://Orgmode.org} website, do the following 12993when clicked jumps to @uref{http://Orgmode.org} website, do the following
12994 12994
12995@example 12995@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!
1340 1340
1341Regi works by interpreting frames with the function 1341Regi works by interpreting frames with the function
1342@code{regi-interpret}. A frame is a list of arbitrary size where each 1342@code{regi-interpret}. A frame is a list of arbitrary size where each
1343element is a entry of the following form: 1343element is an entry of the following form:
1344 1344
1345@example 1345@example
1346(@var{pred} @var{func} [@var{negate-p} [@var{case-fold-search}]]) 1346(@var{pred} @var{func} [@var{negate-p} [@var{case-fold-search}]])
@@ -1709,7 +1709,7 @@ of information from the info alist.
1709@item @code{sc-mail-field-query} (@kbd{C-c C-p f}) 1709@item @code{sc-mail-field-query} (@kbd{C-c C-p f})
1710Allows you to interactively view, modify, add, and delete info alist 1710Allows you to interactively view, modify, add, and delete info alist
1711key-value pairs. With no argument, you are prompted (with completion) 1711key-value pairs. With no argument, you are prompted (with completion)
1712for a info key. The value associated with that key is displayed in the 1712for an info key. The value associated with that key is displayed in the
1713minibuffer. With an argument, this command will first ask if you want 1713minibuffer. With an argument, this command will first ask if you want
1714to view, modify, add, or delete an info key. Viewing is identical to 1714to view, modify, add, or delete an info key. Viewing is identical to
1715running the command with no arguments. 1715running the command with no arguments.