Release 4.34release_4.34

6 files changed, 170 insertions, 208 deletions

diff --git a/org b/org
index ebefa4f95..107eb6612 100644
--- a/org
+++ b/org
@@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
 * Org Mode: (org).	outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 
-   This manual is for Org-mode (version 4.33).
+   This manual is for Org-mode (version 4.34).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -27,7 +27,7 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org-mode (version 4.33).
+This manual is for Org-mode (version 4.34).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -2543,8 +2543,7 @@ collected into a single place.
      agenda files (*note Agenda views::) into a single buffer.  The
      buffer is in `agenda-mode', so there are commands to examine and
      manipulate the TODO entries directly from that buffer (*note
-     Agenda commands::).  *Note Global TODO list::, for more
-     information.  
+     Agenda commands::).  
 
 `C-c a T'
      Like the above, but allows selection of a specific TODO keyword.
@@ -2859,7 +2858,7 @@ will be exported as itemized lists.  If you want that transition to
 occur at a different level, specify it with a prefix argument.  For
 example,
 
-     C-1 C-c C-x a org-export-as-ascii
+     C-1 C-c C-x a
 
 creates only top level headlines and does the rest as items.
 
@@ -2927,10 +2926,10 @@ of the outline tree.  For example:
 
      # Local Variables:
      # org-export-html-style: "   <style type=\"text/css\">
-            p {font-weight: normal; color: gray; }
-            h1 {color: black; }
-        </style>"
-     # End: ***
+     #       p {font-weight: normal; color: gray; }
+     #       h1 {color: black; }
+     #   </style>"
+     # End:
 
    Remember to execute `M-x normal-mode' after changing this to make
 the new style visible to Emacs.  This command restarts org-mode for the
@@ -3491,8 +3490,8 @@ File: org,  Node: Summary of in-buffer settings,  Next: The very busy C-c C-c ke
 
 Org-mode uses special lines in the buffer to define settings on a
 per-file basis.  These lines start with a `#+' followed by a keyword, a
-colon, and then individual words defining a setting.  Several settings
-words con be in the same line, but you can also have multiple lines for
+colon, and then individual words defining a setting.  Several setting
+words can be in the same line, but you can also have multiple lines for
 the keyword.  While these settings are described throughout the manual,
 here is a summary.  After changing any of those lines in the buffer,
 press `C-c C-c' with the cursor still in the line to activate the
@@ -3529,7 +3528,7 @@ file is visited again in a new Emacs session.
           oddeven    allow all outline levels
 
 `#+SEQ_TODO:   #+TYP_TODO:'
-     These lines that the TODO keywords and their interpretation in the
+     These lines set the TODO keywords and their interpretation in the
      current file.  The corresponding variables are `org-todo-keywords'
      and `org-todo-interpretation'.
 
@@ -4055,7 +4054,7 @@ File: org,  Node: Acknowledgments,  Prev: Bugs,  Up: Miscellaneous
 11.10 Acknowledgments
 =====================
 
-Org-mode was written by Carsten Dominik, who still maintains it at the
+Org-mode was created by Carsten Dominik, who still maintains it at the
 Org-mode homepage `http://www.astro.uva.nl/~dominik/Tools/org/'.  The
 following people (in alphabetic order) have helped the development
 along with ideas, suggestions and patches.  Many thanks to all of you,
@@ -4066,7 +4065,7 @@ Org-mode would not be what it is without your input.
 
    * Alex Bochannek provided a patch for rounding time stamps.
 
-   * Charles Caves' suggestion sparked the implementation of templates
+   * Charles Cave's suggestion sparked the implementation of templates
      for Remember.
 
    * Pavel Chalmoviansky influenced the agenda treatment of items with
@@ -4093,8 +4092,8 @@ Org-mode would not be what it is without your input.
 
    * Todd Neal provided patches for links to Info files and elisp forms.
 
-   * Tim O'Callaghan suggested in-file links, search options for
-     general file links, and TAGS.
+   * Tim O'Callaghan suggested in-file links, search options for general
+     file links, and TAGS.
 
    * Oliver Oppitz suggested multi-state TODO items.
 
@@ -4110,8 +4109,8 @@ Org-mode would not be what it is without your input.
 
    * Kevin Rogers contributed code to access VM files on remote hosts.
 
-   * Frank Ruell solved the mystery of the `keymapp nil' bug, a conflict
-     with `allout.el'.
+   * Frank Ruell solved the mystery of the `keymapp nil' bug, a
+     conflict with `allout.el'.
 
    * Philip Rooke created the Org-mode reference card and provided lots
      of feedback.
@@ -4122,8 +4121,8 @@ Org-mode would not be what it is without your input.
    * Linking to VM/BBDB/GNUS was inspired by Tom Shannon's
      `organizer-mode.el'.
 
