* emulation/viper-cmd.el (viper-harness-minor-mode): Fix docstring typo.

* org/org.el (org-time-string-to-absolute, org-small-year-to-year)
  (org-tags-sparse-tree): Fix typos in docstrings.

4 files changed, 12 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa4e907a144..ee99635f109 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-11-17  Juanma Barranquero  <lekktu@gmail.com>
 
+	* emulation/viper-cmd.el (viper-harness-minor-mode): Fix docstring typo.
+
 	* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
 	(undo-only, rotate-yank-pointer, kill-whole-line, push-mark-command)
 	(exchange-point-and-mark, set-goal-column, kill-line, backward-word)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 2e9449c513f..a6e7339e9fc 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -935,7 +935,7 @@ Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes."
 ;; bindings.  By letting Viper know which files these modes are in, it will
 ;; arrange to reorganize minor-mode-map-alist so that things will work right.
 (defun viper-harness-minor-mode (load-file)
-  "Familiarize Viper with a minor mode defined in LOAD_FILE.
+  "Familiarize Viper with a minor mode defined in LOAD-FILE.
 Minor modes that have their own keymaps may overshadow Viper keymaps.
 This function is designed to make Viper aware of the packages that define
 such minor modes.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index ff7c0e50d2d..b5480b7eb7d 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-17  Juanma Barranquero  <lekktu@gmail.com>
+
+	* org.el (org-time-string-to-absolute, org-small-year-to-year)
+	(org-tags-sparse-tree): Fix typos in docstrings.
+
 2008-11-15  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org-publish.el (org-publish-attachment): Allow copy-file to
diff --git a/lisp/org/org.el b/lisp/org/org.el
index cc585b008bf..9b4e662787a 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -8991,10 +8991,10 @@ only lines with a TODO keyword are included in the output."
 (defvar todo-only) ;; dynamically scoped
 
 (defun org-tags-sparse-tree (&optional todo-only match)
-  "Create a sparse tree according to tags  string MATCH.
+  "Create a sparse tree according to tags string MATCH.
 MATCH can contain positive and negative selection of tags, like
 \"+WORK+URGENT-WITHBOSS\".
-If optional argument TODO_ONLY is non-nil, only select lines that are
+If optional argument TODO-ONLY is non-nil, only select lines that are
 also TODO lines."
   (interactive "P")
   (org-prepare-agenda-buffers (list (current-buffer)))
@@ -11129,7 +11129,7 @@ days in order to avoid rounding problems."
   "Convert a time stamp to an absolute day number.
 If there is a specifyer for a cyclic time stamp, get the closest date to
 DAYNR.
-PREFER and SHOW_ALL are passed through to `org-closest-date'."
+PREFER and SHOW-ALL are passed through to `org-closest-date'."
   (cond
    ((and daynr (string-match "\\`%%\\((.*)\\)" s))
     (if (org-diary-sexp-entry (match-string 1 s) "" date)
@@ -11150,7 +11150,7 @@ PREFER and SHOW_ALL are passed through to `org-closest-date'."
   "Convert 2-digit years into 4-digit years.
 38-99 are mapped into 1938-1999.  1-37 are mapped into 2001-2007.
 The year 2000 cannot be abbreviated.  Any year lager than 99
-is retrned unchanged."
+is returned unchanged."
   (if (< year 38)
       (setq year (+ 2000 year))
     (if (< year 100)