Release 4.43

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.42).
+   This manual is for Org-mode (version 4.43).
 
    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.42).
+This manual is for Org-mode (version 4.43).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -674,7 +674,7 @@ creates a sparse TODO tree (*note TODO basics::).
 
    To print a sparse tree, you can use the Emacs command
 `ps-print-buffer-with-faces' which does not print invisible parts of
-the document (2).  Or you can use the command `C-c C-x v' to export
+the document (2).  Or you can use the command `C-c C-e v' to export
 only the visible part of the document and print the resulting file.
 
    ---------- Footnotes ----------
@@ -2781,6 +2781,19 @@ collected into a single place.
 TODO entry with a single key press.  The commands available in the TODO
 list are described in *Note Agenda commands::.
 
+   Nomally the global todo list simply shows all headlines with TODO
+keywords.  This list can become very long.  There are two ways to keep
+it more compact:
+   - Some people view a TODO item that has been _scheduled_ for
+     execution (*note Time stamps::) as no longer _open_.  Configure the
+     variable `org-agenda-todo-ignore-scheduled' to exclude scheduled
+     items from the global TODO list.
+
+   - TODO items may have sublevels to break up the task into subtasks.
+     In such cases it may be enough to list only the highest level TODO
+     headline and omit the sublevels from the global list.  Configure
+     the variable `org-agenda-todo-list-sublevels' to get this behavior.
+
 
 File: org,  Node: Matching headline tags,  Next: Timeline,  Prev: Global TODO list,  Up: Agenda views
 
@@ -3260,6 +3273,11 @@ import of these different formats.
    When exporting, Org-mode uses special conventions to enrich the
 output produced.  *Note Text interpretation::, for more details.
 
+`C-c C-e'
+     Dispatcher for export and publishing commands.  Displays a
+     help-window listing the additional key(s) needed to launch an
+     export or publishing command.
+
 * Menu:
 
 * ASCII export::                Exporting to plain ASCII
@@ -3277,13 +3295,13 @@ File: org,  Node: ASCII export,  Next: HTML export,  Prev: Exporting,  Up: Expor
 ASCII export produces a simple and very readable version of an Org-mode
 file.
 
-`C-c C-x a'
+`C-c C-e a'
      Export as ASCII file.  If there is an active region, only the
      region will be exported.  For an org file `myfile.org', the ASCII
      file will be `myfile.txt'.  The file will be overwritten without
      warning.  
 
-`C-c C-x v a'
+`C-c C-e v a'
      Export only the visible part of the document.
 
    In the exported version, the first 3 outline levels will become
@@ -3292,7 +3310,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
+     C-1 C-c C-e a
 
 creates only top level headlines and does the rest as items.  When
 headlines are converted to items, the indentation of the text following
@@ -3312,15 +3330,15 @@ Org-mode contains an HTML (XHTML 1.0 strict) exporter with extensive
 HTML formatting, in ways similar to John Grubers _markdown_ language,
 but with additional support for tables.
 
-`C-c C-x h'
+`C-c C-e h'
      Export as HTML file `myfile.html'.  
 
-`C-c C-x b'
+`C-c C-e b'
      Export as HTML file and open it with a browser.  
 
-`C-c C-x v h'
+`C-c C-e v h'
 
-`C-c C-x v b'
+`C-c C-e v b'
      Export only the visible part of the document.
 
    In the exported version, the first 3 outline levels will become
@@ -3329,7 +3347,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-2 C-c C-x b
+     C-2 C-c C-e b
 
 creates two levels of headings and does the rest as items.
 
@@ -3386,10 +3404,10 @@ Org-mode contains an exporter that produces XOXO-style output.
 Currently, this exporter only handles the general outline structure and
 does not interpret any additional Org-mode features.
 
-`C-c C-x C-x'
+`C-c C-e x'
      Export as XOXO file `myfile.html'.  
 
-`C-c C-x v x'
+`C-c C-e v x'
      Export only the visible part of the document.
 
 
@@ -3405,16 +3423,16 @@ other time-stamped items in Org-mode files show up in the calendar
 application.  Org-mode can export calendar information in the standard
 iCalendar format.
 