-   * David O'Toole wrote `org-publish.el' and came up with lots is ideas
-     for small changes.
+   * David O'Toole wrote `org-publish.el' and came up with lots is
+     ideas for small changes.
 
    * Ju"rgen Vollmer contributed code generating the table of contents
      in HTML output.
@@ -4147,8 +4146,8 @@ Org-mode would not be what it is without your input.
    * Roland Winkler requested additional keybindings to make Org-mode
      work on a tty.
 
-   * Piotr Zielinski wrote `org-mouse.el' and showed how to follow links
-     with mouse-1.
+   * Piotr Zielinski wrote `org-mouse.el' and showed how to follow
+     links with mouse-1.
 
 
 File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
@@ -4544,7 +4543,7 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
                                                               (line  10)
 * C-c a M:                               Tag searches.        (line  14)
 * C-c a m:                               Tag searches.        (line  10)
-* C-c a T:                               Global TODO list.    (line  15)
+* C-c a T:                               Global TODO list.    (line  14)
 * C-c a t <1>:                           Global TODO list.    (line   9)
 * C-c a t:                               TODO basics.         (line  33)
 * C-c C-a:                               Visibility cycling.  (line  31)
@@ -4668,7 +4667,7 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * p:                                     Agenda commands.     (line  20)
 * q:                                     Agenda commands.     (line 192)
 * r <1>:                                 Agenda commands.     (line  76)
-* r:                                     Global TODO list.    (line  21)
+* r:                                     Global TODO list.    (line  20)
 * S:                                     Agenda commands.     (line 173)
 * S-<down> <1>:                          Agenda commands.     (line 126)
 * S-<down> <2>:                          Creating timestamps. (line  58)
@@ -4771,47 +4770,47 @@ Node: Time-of-day specifications99904
 Node: Calendar/Diary integration101880
 Node: Sorting of agenda items103257
 Node: Global TODO list104089
-Node: Matching headline tags105504
-Node: Timeline106447
-Node: Agenda commands107320
-Node: Exporting112788
-Node: ASCII export113921
-Node: HTML export114811
-Node: XOXO export117627
-Node: iCalendar export118066
-Node: Text interpretation119889
-Node: Comment lines120366
-Node: Enhancing text120835
-Node: Export options122666
-Node: Publishing124268
-Ref: Publishing-Footnote-1125064
-Node: Configuration125260
-Node: Project alist125981
-Node: File sources and destinations127039
-Node: Selecting files127591
-Node: Publishing action128344
-Node: Publishing options129458
-Node: Publishing links131497
-Node: Project page index132300
-Node: Sample configuration133078
-Node: Simple example133570
-Node: Complex example134243
-Node: Triggering publication136277
-Node: Miscellaneous136933
-Node: Completion137692
-Node: Customization138688
-Node: Summary of in-buffer settings139295
-Node: The very busy C-c C-c key142537
-Node: Clean view144052
-Node: TTY keys146629
-Node: FAQ148230
-Node: Interaction156027
-Node: Extensions156487
-Node: Cooperation158057
-Node: Conflicts159751
-Node: Bugs161343
-Node: Acknowledgments163241
-Node: Index166680
-Node: Key Index188999
+Node: Matching headline tags105450
+Node: Timeline106393
+Node: Agenda commands107266
+Node: Exporting112734
+Node: ASCII export113867
+Node: HTML export114737
+Node: XOXO export117552
+Node: iCalendar export117991
+Node: Text interpretation119814
+Node: Comment lines120291
+Node: Enhancing text120760
+Node: Export options122591
+Node: Publishing124193
+Ref: Publishing-Footnote-1124989
+Node: Configuration125185
+Node: Project alist125906
+Node: File sources and destinations126964
+Node: Selecting files127516
+Node: Publishing action128269
+Node: Publishing options129383
+Node: Publishing links131422
+Node: Project page index132225
+Node: Sample configuration133003
+Node: Simple example133495
+Node: Complex example134168
+Node: Triggering publication136202
+Node: Miscellaneous136858
+Node: Completion137617
+Node: Customization138613
+Node: Summary of in-buffer settings139220
+Node: The very busy C-c C-c key142460
+Node: Clean view143975
+Node: TTY keys146552
+Node: FAQ148153
+Node: Interaction155950
+Node: Extensions156410
+Node: Cooperation157980
+Node: Conflicts159674
+Node: Bugs161266
+Node: Acknowledgments163164
+Node: Index166603
+Node: Key Index188922
 
 End Tag Table
