summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-11-04 12:45:44 +0100
committerBastien Guerry <bzg@altern.org>2013-11-04 12:45:44 +0100
commit637d010ce65132f0a95ab0370116089121ccd30a (patch)
tree8f59e0dab74ee134d5cb471a07d42eda9d5578e4
parent2d444c1647e3bb3923fbc2a3c197bc67b221df41 (diff)
parent2a95f5e40958d7b9e79e5ad64eb24507c9d638d5 (diff)
downloadorg-mode-637d010ce65132f0a95ab0370116089121ccd30a.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 3d328e0..9e64c52 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -1365,7 +1365,7 @@ entries.
@vindex org-catch-invisible-edits
@cindex edits, catching invisible
Sometimes you may inadvertently edit an invisible part of the buffer and be
-confused on what as been edited and how to undo the mistake. Setting
+confused on what has been edited and how to undo the mistake. Setting
@code{org-catch-invisible-edits} to non-@code{nil} will help prevent this. See the
docstring of this option on how Org should catch invisible edits and process
them.