-`C-c C-x i'
+`C-c C-e i'
      Create iCalendar entries for the current file and store them in
      the same directory, using a file extension `.ics'.  
 
-`C-c C-x C-i'
-     Like `C-c C-x i', but do this for all files in `org-agenda-files'.
+`C-c C-e I'
+     Like `C-c C-e i', but do this for all files in `org-agenda-files'.
      For each of these files, a separate iCalendar file will be
      written.  
 
-`C-c C-x c'
+`C-c C-e c'
      Create a single large iCalendar file from all files in
      `org-agenda-files' and write it to the file given by
      `org-combined-agenda-icalendar-file'.
@@ -3422,7 +3440,7 @@ iCalendar format.
    How this calendar is best read and updated, depends on the
 application you are using.  For example, when using iCal under Apple
 MacOS X, you could create a new calendar `OrgMode' (the default name
-for the calendar created by `C-c C-x c', see the variables
+for the calendar created by `C-c C-e c', see the variables
 `org-icalendar-combined-name' and
 `org-combined-agenda-icalendar-file').  Then set Org-mode to overwrite
 the corresponding file `~/Library/Calendars/OrgMode.ics'.  You may even
@@ -3514,12 +3532,12 @@ File: org,  Node: Export options,  Prev: Enhancing text,  Up: Text interpretatio
 
 The exporter recognizes special lines in the buffer which provide
 additional information.  These lines may be put anywhere in the file.
-The whole set of lines can be inserted into the buffer with `C-c C-x
+The whole set of lines can be inserted into the buffer with `C-c C-e
 t'.  For individual lines, a good way to make sure the keyword is
 correct is to type `#+' and then use `M-<TAB>' completion (*note
 Completion::).
 
-`C-c C-x t'
+`C-c C-e t'
      Insert template with export options, see example below.
 
      #+TITLE:     the title to be shown (default is the buffer name)
@@ -3859,13 +3877,14 @@ Once org-publish is properly configured, you can publish with the
 following functions:
 
 `C-c C-e c'
-     Prompts for a specific project to publish.
+     Prompt for a specific project and publish all files that belong to
+     it.
 
 `C-c C-e p'
-     Publishes the project the current file is part of.
+     Publish the project containin the current file.
 
 `C-c C-e f'
-     Publishes only the current file.
+     Publish only the current file.
 
 `C-c C-e a'
      Publish all projects.
@@ -4356,7 +4375,7 @@ A.2 Dynamic blocks
 ==================
 
 Org-mode documents can contain _dynamic blocks_.  These are specially