diff --git a/org.el b/org.el
index 6e11e57fe..93c73d4fe 100644
--- a/org.el
+++ b/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.33
+;; Version: 4.34
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -30,16 +30,21 @@
 ;; Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing
 ;; project planning with a fast and effective plain-text system.
 ;;
-;; Org-mode develops organizational tasks around a NOTES file that contains
-;; information about projects as plain text.  Org-mode is implemented on top
-;; of outline-mode - ideal to keep the content of large files well structured.
-;; It supports ToDo items, deadlines and time stamps, which can be extracted
-;; to create a daily/weekly agenda that also integrates the diary of the Emacs
-;; calendar.  Tables are easily created with a built-in table editor.  Plain
-;; text URL-like links connect to websites, emails (VM, RMAIL, WANDERLUST),
-;; Usenet messages (Gnus), BBDB entries, and any files related to the
-;; projects.  For printing and sharing of notes, an Org-mode file (or a part
-;; of it) can be exported as a structured ASCII file, or as HTML.
+;; Org-mode develops organizational tasks around NOTES files that contain
+;; information about projects as plain text.  Org-mode is implemented on
+;; top of outline-mode, which makes it possible to keep the content of
+;; large files well structured.  Visibility cycling and structure editing
+;; help to work with the tree.  Tables are easily created with a built-in
+;; table editor.  Org-mode supports ToDo items, deadlines, time stamps,
+;; and scheduling.  It dynamically compiles entries into an agenda that
+;; utilizes and smoothly integrates much of the Emacs calendar and diary.
+;; Plain text URL-like links connect to websites, emails, Usenet
+;; messages, BBDB entries, and any files related to the projects.  For
+;; printing and sharing of notes, an Org-mode file can be exported as a
+;; structured ASCII file, as HTML, or (todo and agenda items only) as an
+;; iCalendar file.  It can also serve as a publishing tool for a set of
+;; linked webpages.
+;;
 ;;
 ;; Installation
 ;; ------------
