Merge from origin/emacs-26

1fc98ed073 ; Spelling fix
bb396a369c Update Org to v9.1.6
fa582153f7 Use text-pixels values only when saving framesets (Bug#30141)
6b01b9475d Minor improvement in section "Pages" of the usere manual
e8c8bd3de2 Minor improvements in user manual
26b8b92e63 Improve the "Mark" chapter of the user manual
759569fe40 Improve the "Buffers" chapter of the user manual
c2e6d121ff * lisp/term.el (term-send-input): Fix text duplication in ...
854a1c0a61 Improve "Buffers" in the user manual

# Conflicts:
#	etc/NEWS

2 files changed, 3 insertions, 3 deletions

diff --git a/etc/NEWS.26 b/etc/NEWS.26
index b4c489cf7bd..46762d65e18 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -635,7 +635,7 @@ state to take effect (making a frame visible, for example).
 * Changes in Specialized Modes and Packages in Emacs 26.1
 
 ---
-** Emacs 26.1 comes with Org v9.1.4.
+** Emacs 26.1 comes with Org v9.1.6.
 See the file ORG-NEWS for user-visible changes in Org.
 
 ---
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 0b9c9767d95..1affe548529 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.1.4}
-\def\versionyear{2017}          % latest update
+\def\orgversionnumber{9.1.6}
+\def\versionyear{2018}          % latest update
 \input emacsver.tex
 
 %**start of header