-marked regions that are updates by some user-written function.  A good
+marked regions that are updated by some user-written function.  A good
 example for such a block is the clock table inserted by the command
 `C-c C-x C-r' (*note Clocking work time::).
 
@@ -4390,7 +4409,7 @@ when the block update function was last run:
 
 The corresponding block writer function could look like this:
 
-     (defun org-dblock-write:date-and-time (params)
+     (defun org-dblock-write:block-update-time (params)
         (let ((fmt (or (plist-get params :format) "%d. %m. %Y")))
           (insert "Last block update at: "
      	     (format-time-string fmt (current-time)))))
@@ -4953,6 +4972,20 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c C-c:                               Plain lists.         (line  76)
 * C-c C-d <1>:                           Agenda commands.     (line 139)
 * C-c C-d:                               Creating timestamps. (line  37)
+* C-c C-e:                               Exporting.           (line  19)
+* C-c C-e a:                             ASCII export.        (line   9)
+* C-c C-e b:                             HTML export.         (line  11)
+* C-c C-e c:                             iCalendar export.    (line  20)
+* C-c C-e h:                             HTML export.         (line  10)
+* C-c C-e I:                             iCalendar export.    (line  15)
+* C-c C-e i:                             iCalendar export.    (line  13)
+* C-c C-e t:                             Export options.      (line  13)
+* C-c C-e v <1>:                         XOXO export.         (line  11)
+* C-c C-e v:                             Sparse trees.        (line  39)
+* C-c C-e v a:                           ASCII export.        (line  13)
+* C-c C-e v b:                           HTML export.         (line  14)
+* C-c C-e v h:                           HTML export.         (line  14)
+* C-c C-e x:                             XOXO export.         (line  10)
 * C-c C-f:                               Motion.              (line  12)
 * C-c C-j:                               Motion.              (line  21)
 * C-c C-l:                               Handling links.      (line  27)
@@ -4972,14 +5005,10 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c C-u:                               Motion.              (line  18)
 * C-c C-v:                               TODO basics.         (line  26)
 * C-c C-w:                               Creating timestamps. (line  41)
-* C-c C-x a:                             ASCII export.        (line   9)
-* C-c C-x b:                             HTML export.         (line  11)
-* C-c C-x c:                             iCalendar export.    (line  20)
 * C-c C-x C-a:                           ARCHIVE tag.         (line  27)
 * C-c C-x C-b:                           Checkboxes.          (line  23)
 * C-c C-x C-c:                           Agenda commands.     (line 201)
 * C-c C-x C-d:                           Clocking work time.  (line  28)
-* C-c C-x C-i <1>:                       iCalendar export.    (line  15)
 * C-c C-x C-i:                           Clocking work time.  (line  12)
 * C-c C-x C-k:                           Structure editing.   (line  36)
 * C-c C-x C-l:                           Processing LaTeX fragments.
@@ -4990,22 +5019,13 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c C-x C-w <1>:                       Built-in table editor.
                                                               (line 108)
 * C-c C-x C-w:                           Structure editing.   (line  36)
-* C-c C-x C-x <1>:                       XOXO export.         (line  10)
 * C-c C-x C-x:                           Clocking work time.  (line  24)
 * C-c C-x C-y <1>:                       Built-in table editor.
                                                               (line 112)
 * C-c C-x C-y:                           Structure editing.   (line  43)
-* C-c C-x h:                             HTML export.         (line  10)
-* C-c C-x i:                             iCalendar export.    (line  13)
 * C-c C-x M-w <1>:                       Built-in table editor.
                                                               (line 105)
 * C-c C-x M-w:                           Structure editing.   (line  40)
-* C-c C-x t:                             Export options.      (line  13)
-* C-c C-x v <1>:                         XOXO export.         (line  11)
-* C-c C-x v:                             Sparse trees.        (line  39)
-* C-c C-x v a:                           ASCII export.        (line  13)
-* C-c C-x v b:                           HTML export.         (line  14)
-* C-c C-x v h:                           HTML export.         (line  14)
 * C-c C-y:                               Creating timestamps. (line  66)
 * C-c l:                                 Handling links.      (line   9)
 * C-c {:                                 CDLaTeX mode.        (line  21)
@@ -5192,56 +5212,56 @@ Node: Time-of-day specifications108610
 Node: Calendar/Diary integration110586
 Node: Sorting of agenda items111963
 Node: Global TODO list112795
-Node: Matching headline tags114156
-Node: Timeline115099
-Node: Agenda commands115972
-Node: Embedded LaTeX121816
-Ref: Embedded LaTeX-Footnote-1122908
-Node: Math symbols123098
-Node: Subscripts and Superscripts123863
-Node: LaTeX fragments124707
-Node: Processing LaTeX fragments126776
-Node: CDLaTeX mode127722
-Ref: CDLaTeX mode-Footnote-1130206
-Node: Exporting130354
-Node: ASCII export131491
-Node: HTML export132781
-Node: XOXO export135617
-Node: iCalendar export136058
-Node: Text interpretation137883
-Node: Comment lines138362
-Node: Enhancing text138833
-Node: Export options140525
-Node: Publishing142192
-Ref: Publishing-Footnote-1142988
-Node: Configuration143184
-Node: Project alist143902
-Node: Sources and destinations144968
-Node: Selecting files145515
-Node: Publishing action146263
-Node: Publishing options147378
-Node: Publishing links149530
-Node: Project page index151043
-Node: Sample configuration151821
-Node: Simple example152313
-Node: Complex example152986
-Node: Triggering publication155062
-Node: Miscellaneous155718
-Node: Completion156352
-Node: Customization157348
-Node: In-buffer settings157933
-Node: The very busy C-c C-c key161164
-Node: Clean view162801
-Node: TTY keys165378
-Node: Interaction166987
-Node: Cooperation167384
-Node: Conflicts169286
-Node: Bugs170878
-Node: Extensions and Hacking172501
-Node: Extensions172987
-Node: Dynamic blocks174557
-Node: History and Acknowledgments176475
-Node: Index181256
-Node: Key Index204096
+Node: Matching headline tags114846
+Node: Timeline115789
+Node: Agenda commands116662
+Node: Embedded LaTeX122506
+Ref: Embedded LaTeX-Footnote-1123598
+Node: Math symbols123788
+Node: Subscripts and Superscripts124553
+Node: LaTeX fragments125397
+Node: Processing LaTeX fragments127466
+Node: CDLaTeX mode128412
+Ref: CDLaTeX mode-Footnote-1130896
+Node: Exporting131044
+Node: ASCII export132358
+Node: HTML export133648
+Node: XOXO export136484
+Node: iCalendar export136923
+Node: Text interpretation138746
+Node: Comment lines139225
+Node: Enhancing text139696
+Node: Export options141388
+Node: Publishing143055
+Ref: Publishing-Footnote-1143851
+Node: Configuration144047
+Node: Project alist144765
+Node: Sources and destinations145831
+Node: Selecting files146378
+Node: Publishing action147126
+Node: Publishing options148241
+Node: Publishing links150393
+Node: Project page index151906
+Node: Sample configuration152684
+Node: Simple example153176
+Node: Complex example153849
+Node: Triggering publication155925
+Node: Miscellaneous156609
+Node: Completion157243
+Node: Customization158239
+Node: In-buffer settings158824
+Node: The very busy C-c C-c key162055
+Node: Clean view163692
+Node: TTY keys166269
+Node: Interaction167878
+Node: Cooperation168275
+Node: Conflicts170177
+Node: Bugs171769
+Node: Extensions and Hacking173392
+Node: Extensions173878
+Node: Dynamic blocks175448
+Node: History and Acknowledgments177370
+Node: Index182151
+Node: Key Index204991
 
 End Tag Table

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.42
+;; Version: 4.43
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -90,6 +90,9 @@
 ;;
 ;; Recent changes
 ;; --------------
+;; Version 4.43
+;;    - Big fixes
+;;
 ;; Version 4.42
 ;;    - Bug fixes
 ;;    - `s' key in the agenda saves all org-mode buffers.