@@ -64,8 +69,11 @@
 ;;
 ;;    (require 'org-install)
 ;;
-;; This setup will put all files with extension ".org" into Org-mode.  As
-;; an alternative, make the first line of a file look like this:
+;;
+;; Activation
+;; ----------
+;; The setup above will put all files with extension ".org" into Org-mode.
+;; As an alternative, make the first line of a file look like this:
 ;;
 ;;     MY PROJECTS    -*- mode: org; -*-
 ;;
@@ -80,8 +88,11 @@
 ;; excellent reference card made by Philip Rooke.  This card can be found
 ;; in the etc/ directory of Emacs 22.
 ;;
-;; Changes since version 4.10:
-;; ---------------------------
+;; Recent changes
+;; --------------
+;; Version 4.34
+;;    - Bug fixes.
+;;
 ;; Version 4.33
 ;;    - New commands to move through plain lists: S-up and S-down.
 ;;    - Bug fixes and documentation update.
@@ -133,46 +144,6 @@
 ;;    - New option `org-agenda-todo-list-sublevels' to turn off listing TODO
 ;;      entries that are sublevels of another TODO entry.
 ;;
-;; Version 4.26
-;;    - Bug fixes.
-;;
-;; Version 4.25
-;;    - Revision of the font-lock faces section, with better tty support.
-;;    - TODO keywords in Agenda buffer are fontified.
-;;    - Export converts links between .org files to links between .html files.
-;;    - Better support for bold/italic/underline emphasis.
-;;
-;; Version 4.24
-;;    - Bug fixes.
-;;
-;; Version 4.23
-;;    - Bug fixes.
-;;
-;; Version 4.22
-;;    - Bug fixes.
-;;    - In agenda buffer, mouse-1 no longer follows link.
-;;      See `org-agenda-mouse-1-follows-link' and `org-mouse-1-follows-link'.
-;;
-;; Version 4.20
-;;    - Links use now the [[link][description]] format by default.
-;;      When inserting links, the user is prompted for a description.
-;;    - If a link has a description, only the description is displayed
-;;      the link part is hidden.  Use C-c C-l to edit the link part.
-;;    - TAGS are now bold, but in the same color as the headline.
-;;    - The width of a table column can be limited by using a field "<N>".
-;;    - New structure for the customization tree.
-;;    - Bug fixes.
-;;
-;; Version 4.13
-;;    - The list of agenda files can be maintainted in an external file.
-;;    - Bug fixes.
-;;
-;; Version 4.12
-;;    - Templates for remember buffer.  Note that the remember setup changes.
-;;      To set up templates, see `org-remember-templates'.
-;;    - The time in new time stamps can be rounded, see new option
-;;      `org-time-stamp-rounding-minutes'.
-;;    - Bug fixes (there are *always* more bugs).
 ;;
 ;;; Code:
 
@@ -183,13 +154,9 @@
 (require 'time-date)
 (require 'easymenu)
 
-(defvar calc-embedded-close-formula)  ; defined by the calc package
-(defvar calc-embedded-open-formula)   ; defined by the calc package
-(defvar font-lock-unfontify-region-function) ; defined by font-lock.el
-
 ;;; Customization variables
 
-(defvar org-version "4.33"
+(defvar org-version "4.34"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -2548,17 +2515,20 @@ This face is only used if `org-fontify-done-headline' is set."
 	  (concat "\\<\\(" org-scheduled-string
 		  "\\|" org-deadline-string
 		  "\\|" org-closed-string "\\)"
-		  " *[[<]\\([^]>]+\\)[]>]")   ;; FIXME: is this correct?
+		  " *[[<]\\([^]>]+\\)[]>]")
 	  org-maybe-keyword-time-regexp
 	  (concat "\\(\\<\\(" org-scheduled-string
 		  "\\|" org-deadline-string
 		  "\\|" org-closed-string "\\)\\)?"
-		  " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^]\r\n>]*?[]>]\\)"))   ;; FIXME: is this correct?
+		  " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^]\r\n>]*?[]>]\\)"))
 
     (org-set-font-lock-defaults)))
 
 ;; Tell the compiler about dynamically scoped variables,
 ;; and variables from other packages
+(defvar calc-embedded-close-formula)  ; defined by the calc package
+(defvar calc-embedded-open-formula)   ; defined by the calc package
+(defvar font-lock-unfontify-region-function) ; defined by font-lock.el
 (defvar zmacs-regions) ; XEmacs regions
 (defvar original-date) ; dynamically scoped in calendar
 (defvar org-old-auto-fill-inhibit-regexp) ; local variable used by `orgtbl-mode'
@@ -3734,7 +3704,7 @@ If optional TREE is given, use this text instead of the kill ring."
     (error
      (substitute-command-keys
       "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway")))
-  (let* ((txt (or tree (current-kill 0)))
+  (let* ((txt (or tree (and kill-ring (current-kill 0))))
 	 (^re (concat "^\\(" outline-regexp "\\)"))
 	 (re  (concat "\\(" outline-regexp "\\)"))
 	 (^re_ (concat "\\(" outline-regexp "\\)[  \t]*"))
@@ -3797,7 +3767,8 @@ If optional TREE is given, use this text instead of the kill ring."
 	(goto-char (point-min))
 	(message "Pasted at level %d, with shift by %d levels"
 		 new-level shift1)))
-    (if (and (eq org-subtree-clip (current-kill 0))
+    (if (and kill-ring
+	     (eq org-subtree-clip (current-kill 0))
 	     org-subtree-clip-folded)
 	;; The tree was folded before it was killed/copied
 	(hide-subtree))))
@@ -3809,8 +3780,9 @@ headline level is not the largest headline level in the tree.
 So this will actually accept several entries of equal levels as well,
 which is OK for `org-paste-subtree'.
 If optional TXT is given, check this string instead of the current kill."
-  (let* ((kill (or txt (current-kill 0) ""))
-	 (start-level (and (string-match (concat "\\`" outline-regexp) kill)
+  (let* ((kill (or txt (and kill-ring (current-kill 0)) ""))
+	 (start-level (and kill
+			   (string-match (concat "\\`" outline-regexp) kill)
 			   (- (match-end 0) (match-beginning 0))))
 	 (re (concat "^" outline-regexp))
 	 (start 1))
@@ -3920,7 +3892,7 @@ Error if not at a plain list, or if this is the last item in the list."
     (setq ind1 (org-get-indentation))
     (unless (and (org-at-item-p) (= ind ind1))
       (goto-char pos)
-      (error "This is already the last item in the list"))))  
+      (error "On last item"))))  
 
 (defun org-previous-item ()
   "Move to the beginning of the previous item in the current plain list.
@@ -3941,7 +3913,7 @@ Error if not at a plain list, or if this is the last item in the list."
     (condition-case nil
 	(org-beginning-of-item)
       (error (goto-char pos)
-	     (error "This is already the first item in the list")))))
+	     (error "On first item")))))
 
 (defun org-move-item-down ()
   "Move the plain list item at point down, i.e. swap with following item.
@@ -6434,7 +6406,7 @@ the documentation of `org-diary'."
 	'org-marker marker 'org-hd-marker marker
 	'priority priority 'category category)
       (push txt ee)
-      (if org-agenda-todo-list-sublevels  ; FIXME???? Change needed?
+      (if org-agenda-todo-list-sublevels
 	  (goto-char (match-end 1))
 	(org-end-of-subtree 'invisible))))
     (nreverse ee)))
@@ -6793,13 +6765,6 @@ only the correctly processes TXT should be returned - this is used by
 	(if s1 (setq s1 (org-get-time-of-day s1 'string)))
 	(if s2 (setq s2 (org-get-time-of-day s2 'string))))
 
-;      (when (and (or (eq org-agenda-remove-tags-when-in-prefix t)
-;		     (and org-agenda-remove-tags-when-in-prefix
-;			  org-prefix-has-tag))
-;		 (string-match ":[a-zA-Z_@0-9:]+:[ \t]*$" txt))
-;	(setq txt (replace-match "" t t txt)))
-
-      ;; FIXME!!!
       (when (string-match "\\([ \t]+\\)\\(:[a-zA-Z_@0-9:]+:\\)[ \t]*$" txt)
 	;; Tags are in the string
 	(if (or (eq org-agenda-remove-tags-when-in-prefix t)
@@ -7596,6 +7561,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
 	  (with-current-buffer buffer
 	    (unless (eq major-mode 'org-mode)
 	      (error "Agenda file %s is not in `org-mode'" file))
+	    (setq org-category-table (org-get-category-table))
 	    (save-excursion
 	      (save-restriction
 		(if org-respect-restriction
@@ -8116,7 +8082,7 @@ in all files."
 		  (org-search-not-link re4 nil t)
 		  (org-search-not-link re5 nil t)
 		  )
-	      (goto-char (match-beginning 1))  ;; Fixme: does every re have group 1?
+	      (goto-char (match-beginning 1))
 	    (goto-char pos)
 	    (error "No match")))))
      (t
@@ -9662,7 +9628,7 @@ Optional argument NEW may specify text to replace the current field content."
 		    n (format f s))
 	      (if new
 		  (if (<= (length new) l)      ;; FIXME: length -> str-width?
-		      (setq n (format f new t t))  ;; FIXME: t t?
+		      (setq n (format f new))
 		    (setq n (concat new "|") org-table-may-need-update t)))
 	      (or (equal n o)
 		  (let (org-table-may-need-update)
@@ -11021,9 +10987,6 @@ not overwrite the stored one."
 		       (org-table-get-vertical-vector (match-string 0 form)
 						      nil n0))
 		     t t form)))
