Browse Source

Merge branch 'hotfix-7.8.06'

Bastien Guerry 13 years ago
parent
commit
5651adb133
3 changed files with 6 additions and 6 deletions
  1. 4 4
      doc/org.texi
  2. 1 1
      lisp/org-table.el
  3. 1 1
      lisp/org.el

+ 4 - 4
doc/org.texi

@@ -1009,7 +1009,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
 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
 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
 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.
 start a typical minimal session with a command like the example below.
 
 
@@ -11012,7 +11012,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.
 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
 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}.
 @xref{Labels and captions in ODT export}.
 
 
 @node Tables in ODT export, Images in ODT export, Links in ODT export, OpenDocument Text export
 @node Tables in ODT export, Images in ODT export, Links in ODT export, OpenDocument Text export
@@ -11036,7 +11036,7 @@ You can control the width of the table by specifying @code{:rel-width}
 property using an @code{#+ATTR_ODT} line.
 property using an @code{#+ATTR_ODT} line.
 
 
 For example, consider the following table which makes use of all the rules
 For example, consider the following table which makes use of all the rules
-mentoned above.
+mentioned above.
 
 
 @example
 @example
 #+ATTR_ODT: :rel-width 50
 #+ATTR_ODT: :rel-width 50
@@ -11262,7 +11262,7 @@ or
 You can label and caption various category of objects - an inline image, a
 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
 table, a @LaTeX{} fragment or a Math formula - using @code{#+LABEL} and
 @code{#+CAPTION} lines.  @xref{Images and tables}.  ODT exporter enumerates
 @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
 result, each such object is assigned a sequence number based on order of it's
 appearance in the Org file.
 appearance in the Org file.
 
 

+ 1 - 1
lisp/org-table.el

@@ -2935,7 +2935,7 @@ known that the table will be realigned a little later anyway."
 
 
 (defun org-table-iterate (&optional arg)
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
   "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."
 with the prefix ARG."
   (interactive "P")
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))
   (let ((imax (if arg (prefix-numeric-value arg) 10))

+ 1 - 1
lisp/org.el

@@ -20687,7 +20687,7 @@ beyond the end of the headline."
 		 (t refpos)))))
 		 (t refpos)))))
        ((org-at-item-p)
        ((org-at-item-p)
 	;; Being at an item and not looking at an the item means point
 	;; 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,
 	;; doesn't contain the item.  Therefore, do nothing special,
 	;; just stay here.
 	;; just stay here.
 	(when (looking-at org-list-full-item-re)
 	(when (looking-at org-list-full-item-re)