@@ -209,7 +212,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.42"
+(defvar org-version "4.43"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -4700,12 +4703,13 @@ the children that do not contain any open TODO items."
 	(pc '(:org-comment t))
 	(pall '(:org-archived t :org-comment t))
 	(rea (concat ":" org-archive-tag ":"))
-	file re)
+	bmp file re)
     (save-excursion
       (while (setq file (pop files))
 	(org-check-agenda-file file)
 	(set-buffer (org-get-agenda-file-buffer file))
 	(widen)
+	(setq bmp (buffer-modified-p))
 	(save-excursion
 	  (remove-text-properties (point-min) (point-max) pall)
 	  (when org-agenda-skip-archived-trees
@@ -4717,7 +4721,8 @@ the children that do not contain any open TODO items."
 	  (setq re (concat "^\\*+ +" org-comment-string "\\>"))
 	  (while (re-search-forward re nil t)
 	    (add-text-properties
-	     (match-beginning 0) (org-end-of-subtree t) pc)))))))
+	     (match-beginning 0) (org-end-of-subtree t) pc)))
+	(set-buffer-modified-p bmp)))))
 
 (defun org-agenda-skip ()
   "Throw to `:skip' in places that should be skipped."
@@ -7432,9 +7437,11 @@ the documentation of `org-diary'."
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
-	(and org-agenda-todo-ignore-scheduled
-	     (looking-at sched-re)
-	     (throw :skip nil))
+	(when (and org-agenda-todo-ignore-scheduled
+		   (looking-at sched-re))
+	  ;; FIXME: the following test also happens below, but we need it here
+	  (or org-agenda-todo-list-sublevels (org-end-of-subtree 'invisible))
+	  (throw :skip nil))
 	(org-agenda-skip)
 	(goto-char (match-beginning 1))
 	(setq marker (org-agenda-new-marker (1+ (match-beginning 0)))

org.texi

@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.42
+@set VERSION 4.43
 @set DATE July 2006
 
 @dircategory Emacs
@@ -771,14 +771,14 @@ a sparse tree matching the string @samp{FIXME}.
 Other commands use sparse trees as well.  For example @kbd{C-c
 C-v} creates a sparse TODO tree (@pxref{TODO basics}).
 
-@kindex C-c C-x v
+@kindex C-c C-e v
 @cindex printing sparse trees
 @cindex visible text, printing
 To print a sparse tree, you can use the Emacs command
 @code{ps-print-buffer-with-faces} which does not print invisible parts
 of the document @footnote{This does not work under XEmacs, because
 XEmacs uses selective display for outlining, not text properties.}.
-Or you can use the command @kbd{C-c C-x v} to export only the visible
+Or you can use the command @kbd{C-c C-e v} to export only the visible
 part of the document and print the resulting file.
 
 
@@ -3059,6 +3059,23 @@ Remote editing of TODO items means that you can change the state of a
 TODO entry with a single key press.  The commands available in the
 TODO list are described in @ref{Agenda commands}.
 
+Nomally the global todo list simply shows all headlines with TODO
+keywords.  This list can become very long.  There are two ways to keep
+it more compact:
+@itemize @minus
+@item
+Some people view a TODO item that has been @emph{scheduled} for
+execution (@pxref{Time stamps}) as no longer @emph{open}.  Configure the
+variable @code{org-agenda-todo-ignore-scheduled} to exclude scheduled
+items from the global TODO list.
+@item
+TODO items may have sublevels to break up the task into subtasks.  In
+such cases it may be enough to list only the highest level TODO headline
+and omit the sublevels from the global list.  Configure the variable
+@code{org-agenda-todo-list-sublevels} to get this behavior.
+@end itemize
+
+
 @node Matching headline tags, Timeline, Global TODO list, Agenda views
 @section Matching headline tags
 @cindex matching, of tags
@@ -3341,6 +3358,7 @@ calendars.
 @item H
 Show holidays for three month around the cursor date.
 
+@c FIXME:  This should be a different key.
 @kindex C-c C-x C-c
 @item C-c C-x C-c
 Export a single iCalendar file containing entries from all agenda files.
@@ -3575,6 +3593,14 @@ import of these different formats.
 When exporting, Org-mode uses special conventions to enrich the output
 produced.  @xref{Text interpretation}, for more details.
 
+@table @kbd
+@kindex C-c C-e
+@item C-c C-e
+Dispatcher for export and publishing commands.  Displays a help-window
+listing the additional key(s) needed to launch an export or publishing
+command.
+@end table
+
 @menu
 * ASCII export::                Exporting to plain ASCII
 * HTML export::                 Exporting to HTML
@@ -3594,14 +3620,14 @@ file.
 @cindex active region
 @cindex transient-mark-mode
 @table @kbd
-@kindex C-c C-x a
-@item C-c C-x a
+@kindex C-c C-e a
+@item C-c C-e a
 Export as ASCII file.  If there is an active region, only the region
 will be exported.  For an org file @file{myfile.org}, the ASCII file
 will be @file{myfile.txt}.  The file will be overwritten without
 warning.
-@kindex C-c C-x v a
-@item C-c C-x v a
+@kindex C-c C-e v a
+@item C-c C-e v a
 Export only the visible part of the document.
 @end table
 
@@ -3612,7 +3638,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}
+@kbd{C-1 C-c C-e a}
 @end example
 
 @noindent
@@ -3636,16 +3662,16 @@ language, but with additional support for tables.
 @cindex active region
 @cindex transient-mark-mode
 @table @kbd
-@kindex C-c C-x h
-@item C-c C-x h
+@kindex C-c C-e h
+@item C-c C-e h
 Export as HTML file @file{myfile.html}.
-@kindex C-c C-x b
-@item C-c C-x b
+@kindex C-c C-e b
+@item C-c C-e b
 Export as HTML file and open it with a browser.
-@kindex C-c C-x v h
-@kindex C-c C-x v b
-@item C-c C-x v h
-@item C-c C-x v b
+@kindex C-c C-e v h
+@kindex C-c C-e v b
+@item C-c C-e v h
+@item C-c C-e v b
 Export only the visible part of the document.
 @end table
 
@@ -3656,7 +3682,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-2 C-c C-x b}
+@kbd{C-2 C-c C-e b}
 @end example
 
 @noindent
@@ -3725,11 +3751,11 @@ Currently, this exporter only handles the general outline structure and
 does not interpret any additional Org-mode features.
 
 @table @kbd
-@kindex C-c C-x C-x
-@item C-c C-x C-x
+@kindex C-c C-e x
+@item C-c C-e x
 Export as XOXO file @file{myfile.html}.
-@kindex C-c C-x v
-@item C-c C-x v x
+@kindex C-c C-e v
+@item C-c C-e v x
 Export only the visible part of the document.
 @end table
 
@@ -3745,17 +3771,17 @@ application.  Org-mode can export calendar information in the standard
 iCalendar format.
 
 @table @kbd
-@kindex C-c C-x i
-@item C-c C-x i
+@kindex C-c C-e i
+@item C-c C-e i
 Create iCalendar entries for the current file and store them in the same
 directory, using a file extension @file{.ics}.
-@kindex C-c C-x C-i
-@item C-c C-x C-i
-Like @kbd{C-c C-x i}, but do this for all files in
+@kindex C-c C-e I
+@item C-c C-e I
+Like @kbd{C-c C-e i}, but do this for all files in
 @code{org-agenda-files}.  For each of these files, a separate iCalendar
 file will be written.
-@kindex C-c C-x c
-@item C-c C-x c
+@kindex C-c C-e c
+@item C-c C-e c
 Create a single large iCalendar file from all files in
 @code{org-agenda-files} and write it to the file given by
 @code{org-combined-agenda-icalendar-file}.
@@ -3764,7 +3790,7 @@ Create a single large iCalendar file from all files in
 How this calendar is best read and updated, depends on the application
 you are using.  For example, when using iCal under Apple MacOS X, you
 could create a new calendar @samp{OrgMode} (the default name for the
-calendar created by @kbd{C-c C-x c}, see the variables
+calendar created by @kbd{C-c C-e c}, see the variables
 @code{org-icalendar-combined-name} and
 @code{org-combined-agenda-icalendar-file}).  Then set Org-mode to
 overwrite the corresponding file
@@ -3881,13 +3907,13 @@ buffer.
 The exporter recognizes special lines in the buffer which provide
 additional information.  These lines may be put anywhere in the file.
 The whole set of lines can be inserted into the buffer with @kbd{C-c
-C-x t}.  For individual lines, a good way to make sure the keyword is
+C-e t}.  For individual lines, a good way to make sure the keyword is
 correct is to type @samp{#+} and then use @kbd{M-@key{TAB}} completion
 (@pxref{Completion}).
 
 @table @kbd
-@kindex C-c C-x t
-@item C-c C-x t
+@kindex C-c C-e t
+@item C-c C-e t
 Insert template with export options, see example below.
 @end table
 
@@ -4251,18 +4277,18 @@ following functions:
 
 @table @kbd
 @item C-c C-e c
-Prompts for a specific project to publish.
+Prompt for a specific project and publish all files that belong to it.
 @item C-c C-e p
-Publishes the project the current file is part of. 
+Publish the project containin the current file.
 @item C-c C-e f
-Publishes only the current file.
+Publish only the current file.
 @item C-c C-e a
 Publish all projects.
 @end table
 
 Org uses timestamps to track when a file has changed. The above
 functions normally only publish changed files. You can override this and
-force publishing of all files by giving a prefix argument. 
+force publishing of all files by giving a prefix argument.
 
 @node Miscellaneous, Extensions and Hacking, Publishing, Top
 @chapter Miscellaneous
@@ -4770,7 +4796,7 @@ blogs. @url{http://www.cognition.ens.fr/~guerry/org-blogging.html}.
 @section Dynamic blocks
 
 Org-mode documents can contain @emph{dynamic blocks}.  These are
-specially marked regions that are updates by some user-written
+specially marked regions that are updated by some user-written
 function.  A good example for such a block is the clock table inserted
 by the command @kbd{C-c C-x C-r} (@pxref{Clocking work time}).
 
@@ -4814,7 +4840,7 @@ run:
 The corresponding block writer function could look like this:
 
 @lisp
-(defun org-dblock-write:date-and-time (params)
+(defun org-dblock-write:block-update-time (params)
    (let ((fmt (or (plist-get params :format) "%d. %m. %Y")))
      (insert "Last block update at: "
 	     (format-time-string fmt (current-time)))))

orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.42}
+\def\orgversionnumber{4.43}
 \def\year{2006}
 %
 %**start of header
@@ -639,7 +639,7 @@ To set categories, add lines like$^2$:
 
 \section{Calendar and Diary Integration}
 
-To include entries from the Emacs diary in your Org-mode agenda:
+Include Emacs diary entries into Org-mode agenda with:
 \beginexample%
 (setq org-agenda-include-diary t)
 \endexample