summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-04-01 17:43:32 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-04-01 17:43:32 -0700
commit7bd20f915b94b9467c596b105f1a49d3fe77936b (patch)
treece3f267765590728cbff8e8c97ccda1ca8e534ec
parent8c5c03ba38aa7022f9b5a9538297cb04aa5612cc (diff)
downloademacs-7bd20f915b94b9467c596b105f1a49d3fe77936b.tar.gz
Spelling fixes.
-rw-r--r--doc/misc/org.texi8
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--lisp/org/org-table.el2
-rw-r--r--lisp/org/org.el2
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 380f1fbb0cc..e033a47aa96 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1007,7 +1007,7 @@ from within Emacs, please copy and paste the content into your Email program.
Sometimes you might face a problem due to an error in your Emacs or Org mode
setup. Before reporting a bug, it is very helpful to start Emacs with minimal
-customisations and reproduce the problem. Doing so often helps you determine
+customizations and reproduce the problem. Doing so often helps you determine
if the problem is with your customization or with Org mode itself. You can
start a typical minimal session with a command like the example below.
@@ -10975,7 +10975,7 @@ A link with no description and destined to a regular (un-itemized) outline
heading is replaced with a cross-reference and section number of the heading.
A @samp{\ref@{label@}}-style reference to an image, table etc. is replaced
-with a cross-reference and sequence number of the labelled entity.
+with a cross-reference and sequence number of the labeled entity.
@xref{Labels and captions in ODT export}.
@node Tables in ODT export, Images in ODT export, Links in ODT export, OpenDocument Text export
@@ -10999,7 +10999,7 @@ You can control the width of the table by specifying @code{:rel-width}
property using an @code{#+ATTR_ODT} line.
For example, consider the following table which makes use of all the rules
-mentoned above.
+mentioned above.
@example
#+ATTR_ODT: :rel-width 50
@@ -11225,7 +11225,7 @@ or
You can label and caption various category of objects - an inline image, a
table, a @LaTeX{} fragment or a Math formula - using @code{#+LABEL} and
@code{#+CAPTION} lines. @xref{Images and tables}. ODT exporter enumerates
-each labelled or captioned object of a given category separately. As a
+each labeled or captioned object of a given category separately. As a
result, each such object is assigned a sequence number based on order of it's
appearance in the Org file.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index a7c2e0dbd66..d1e7af37375 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -562,7 +562,7 @@
dysfunctional routine. This possibly has crept in because of the
broken merges between "maint" and "origin" branches.
(org-odt-begin-table): Don't emit an empty paragraph when a table is
- neither labelled or captioned.
+ neither labeled nor captioned.
(org-odt-init-outfile): Remove reference to an unused variable.
2012-04-01 Viktor Rosenfeld <listuser36@googlemail.com>
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 9018bb4043b..62c24c2e35b 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -2931,7 +2931,7 @@ known that the table will be realigned a little later anyway."
(defun org-table-iterate (&optional arg)
"Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can choose a different value
+The maximum number of iterations is 10, but you can choose a different value
with the prefix ARG."
(interactive "P")
(let ((imax (if arg (prefix-numeric-value arg) 10))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index b7dcc0c3f1a..d238c072341 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -20477,7 +20477,7 @@ beyond the end of the headline."
(t refpos)))))
((org-at-item-p)
;; Being at an item and not looking at an the item means point
- ;; was previously moved to beginning of a visual line, whiche
+ ;; was previously moved to beginning of a visual line, which
;; doesn't contain the item. Therefore, do nothing special,
;; just stay here.
(when (looking-at org-list-full-item-re)