Merge from origin/emacs-26

bc8dc37 (origin/emacs-26) Minor copyedits in "Distribution" chapter o...
1c7a936 Minor copyedits in "Entering" chapter of Emacs manual.
1d4498b Minor wording change in the Emacs manual
2bf49e7 Fix a typo in the Emacs manual
f3546a2 Improve the "Basic" chapter of the Emacs manual
691431e Resurrect lost text in lispref
956807b * lisp/emacs-lisp/rx.el (rx): Fix the definition of 'blank'.
7d90d2e Proofread os.texi and files.texi
490c736 Minor improvements in the "International" chapter of Emacs ma...
79252d3 Minor improvement in "Text" chapter of Emacs manual

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 1144f2843cd..40b16b0f3c9 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -29128,7 +29128,7 @@ the X window system or MS-Windows, Calc will configure GNUPLOT for you
 automatically.  If you have GNUPLOT 3.0 or later and you are using a
 Unix or GNU system without X, Calc will configure GNUPLOT to display
 graphs using simple character graphics that will work on any
-Posix-compatible terminal.
+POSIX-compatible terminal.
 
 @menu
 * Basic Graphics::
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 762dfafdda7..aa3b029ab7c 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -6752,7 +6752,7 @@ applying it to another one.
 @vindex org-clock-idle-time
 By customizing the variable @code{org-clock-idle-time} to some integer, such
 as 10 or 15, Emacs can alert you when you get back to your computer after
-being idle for that many minutes@footnote{On computers using Mac OS X,
+being idle for that many minutes@footnote{On computers using macOS,
 idleness is based on actual user idleness, not just Emacs' idle time.  For
 X11, you can install a utility program @file{x11idle.c}, available in the
 @code{contrib/scripts} directory of the Org git distribution, or install the