summaryrefslogtreecommitdiff
path: root/doc/misc
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-11-13 07:00:30 +0100
committerStefan Kangas <stefan@marxist.se>2021-11-13 07:00:30 +0100
commitb4c6ab8cb67be4d5b3e0041981968c6cce4afe89 (patch)
tree1a18482f77d5efe9d7287faad0d1a52215011a0a /doc/misc
parenta5008352c43cda13b0a35547ee91f0c889d71d06 (diff)
parent42d4e24ff3f13ccbd401d93d70ecdee99b88a26d (diff)
downloademacs-b4c6ab8cb67be4d5b3e0041981968c6cce4afe89.tar.gz
emacs-b4c6ab8cb67be4d5b3e0041981968c6cce4afe89.tar.bz2
emacs-b4c6ab8cb67be4d5b3e0041981968c6cce4afe89.zip
Merge from origin/emacs-28
42d4e24ff3 ; Fix typos 0d0125daae Improve documentation of 'decode-coding-region'
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog.12
-rw-r--r--doc/misc/efaq-w32.texi2
-rw-r--r--doc/misc/flymake.texi4
-rw-r--r--doc/misc/org.org2
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index c050e5d4cb8..be2a7cad1bc 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -5965,7 +5965,7 @@
names when publishing to the source directory.
(Clean view): Document `org-indent-mode'.
(Clocking work time): Add documentation for the
- new :timetamp option when creating a clock report.
+ new :timestamp option when creating a clock report.
(Paragraphs): Fix many typos.
(Plain lists): Remove duplicate explanation about the
`C-c *' command.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index ba1077d0acd..a5b5251d6ea 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -628,7 +628,7 @@ REGEDIT4
@node Swap Caps 98
@subsubsection Windows 95/98/ME
-Microsoft has a tool called keyremap that is part of their Kernel Toys add ons
+Microsoft has a tool called keyremap that is part of their Kernel Toys add-ons
for Windows 95. The tool has also been confirmed to work on Windows 98.
@node Make Emacs like a Windows app
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 309bed77609..f741ee5d723 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -218,7 +218,7 @@ can use the variables @code{flymake-mode-line-format} and
@cindex disabled backends
@cindex backends, disabled
-As Flymake supports multiple simutaneously active external backends,
+As Flymake supports multiple simultaneously active external backends,
is becomes useful to monitor their status. For example, some backends
may take longer than others to respond or complete, and some may
decide to @emph{disable} themselves if they are not suitable for the
@@ -343,7 +343,7 @@ The following sections discuss each approach in detail.
To customize the appearance of error types, the user must set
properties on the symbols associated with each diagnostic type.
-The three standard diagnostic keyowrd symbols -- @code{:error},
+The three standard diagnostic keyword symbols -- @code{:error},
@code{:warning} and @code{:note} -- have pre-configured appearances.
However a backend may define more (@pxref{Backend functions}).
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 17fd2dc39f7..df2724dd9c0 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16556,7 +16556,7 @@ identifying a reference in the bibliography.
- Each key starts with the character =@=.
- Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
- a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving informations useful or necessary
+ a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or necessary
fo the comprehension of the citation but not included in the
reference.