-;;      (setq ev (calc-eval (cons form modes)
-;; FIXME  (if org-table-formula-numbers-only 'num)))
-
       (if lispp
 	  (setq ev (eval (eval (read form)))
 		ev (if (numberp ev) (number-to-string ev) ev))
@@ -12761,7 +12724,8 @@ org-mode's default settings, but still inferior to file-local settings."
 
 	  ;; replace "&" by "&amp;", "<" and ">" by "&lt;" and "&gt;"
 	  ;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
-	  ;; Also handle sub_superscripts and checkboxes FIXME
+	  ;; Also handle sub_superscripts and checkboxes
+	  ;; FIXME: is there no better place for checkboxes
 	  (setq line (org-html-expand line))
 
 	  ;; Format the links
@@ -12940,6 +12904,7 @@ org-mode's default settings, but still inferior to file-local settings."
 			    head-count)
 
       (when (plist-get opt-plist :auto-postamble)
+	(insert "<p>")
 	(if author    (insert (concat (nth 1 lang-words) ": " author "\n")))
 	(if email	  (insert (concat "<a href=\"mailto:" email "\">&lt;"
 					  email "&gt;</a>\n")))
@@ -13208,7 +13173,6 @@ stacked delimiters is N.  Escaping delimiters is not possible."
    "\\(" (org-create-multibrace-regexp "(" ")" org-match-sexp-depth) "\\)"
    "\\|"
    "\\(\\(?:\\*\\|[-+]?[^-+*!@#$%^_ \t\r\n,:\"?<>~;./{}=()]+\\)\\)\\)")
-;;;;;;;;;;;;;;;;;;;;;;;;;^ FIXME
   "The regular expression matching a sub- or superscript.")
 
 (defun org-export-html-convert-sub-super (string)
@@ -13258,7 +13222,6 @@ When TITLE is nil, just close all open levels."
 	(if org-export-with-section-numbers
 	    (setq title (concat (org-section-number level) " " title)))
 	(setq level (+ level 1))
-	;; FIXME: here we need to handle the tags, somehow.
 	(when (string-match "\\(:[a-zA-Z0-9_@:]+:\\)[ \t]*$" title)
 	  (setq title (replace-match 
 		       (if org-export-with-tags
@@ -14687,8 +14650,3 @@ Show the heading too, if it is currently invisible."
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
-
-(defun test ()
-  ""
-  (interactive)
-  (org-up-heading-all 1))
\ No newline at end of file
diff --git a/org.pdf b/org.pdf
index 3920e1138..488dde1fd 100644
--- a/org.pdf
+++ b/org.pdf
diff --git a/org.texi b/org.texi
index c3b875929..3cfaf9a7e 100644
--- a/org.texi
+++ b/org.texi
@@ -5,7 +5,7 @@
 @c @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.33
+@set VERSION 4.34
 @set DATE May 2006
 
 @dircategory Emacs
@@ -15,6 +15,7 @@
 
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://www.astro.uva.nl/~dominik/Tools/org/,maintainers webpage}
+@set AUTHOR Carsten Dominik
 @set MAINTAINER Carsten Dominik
 @set MAINTAINEREMAIL @email{dominik@@science.uva.nl}
 @set MAINTAINERCONTACT @uref{mailto:dominik@@science.uva.nl,contact the maintainer}
@@ -358,7 +359,7 @@ the file's name is.  See also the variable
 @cindex author
 
 If you find problems with Org-mode, or if you have questions, remarks,
-or ideas about it, please contact the maintainer Carsten Dominik at
+or ideas about it, please contact the maintainer @value{MAINTAINER} at
 @value{MAINTAINEREMAIL}.
 
 For bug reports, please provide as much information as possible,
@@ -2814,7 +2815,6 @@ Show the global TODO list.  This collects the TODO items from all
 agenda files (@pxref{Agenda views}) into a single buffer.  The buffer is in
 @code{agenda-mode}, so there are commands to examine and manipulate
 the TODO entries directly from that buffer (@pxref{Agenda commands}).
-@xref{Global TODO list}, for more information.
 @kindex C-c a T
 @item C-c a T
 Like the above, but allows selection of a specific TODO keyword.  You can
@@ -3166,7 +3166,7 @@ will be exported as itemized lists.  If you want that transition to occur
 at a different level, specify it with a prefix argument.  For example,
 
 @example
-@kbd{C-1 C-c C-x a org-export-as-ascii}
+@kbd{C-1 C-c C-x a}
 @end example
 
 @noindent
@@ -3250,10 +3250,10 @@ end of the outline tree.  For example:
 
 # Local Variables:
 # org-export-html-style: "   <style type=\"text/css\">
-       p @{font-weight: normal; color: gray; @}
-       h1 @{color: black; @}
-   </style>"
-# End: ***
+#       p @{font-weight: normal; color: gray; @}
+#       h1 @{color: black; @}
+#   </style>"
+# End:
 @end example
 
 Remember to execute @kbd{M-x normal-mode} after changing this to make
@@ -3868,7 +3868,7 @@ lines into the buffer (@pxref{Summary of in-buffer settings}).
 Org-mode uses special lines in the buffer to define settings on a
 per-file basis.  These lines start with a @samp{#+} followed by a
 keyword, a colon, and then individual words defining a setting.  Several
-settings words con be in the same line, but you can also have multiple
+setting words can be in the same line, but you can also have multiple
 lines for the keyword.  While these settings are described throughout
 the manual, here is a summary.  After changing any of those lines in the
 buffer, press @kbd{C-c C-c} with the cursor still in the line to
@@ -3912,7 +3912,7 @@ odd        @r{allow only odd outline levels (1,3,...)}
 oddeven    @r{allow all outline levels}
 @end example
 @item #+SEQ_TODO:   #+TYP_TODO:
-These lines that the TODO keywords and their interpretation in the
+These lines set the TODO keywords and their interpretation in the
 current file.  The corresponding variables are @code{org-todo-keywords}
 and @code{org-todo-interpretation}.
 @item #+TAGS:  TAG1(c1) TAG2(c2)
@@ -4489,7 +4489,7 @@ The exporters work well, but could be made more efficient.
 @cindex acknowledgments
 @cindex thanks
 
-Org-mode was written by Carsten Dominik, who still maintains it at the
+Org-mode was created by @value{AUTHOR}, who still maintains it at the
 Org-mode homepage @uref{http://www.astro.uva.nl/~dominik/Tools/org/}.
 The following people (in alphabetic order) have helped the development
 along with ideas, suggestions and patches.  Many thanks to all of you,
@@ -4497,88 +4497,93 @@ Org-mode would not be what it is without your input.
 
 @itemize @bullet
 @item
-Thomas Baumann contributed the code for links to the MH-E email system.
+@i{Thomas Baumann} contributed the code for links to the MH-E email
+system.
 @item
-Alex Bochannek provided a patch for rounding time stamps.
+@i{Alex Bochannek} provided a patch for rounding time stamps.
 @item
-Charles Caves' suggestion sparked the implementation of templates for
-Remember.
+@i{Charles Cave}'s suggestion sparked the implementation of templates
+for Remember.
 @item
-Pavel Chalmoviansky influenced the agenda treatment of items with
+@i{Pavel Chalmoviansky} influenced the agenda treatment of items with
 specified time.
 @item
-Gregory Chenov patched support for lisp forms into table calculations
-and improved XEmacs compatibility.
+@i{Gregory Chenov} patched support for lisp forms into table
+calculations and improved XEmacs compatibility.
 @item
-Sacha Chua suggested to copy some linking code from Planner.
+@i{Sacha Chua} suggested to copy some linking code from Planner.
 @item
-Kees Dullemond inspired the use of narrowed tabled columns.
+@i{Kees Dullemond} inspired the use of narrowed tabled columns.
 @item
-Christian Egli converted the documentation into TeXInfo format, patched
-CSS formatting into the HTML exporter, and inspired the agenda.
+@i{Christian Egli} converted the documentation into TeXInfo format,
+patched CSS formatting into the HTML exporter, and inspired the agenda.
 @item
-Nic Ferrier contributed mailcap and XOXO support.
+@i{Nic Ferrier} contributed mailcap and XOXO support.
 @item
-Kai Grossjohann pointed out key-binding conflicts caused by Org-mode.
+@i{Kai Grossjohann} pointed out key-binding conflicts caused by
+Org-mode.
 @item
-Stefan Monnier provided a patch to keep the Emacs-Lisp compiler happy.
+@i{Stefan Monnier} provided a patch to keep the Emacs-Lisp compiler
+happy.
 @item
-Todd Neal provided patches for links to Info files and elisp forms.
+@i{Todd Neal} provided patches for links to Info files and elisp forms.
 @item
-Tim O'Callaghan suggested in-file links, search options for
-general file links, and TAGS.
+@i{Tim O'Callaghan} suggested in-file links, search options for general
+file links, and TAGS.
 @item
-Oliver Oppitz suggested multi-state TODO items.
+@i{Oliver Oppitz} suggested multi-state TODO items.
 @item
-Scott Otterson sparked the introduction of descriptive text for links,
-among other things.
+@i{Scott Otterson} sparked the introduction of descriptive text for
+links, among other things.
 @item
-Pete Phillips helped the development of the TAGS feature.
+@i{Pete Phillips} helped the development of the TAGS feature.
 @item
-T.V. Raman reported bugs and suggested improvements.
+@i{T.V. Raman} reported bugs and suggested improvements.
 @item
-Matthias Rempe (Oelde) provided ideas, Windows support, and quality
+@i{Matthias Rempe} (Oelde) provided ideas, Windows support, and quality
 control.
 @item
-Kevin Rogers contributed code to access VM files on remote hosts.
+@i{Kevin Rogers} contributed code to access VM files on remote hosts.
 @item
-Frank Ruell solved the mystery of the @code{keymapp nil} bug, a conflict
-with @file{allout.el}.
+@i{Frank Ruell} solved the mystery of the @code{keymapp nil} bug, a
+conflict with @file{allout.el}.
 @item
-Philip Rooke created the Org-mode reference card and provided lots of feedback.
+@i{Philip Rooke} created the Org-mode reference card and provided lots
+of feedback.
 @item
-Christian Schlauer proposed angular brackets around links, among other
-things.
+@i{Christian Schlauer} proposed angular brackets around links, among
+other things.
 @item
-Linking to VM/BBDB/GNUS was inspired by Tom Shannon's
+Linking to VM/BBDB/GNUS was inspired by @i{Tom Shannon}'s
 @file{organizer-mode.el}.
 @item
-David O'Toole wrote @file{org-publish.el} and came up with lots is ideas
-for small changes.
+@i{David O'Toole} wrote @file{org-publish.el} and came up with lots is
+ideas for small changes.
 @item
-J@"urgen Vollmer contributed code generating the table of contents
+@i{J@"urgen Vollmer} contributed code generating the table of contents
 in HTML output.
 @item
-Chris Wallace provided a patch implementing the @samp{QUOTE} keyword.
+@i{Chris Wallace} provided a patch implementing the @samp{QUOTE}
+keyword.
 @item
-David Wainberg suggested archiving, and improvements to the linking
+@i{David Wainberg} suggested archiving, and improvements to the linking
 system.
 @item
-John Wiegley wrote @file{emacs-wiki.el} and @file{planner.el}.  The
+@i{John Wiegley} wrote @file{emacs-wiki.el} and @file{planner.el}.  The
 development of Org-mode was fully independent, and both systems are
 really different beasts in their basic ideas and implementation details.
 I later looked at John's code, however, and learned from his
 implementation of (i) links where the link itself is hidden and only a
 description is shown, and (ii) popping up a calendar to select a date.
 @item
-Carsten Wimmer suggested some changes and helped fix a bug in linking
-to GNUS.
+@i{Carsten Wimmer} suggested some changes and helped fix a bug in
+linking to GNUS.
 @item
-Roland Winkler requested additional keybindings to make Org-mode
+@i{Roland Winkler} requested additional keybindings to make Org-mode
 work on a tty.
 @item
-Piotr Zielinski wrote @file{org-mouse.el} and showed how to follow links
-with mouse-1.
+@i{Piotr Zielinski} wrote @file{org-mouse.el} and showed how to follow
+links with mouse-1.
 @end itemize
  
 @node Index, Key Index, Miscellaneous, Top
diff --git a/orgcard.pdf b/orgcard.pdf
index 71190f2f7..61a7ec3ee 100644
--- a/orgcard.pdf
+++ b/orgcard.pdf
diff --git a/orgcard.tex b/orgcard.tex
index 4922bff93..2b553260d 100644
--- a/orgcard.tex
+++ b/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.33}
+\def\orgversionnumber{4.34}
 \def\year{2006}
 %
 %**start of header