summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-29 15:24:09 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-04-29 15:24:09 (GMT)
commit188dc72b2d66391a3539b71604e4b595e33c9f72 (patch)
treeee7d845d5dda272e50a9236a234a9630b1dbfb3c
parent24aa4ab127a50c45c4688bc5b3b603bb87b6b54f (diff)
parentc18468798f577fad8db2befcda5c0c7a127452c6 (diff)
downloadorg-mode-188dc72b2d66391a3539b71604e4b595e33c9f72.zip
org-mode-188dc72b2d66391a3539b71604e4b595e33c9f72.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 2bb6127..d1c4c9a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3584,14 +3584,14 @@ regular expression will be included."
(defcustom org-agenda-text-search-extra-files nil
"List of extra files to be searched by text search commands.
-These files will be search in addition to the agenda files by the
+These files will be searched in addition to the agenda files by the
commands `org-search-view' (`C-c a s') and `org-occur-in-agenda-files'.
Note that these files will only be searched for text search commands,
not for the other agenda views like todo lists, tag searches or the weekly
agenda. This variable is intended to list notes and possibly archive files
that should also be searched by these two commands.
In fact, if the first element in the list is the symbol `agenda-archives',
-than all archive files of all agenda files will be added to the search
+then all archive files of all agenda files will be added to the search
scope."
:group 'org-agenda
:type '(set :greedy t