Merge from emacs-24; up to 2014-06-25T10:17:41Z!rgm@gnu.org

[gnu-emacs] / doc / misc / org.texi

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 48a6fe56cf6a0b50ae8e5befe1b7e19c64c52c95..6466a001f0dbae9d0157378eb42cae598dba26e7 100644 (file)
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1,6 +1,6 @@
 \input texinfo
 @c %**start of header
-@setfilename ../../info/org
+@setfilename ../../info/org.info
 @settitle The Org Manual
 @set VERSION 8.2.6
 
@@ -264,7 +264,7 @@ Copyright @copyright{} 2004--2014 Free Software Foundation, Inc.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License.''
 
@@ -12228,7 +12228,7 @@ height:width ratio, do the following
 @cindex #+ATTR_ODT
 You can control the manner in which an image is anchored by setting the
 @code{:anchor} property of it's @code{#+ATTR_ODT} line.  You can specify one
-of the the following three values for the @code{:anchor} property:
+of the following three values for the @code{:anchor} property:
 @samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}.
 
 To create an image that is anchored to a page, do the following:
@@ -18208,6 +18208,7 @@ org-customize @key{RET}} and then click yourself through the tree.
 @bye
 
 @c Local variables:
+@c coding: utf-8
 @c fill-column: 77
 @c indent-tabs-mode: nil
 @c paragraph-start:    "\b\\|^@[a-zA-Z]*[ \n]\\|^@x?org\\(key\\|cmd\\)\\|\f\\|[         ]*$"