summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-22 12:25:44 +0200
committerBastien Guerry <bzg@altern.org>2012-08-22 12:25:44 +0200
commit6e3c944764352f4548c02e583a5d7e428ba76c14 (patch)
tree17cbe1fb7675943494bdb852f41705127b03dafe
parent53c230a9f612294360b606a50c0e974f54152e75 (diff)
parenta273a37ce0d82162266a3e8d6abd42a4dd083bcb (diff)
downloadorg-mode-6e3c944764352f4548c02e583a5d7e428ba76c14.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--contrib/lisp/org-e-latex.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el
index deaf1a5..6c9ea0c 100644
--- a/contrib/lisp/org-e-latex.el
+++ b/contrib/lisp/org-e-latex.el
@@ -956,10 +956,10 @@ INFO is a plist used as a communication channel.
Footnotes definitions are returned within \"\\footnotetxt{}\"
commands.
-This functions is used within constructs that don't support
+This function is used within constructs that don't support
\"\\footnote{}\" command (i.e. an item's tag). In that case,
-\"\\footnotemark\" is used within the construct and this function
-outside of it."
+\"\\footnotemark\" is used within the construct and the function
+just outside of it."
(mapconcat
(lambda (ref)
(format