Merge from trunk

3 files changed, 18 insertions, 16 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index c0b3fa567c6..0cef225770d 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.el (org-refile-targets):
+        * org-agenda.el (org-agenda-hide-tags-regexp): Fix typos in docstrings.
+
 2010-08-19  Glenn Morris  <rgm@gnu.org>
 
         * org.el (org-outline-overlay-data, org-set-outline-overlay-data)
@@ -368,7 +373,7 @@
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org.el (org-confirm-shell-link-function):
+        * org.el (org-confirm-shell-link-function)
         (org-confirm-elisp-link-function): Limit the values that can be set by
         file variables.
 
@@ -386,8 +391,7 @@
         * org-capture.el (org-capture-position-for-last-stored)
         (org-capture-bookmark-last-stored-position): New functions.
         (org-capture-place-table-line): Better error catching.
-        (org-capture-place-item):
-        (org-capture-place-entry):
+        (org-capture-place-item, org-capture-place-entry)
         (org-capture-place-plain-text): Call
         `org-capture-position-for-last-stored'.
         (org-capture-finalize): Just call
@@ -444,7 +448,7 @@
         * org-macs.el (org-not-nil): Return the value if not interpreted
         as nil.
 
-        * org.el (org-entry-get):
+        * org.el (org-entry-get)
         (org-entry-get-with-inheritance): Interpret the value "nil"
         as nil for properties.
 
@@ -476,9 +480,7 @@
         * org.el (org-timestamp-change): New optional argument UPDOWN.
         Use this to identify calls from org-timestamp-up/down, so that we can
         skip by rounding minutes in this case.
-        (org-timestamp-up):
-        (org-timestamp-down):
-        (org-timestamp-up-day):
+        (org-timestamp-up, org-timestamp-down, org-timestamp-up-day)
         (org-timestamp-down-day): Call org-timestamp-change with the
         updown argument.
 
@@ -541,7 +543,7 @@
 
 2010-07-19  Bastien Guerry  <bzg@altern.org>
 
-        * org-agenda.el (org-agenda-get-deadlines):
+        * org-agenda.el (org-agenda-get-deadlines)
         (org-agenda-get-scheduled):
         * org.el (org-time-string-to-seconds):
         For deadline and scheduled agenda display ignore the cyclic repeater
@@ -1163,7 +1165,7 @@
         (org-agenda-bulk-remove-overlays): Use the normal overlay API.
 
         * org-freemind.el (org-freemind-from-org-mode-node)
-        (org-freemind-from-org-mode, )
+        (org-freemind-from-org-mode)
         (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Use
         interactive-p instead of called-interactively, because this is
         backward compatible with older Emacsen I still support..
@@ -2616,7 +2618,7 @@
 2010-02-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * org-freemind.el (org-freemind-from-org-mode-node)
-        (org-freemind-from-org-mode, )
+        (org-freemind-from-org-mode)
         (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode):
         Pass arg to called-interactively-p.
 
@@ -5059,8 +5061,8 @@
         * org.el (org-global-properties-fixed): Add default for
         CLOCK_MODELINE_TOTAL.
 
-        * org-clock.el (org-clock-sum): Accept lists and strigs as tstart
-        andd tend.
+        * org-clock.el (org-clock-sum): Accept lists and strings as tstart
+        and tend.
         (org-clock-sum-current-item): Optional argument TSTART, pass it to
         org-clock-sum.
         (org-clock-get-sum-start): New function.
@@ -8024,7 +8026,7 @@
         set-text-properties to remove text properties from the clipboard
         value.
 
-        * lisp/org-clock.el (org-update-mode-line): Support limiting the
+        * org-clock.el (org-update-mode-line): Support limiting the
         modeline clock string, and display the full todo value in the
         tooltip.  Set a local keymap so mouse-3 on the clock string goes to
         the currently clocked task.
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index a3d288065d3..68a592b5fae 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1359,7 +1359,7 @@ When non-nil, this must be the number of minutes, e.g. 60 for one hour."
   "Regular expression used to filter away specific tags in agenda views.
 This means that these tags will be present, but not be shown in the agenda
 line.  Secondary filtering will still work on the hidden tags.
-Nil means don't hide any tags."
+The value nil means don't hide any tags."
   :group 'org-agenda-line-format
   :type '(choice
           (const  :tag "Hide none" nil)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index a2965e87d22..19759371023 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1797,8 +1797,8 @@ This is list of cons cells.  Each cell contains:
 - a specification of the files to be considered, either a list of files,
   or a symbol whose function or variable value will be used to retrieve
   a file name or a list of file names.  If you use `org-agenda-files' for
-  that, all agenda files will be scanned for targets.  Nil means consider
-  headings in the current buffer.
+  that, all agenda files will be scanned for targets.  The value nil means
+  consider headings in the current buffer.
 - A specification of how to find candidate refile targets.  This may be
   any of:
   - a cons cell (:tag . \"TAG\") to identify refile targets by a tag.