summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-06-23 07:45:48 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-06-23 07:45:48 (GMT)
commitddb536e833ed119f3dd1c9725cba4c59cee2ca60 (patch)
tree796bb3145ee6cad2c184127ae54a0016daf24498
parent8ad20618d1ff574406dc1ad6e998f40029dfb716 (diff)
parentbe9a1638afabae716131393a7c0b25a06fc5a9bd (diff)
downloadorg-mode-ddb536e833ed119f3dd1c9725cba4c59cee2ca60.zip
org-mode-ddb536e833ed119f3dd1c9725cba4c59cee2ca60.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi2
-rw-r--r--lisp/org-bibtex.el2
-rw-r--r--lisp/org-list.el2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 441b08c..b21c93d 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -12341,7 +12341,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:
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 3efee73..7b2ed48 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -203,7 +203,7 @@
(:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).")
(:publisher . "The publisher’s name.")
(:school . "The name of the school where a thesis was written.")
- (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.")
+ (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.")
(:title . "The work’s title, typed as explained in the LaTeX book.")
(:type . "The type of a technical report for example, 'Research Note'.")
(:volume . "The volume of a journal or multi-volume book.")
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 3e307be..774d87f 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -1244,7 +1244,7 @@ some heuristics to guess the result."
If POS is before first character after bullet of the item, the
new item will be created before the current one.
-STRUCT is the list structure. PREVS is the the alist of previous
+STRUCT is the list structure. PREVS is the alist of previous
items, as returned by `org-list-prevs-alist'.
Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET