summaryrefslogtreecommitdiff
path: root/doc/misc/org.texi
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-01-22 08:43:54 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-01-22 08:43:54 -0800
commit35675bb93f4620c43ca766e8a2d8708fd323c684 (patch)
treed52b1a6b58c517f53689a4f2fe513d7c78b02b1d /doc/misc/org.texi
parentc42959cc206bcb52baffd45f892da1b767f0f8c1 (diff)
parent1fc98ed073a2d26ad941748ecb13aa6f47dd7b01 (diff)
downloademacs-35675bb93f4620c43ca766e8a2d8708fd323c684.tar.gz
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
Diffstat (limited to 'doc/misc/org.texi')
-rw-r--r--doc/misc/org.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index f779417bd70..762dfafdda7 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -4,8 +4,8 @@
@settitle The Org Manual
@include docstyle.texi
-@set VERSION 9.1.4
-@set DATE 2017-09-17
+@set VERSION 9.1.6
+@set DATE 2018-01-03
@c Version and Contact Info
@set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}