[Emacs-diffs] Changes to emacs/man/org.texi

[Carsten Dominik]

Index: emacs/man/org.texi
diff -u emacs/man/org.texi:1.51 emacs/man/org.texi:1.52
--- emacs/man/org.texi:1.51     Thu Apr 13 07:07:05 2006
+++ emacs/man/org.texi  Thu Apr 13 13:49:41 2006
@@ -4,7 +4,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
address@hidden VERSION 4.22
address@hidden VERSION 4.23
 @set DATE April 2006
 
 @dircategory Emacs
@@ -182,21 +182,24 @@
 
 Exporting
 
-* ASCII export::                Export as a structured ASCII file
-* HTML export::                 Export as an HTML file
-* iCalendar export::            Create calendar entries.
-
-HTML export
-
-* HTML formatting::             Interpretation of the buffer content
-* Export options::              How to influence exports
-* Comment lines::               Lines which will not be exported
+* ASCII export::                Exporting to plain ASCII
+* HTML export::                 Exporting to HTML
+* XML export::                  Exporting to XML
+* iCalendar export::            Exporting in iCalendar format
+* Text interpretation::         How the exporter looks at the file
+
+Text interpretation by the exporter
+
+* Comment lines::               Some lines will not be exported
+* Enhancing text::              Subscripts, symbols and more
+* Export options::              How to influence the export settings
 
 Miscellaneous
 
 * Completion::                  M-TAB knows what you need
 * Customization::               Adapting Org-mode to your taste
-* Updating settings::           How to tell Org-mode that settings have changed
+* Summary of in-buffer settings::  Using special lines to set options
+* The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org-mode on a tty
 * FAQ::                         Frequently asked questions
@@ -450,9 +453,9 @@
 buffer:
 
 @example
-#+STARTUP: fold
-#+STARTUP: nofold
+#+STARTUP: overview
 #+STARTUP: content
+#+STARTUP: showall
 @end example
 
 @node Motion, Structure editing, Visibility cycling, Document Structure
@@ -785,8 +788,8 @@
 Convert the active region to table. If every line contains at least one
 TAB character, the function assumes that the material is tab separated.
 If not, lines are split at whitespace into fields.  You can use a prefix
-argument to indicate the minimum number of consequtive spaces required
-to indentify a field separator (default: just one)address@hidden 
+argument to indicate the minimum number of consecutive spaces required
+to identify a field separator (default: just one)address@hidden 
 If there is no active region, this command creates an empty Org-mode
 table.  However, it's easier to just start typing, like
 @kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}.
@@ -981,7 +984,7 @@
 
 The width of columns is automatically determined by the table editor.
 Sometimes a single field or a few fields need to carry more text,
-leading to unconveniently wide columns.  To address@hidden feature
+leading to inconveniently wide columns.  To address@hidden feature
 does not work on XEmacs.} the width of a column, one field anywhere in
 the column must carry the string @samp{<N>} where @samp{N} is an integer
 specifying the width of the column in characters.  The next re-align
@@ -2887,21 +2890,34 @@
 @chapter Exporting
 @cindex exporting
 
-For printing and sharing of notes, Org-mode documents can be exported
-as ASCII or HTML files.  To incorporate entries with associated times
-like deadlines or appointments into a desktop calendar program like
-iCal, Org-mode can also produce extracts in the iCalendar format.
+Org-mode documents can be exported into a variety of other formats.  For
+printing and sharing of notes, ASCII export produces a readable and
+simple version of an Org-mode file.  HTML export allows to publish a
+notes file on the web, while the XML format provides a solid base for
+exchange with a broad range of other applications.  To incorporate
+entries with associated times like deadlines or appointments into a
+desktop calendar program like iCal, Org-mode can also produce extracts
+in the iCalendar format.  Currently Org-mode only supports export, not
+import of these different formats.
+
+When exporting, Org-mode uses special conventions to enrich the output
+produced.  @xref{Text interpretation}, for more details.
 
 @menu
-* ASCII export::                Export as a structured ASCII file
-* HTML export::                 Export as an HTML file
-* iCalendar export::            Create calendar entries.
+* ASCII export::                Exporting to plain ASCII
+* HTML export::                 Exporting to HTML
+* XML export::                  Exporting to XML
+* iCalendar export::            Exporting in iCalendar format
+* Text interpretation::         How the exporter looks at the file
 @end menu
 
 @node ASCII export, HTML export, Exporting, Exporting
 @section ASCII export
 @cindex ASCII export
 
+ASCII export produces an simple and very readable version of an Org-mode
+file.
+
 @cindex region, active
 @cindex active region
 @cindex transient-mark-mode
@@ -2925,11 +2941,9 @@
 @end example
 
 @noindent
-creates only top level headlines and does the rest as items.  Lines
-starting with @samp{#} and subtrees starting with the word @samp{COMMENT}
-will not be exported.
+creates only top level headlines and does the rest as items.
 
address@hidden HTML export, iCalendar export, ASCII export, Exporting
address@hidden HTML export, XML export, ASCII export, Exporting
 @section HTML export
 @cindex HTML export
 
@@ -2947,12 +2961,6 @@
 @kindex C-c C-x b
 @item C-c C-x b
 Export as HTML file and open it with a browser.
address@hidden C-c C-x t
address@hidden C-c C-x t
-Insert template with export options, see below.
address@hidden C-c :
address@hidden C-c :
-Toggle fixed-width for entry (QUOTE) or region, see below.
 @end table
 
 @cindex headline levels, for exporting
@@ -2968,26 +2976,145 @@
 @noindent
 creates two levels of headings and does the rest as items.
 
+If you want to include HTML tags which should be interpreted as such,
+mark them with a @samp{@@} like in @samp{@@<b>bold text@@</b>}.
+Plain @samp{<} and @samp{>} are always transformed to @samp{&lt;} and
address@hidden&gt;} in HTML export.
+
+You can also give style information for the exported file.  The
+default specification can be configured through the option
address@hidden  If you want to use a file-local style,
+you may use file variables, best wrapped into a COMMENT section at the
+end of the outline tree.  For example:
+
address@hidden
+* COMMENT HTML style specifications
+
+# Local Variables:
+# org-export-html-style: "   <style type=\"text/css\">
+       p @{font-weight: normal; color: gray; @}
+       h1 @{color: black; @}
+   </style>"
+# End: ***
address@hidden example
+
+Remember to execute @kbd{M-x normal-mode} after changing this to make
+the new style visible to Emacs.  This command restarts org-mode for the
+current buffer and forces Emacs to re-evaluate the local variables
+section in the buffer.
+
address@hidden XML export, iCalendar export, HTML export, Exporting
address@hidden XML export
address@hidden XML export
+
+Org-mode contains an XML exporter that produces XOXO-style XML.
+Currently, this exporter only handles the general outline structure and
+does not interpret any additional Org-mode features.
+
address@hidden @kbd
address@hidden C-c C-x C-x
address@hidden C-c C-x C-x
+Export as XML file @file{myfile.xml}.
address@hidden table
+
address@hidden iCalendar export, Text interpretation, XML export, Exporting
address@hidden iCalendar export
address@hidden iCalendar export
+
+Some people like to use Org-mode for keeping track of projects, but
+still prefer a standard calendar application for anniversaries and
+appointments.  In this case it can be useful to have deadlines and
+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.
+
address@hidden @kbd
address@hidden C-c C-x i
address@hidden C-c C-x i
+Create iCalendar entries for the current file and store them in the same
+directory, using a file extension @file{.ics}.
address@hidden C-c C-x C-i
address@hidden C-c C-x C-i
+Like @kbd{C-c C-x i}, but do this for all files in
address@hidden  For each of these files, a separate iCalendar
+file will be written.
address@hidden C-c C-x c
address@hidden C-c C-x c
+Create a single large iCalendar file from all files in
address@hidden and write it to the file given by
address@hidden
address@hidden table
+
+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
address@hidden and
address@hidden).  Then set Org-mode to
+overwrite the corresponding file
address@hidden/Library/Calendars/OrgMode.ics}.  You may even use AppleScript
+to make iCal re-read the calendar files each time a new version of
address@hidden is produced.  Here is the setup needed for this:
+
address@hidden applescript, for calendar update
address@hidden
+(setq org-combined-agenda-icalendar-file
+    "~/Library/Calendars/OrgMode.ics")
+(add-hook 'org-after-save-iCalendar-file-hook
+ (lambda ()
+  (shell-command
+   "osascript -e 'tell application \"iCal\" to reload calendars'")))
address@hidden lisp
+
address@hidden Text interpretation,  , iCalendar export, Exporting
address@hidden Text interpretation by the exporter
+
+The exporter backends interpret additional structure in the Org-mode file
+in order to produce better output.
+
 @menu
-* HTML formatting::             Interpretation of the buffer content
-* Export options::              How to influence exports
-* Comment lines::               Lines which will not be exported
+* Comment lines::               Some lines will not be exported
+* Enhancing text::              Subscripts, symbols and more
+* Export options::              How to influence the export settings
 @end menu
 
address@hidden HTML formatting, Export options, HTML export, HTML export
address@hidden HTML formatting
address@hidden Comment lines, Enhancing text, Text interpretation, Text 
interpretation
address@hidden Comment lines
address@hidden comment lines
address@hidden exporting, not
+
+Lines starting with @samp{#} in column zero are treated as comments
+and will never be exported.  Also entire subtrees starting with the
+word @samp{COMMENT} will never be exported.  Finally, any text before
+the first headline will not be exported either.
+
address@hidden @kbd
address@hidden C-c ;
address@hidden C-c ;
+Toggle the COMMENT keyword at the beginning of an entry.
address@hidden table
+
+
+
address@hidden Enhancing text, Export options, Comment lines, Text 
interpretation
address@hidden Enhancing text for export
address@hidden enhancing text
address@hidden richer text
+
+Some of the export backends of Org-mode allow for sophisticated text
+formatting, this is true in particular for the HTML backend.  Org-mode
+has a number of typing conventions that allow to produce a richly
+formatted output.
 
-Not all text is transferred literally to the exported HTML file.  The
-exporter implements the following interpretation:
 
 @itemize @bullet
 
 @cindex hand-formatted lists
 @cindex lists, hand-formatted
 @item
-Hand-formatted lists with @samp{-}, @samp{*} or @samp{+} as
-bullet, or with @samp{1.} or @samp{2)} as enumerator will be recognized and
-transformed into HTML lists.  See @xref{Plain Lists}.
+Plain lists @samp{-}, @samp{*} or @samp{+} as bullet, or with @samp{1.}
+or @samp{2)} as enumerator will be recognized and transformed if the
+backend supports lists.  See @xref{Plain Lists}.
 
 @cindex underlined text
 @cindex bold text
@@ -3010,10 +3137,11 @@
 letters, and press @address@hidden to see possible completions.
 @end itemize
 
address@hidden tables, export to HTML
address@hidden tables, export
 @item
-Tables are transformed into HTML tables.  Data fields before the first
-horizontal separator line will be formatted as table header fields.
+Tables are transformed into native tables under the exporter, if the
+export backend supports this. Data fields before the first horizontal
+separator line will be formatted as table header fields.
 
 @cindex fixed width
 @item
@@ -3021,19 +3149,20 @@
 headline will be typeset as fixed-width, to allow quoting of computer
 codes etc.  Lines starting with @samp{:} are also typeset in
 fixed-width font.
-
address@hidden HTML tags
address@hidden
-If you want to include HTML tags which should be interpreted as such,
-mark them with a @samp{@@} like in @samp{@@<b>bold text@@</b>}.
-Plain @samp{<} and @samp{>} are always transformed to @samp{&lt;} and
address@hidden&gt;} in HTML export.
address@hidden @kbd
address@hidden C-c :
address@hidden C-c :
+Toggle fixed-width for entry (QUOTE) or region, see below.
address@hidden table
 @end itemize
 
 If these conversions conflict with your habits of typing ASCII text,
-they can all be turned off with corresponding variables.
+they can all be turned off with corresponding variables (see the
+customization group @code{org-export-general}, and the following section
+which explains how to set export options with special lines in a
+buffer.
 
address@hidden Export options, Comment lines, HTML formatting, HTML export
address@hidden Export options,  , Enhancing text, Text interpretation
 @subsection Export options
 @cindex options, for export
 
@@ -3045,6 +3174,12 @@
 correct is to type @samp{#+} and then use @address@hidden completion
 (@pxref{Completion}).
 
address@hidden @kbd
address@hidden C-c C-x t
address@hidden C-c C-x t
+Insert template with export options, see example below.
address@hidden table
+
 @example
 #+TITLE:     the title to be shown (default is the buffer name)
 #+AUTHOR:    the author (default taken from @code{user-full-name})
@@ -3081,101 +3216,14 @@
 TeX:    @r{turn on/off @TeX{} macros}
 @end example
 
-You can also give style information for the exported file.  The
-default specification can be configured through the option
address@hidden  If you want to use a file-local style,
-you may use file variables, best wrapped into a COMMENT section at the
-end of the outline tree.  For example:
-
address@hidden
-* COMMENT HTML style specifications
-
-# Local Variables:
-# org-export-html-style: "   <style type=\"text/css\">
-       p @{font-weight: normal; color: gray; @}
-       h1 @{color: black; @}
-   </style>"
-# End: ***
address@hidden example
-
-Remember to execute @kbd{M-x normal-mode} after changing this to make
-the new style visible to Emacs.  This command reastarts org-mode for the
-current buffer and forces Emacs to re-evaluate the loval variables
-section in the buffer.
-
address@hidden Comment lines,  , Export options, HTML export
address@hidden Comment lines
address@hidden comment lines
address@hidden exporting, not
-
-Lines starting with @samp{#} in column zero are treated as comments
-and will never be exported.  Also entire subtrees starting with the
-word @samp{COMMENT} will never be exported.  Finally, any text before
-the first headline will not be exported either.  This applies also for
-ASCII export.
-
address@hidden @kbd
address@hidden C-c ;
address@hidden C-c ;
-Toggle the COMMENT keyword at the beginning of an entry.
address@hidden table
-
address@hidden iCalendar export,  , HTML export, Exporting
address@hidden iCalendar export
address@hidden iCalendar export
-
-Some people like to use Org-mode for keeping track of projects, but
-still prefer a standard calendar application for anniversaries and
-appointments.  In this case it can be useful to have deadlines and
-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.
-
address@hidden @kbd
address@hidden C-c C-x i
address@hidden C-c C-x i
-Create iCalendar entries for the current file and store them in the same
-directory, using a file extension @file{.ics}.
address@hidden C-c C-x C-i
address@hidden C-c C-x C-i
-Like @kbd{C-c C-x i}, but do this for all files in
address@hidden  For each of these files, a separate iCalendar
-file will be written.
address@hidden C-c C-x c
address@hidden C-c C-x c
-Create a single large iCalendar file from all files in
address@hidden and write it to the file given by
address@hidden
address@hidden table
-
-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
address@hidden and
address@hidden).  Then set Org-mode to
-overwrite the corresponding file
address@hidden/Library/Calendars/OrgMode.ics}.  You may even use AppleScript
-to make iCal re-read the calendar files each time a new version of
address@hidden is produced.  Here is the setup needed for this:
-
address@hidden applescript, for calendar update
address@hidden
-(setq org-combined-agenda-icalendar-file
-    "~/Library/Calendars/OrgMode.ics")
-(add-hook 'org-after-save-iCalendar-file-hook
- (lambda ()
-  (shell-command
-   "osascript -e 'tell application \"iCal\" to reload calendars'")))
address@hidden lisp
-
 @node Miscellaneous, Index, Exporting, Top
 @chapter Miscellaneous
 
 @menu
 * Completion::                  M-TAB knows what you need
 * Customization::               Adapting Org-mode to your taste
-* Updating settings::           How to tell Org-mode that settings have changed
+* Summary of in-buffer settings::  Using special lines to set options
+* The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org-mode on a tty
 * FAQ::                         Frequently asked questions
@@ -3228,7 +3276,7 @@
 @end table
 
 
address@hidden Customization, Updating settings, Completion, Miscellaneous
address@hidden Customization, Summary of in-buffer settings, Completion, 
Miscellaneous
 @section Customization
 @cindex customization
 @cindex options, for customization
@@ -3238,43 +3286,112 @@
 Org-mode.  For the sake of compactness of the manual, we are not
 describing the variables here.  A structured overview of customization
 variables is available with @kbd{M-x org-customize}.  Or select
address@hidden Org Group} from the @code{Org->Customization} menu.
address@hidden Org Group} from the @code{Org->Customization} menu.  Many
+settings can also be activated on a per-file basis, by putting special
+lines into the buffer (@pxref{Summary of in-buffer settings}).
+
address@hidden Summary of in-buffer settings, The very busy C-c C-c key, 
Customization, Miscellaneous
address@hidden Summary of in-buffer settings
address@hidden in-buffer settings
address@hidden special keywords
+
+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
+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
+activate the changes immediately.  Otherwise they become effective only
+when the file is visited again in a new Emacs session.
+
address@hidden @kbd
address@hidden #+STARTUP:
+This line sets options to be used at startup of org-mode, when an
+Org-mode file is being visited.  The first set of options deals with the
+initial visibility of the outline tree.  The corresponding variable for
+global default settings is @code{org-startup-folded}, with a default
+value @code{t}, which means @code{overview}.
address@hidden
+overview   @r{top-level headlines only}
+content    @r{all headlines}
+showall    @r{no folding at all, show everything}
address@hidden example
+Then there are options for aligning tables upon visiting a file.  This
+is useful in files containing narrowed table columns.  The corresponding
+variable is @code{org-startup-align-all-tables}, with a default value
address@hidden 
address@hidden
+align      @r{align all tables}
+noalign    @r{don't align table on startup}
address@hidden example
+Here are the options for hiding leading stars in outline headings.  The
+corresponding variables are @code{org-hide-leading-stars} and
address@hidden, both with a default setting @code{nil}
+(meaning @code{showstars} and @code{oddeven}).
address@hidden
+hidestars  @r{make all but one of the stars starting a headline invisible.}
+showstars  @r{show all stars starting a headline}
+odd        @r{allow only odd outline levels (1,3,...)}
+oddeven    @r{allow all outline levels}
address@hidden example
address@hidden #+SEQ_TODO:   #+TYP_TODO:
+These lines that the TODO keywords and their interpretation in the
+current file.  The corresponding variables are @code{org-todo-keywords}
+and @code{org-todo-interpretation}.
address@hidden #+CATEGORY:
+This line sets the category for the agenda file.  The category applies
+for all subsequent lines until the next @samp{#+CATEGORY} line, or the
+end of the file.
address@hidden #+TBLFM:
+This line contains the formulas for the table directly above the line.
address@hidden #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+OPTIONS:
+These line provide setting for exporting files.  For more details see
address@hidden options}.
address@hidden table
 
address@hidden Updating settings, Clean view, Customization, Miscellaneous
address@hidden Updating settings after changes
address@hidden updating, after setting changes
address@hidden The very busy C-c C-c key, Clean view, Summary of in-buffer 
settings, Miscellaneous
address@hidden The very busy C-c C-c key
 @kindex C-c C-c
 
-Org-mode uses special lines in the buffer to set file-local values for a
-number of user options.  When such settings are changed, you need to
-inform Org-mode that something has be modified and that it should
-recheck the buffer for setting.  This is done with the command @kbd{C-c
-C-c} in the following situations:
+The key @kbd{C-c C-c} has many purposes in org-mode, which are all
+mentioned scattered throughout this manual.  One specific function of
+this key is to add @emph{tags} to a headline (@pxref{Tags}).  In many
+other circumstances it means something like @emph{Hey Org-mode, look
+here and update according to what you see here}.  Here is a summary what
+this means in different contexts.
 
address@hidden @bullet
address@hidden @minus
address@hidden @item
address@hidden If the cursor is in a headline, prompt for tags and insert them
address@hidden into the current line, aligned to `org-tags-column'.  When called
address@hidden with prefix arg, realign all tags in the current buffer.
address@hidden
+If the cursor is in one of the special #+KEYWORD lines, this
+triggers scanning the buffer for these lines and updating the
+information. 
address@hidden
+If the cursor is inside a table, realign the table.  This command
+works even if the automatic table editor has been turned off.
address@hidden
+If the cursor is on a #+TBLFM line, re-apply the formulas to
+the entire table.
 @item
-After changing any of the special buffer lines starting with @samp{#+},
-for example @samp{#+STARTUP}, @samp{#+CATEGORY}.  Org-mode will then
-read these settings and activate them (see @ref{Visibility cycling},
address@hidden columns}, @ref{Clean view}, @ref{Per file keywords},
address@hidden)
address@hidden
-After editing by hand a @samp{#+TBLFM} line containing formulas for a
-table.  When pressing @kbd{C-c C-c} in that line, all formulas are
-re-applied to the entire table (@pxref{Editing/debugging formulas}).
address@hidden
-In a table, @kbd{C-c C-c} does force a re-align, even if the table
-editor is turned off (@pxref{Built-in table editor})
address@hidden
-In an ordered plain list, @kbd{C-c C-c} forces a renumbering of the list
-(@pxref{Plain Lists}).
address@hidden
-After adding a new radio target @samp{<<<New target>>>}, @kbd{C-c C-c}
-must be used with the cursor on that target to activate it throughout
-the buffer.
+If the cursor is inside a table created by the @file{table.el} package,
+activate that table.
address@hidden
+If the current buffer is a remember buffer, close note and file it.
+with a prefix argument, file it without further interaction to the default
+location.
address@hidden
+If the cursor is on a <<<target>>>, update radio targets and corresponding
+links in this buffer.
address@hidden
+If the cursor is on a numbered item in a plain list, renumber the
+ordered list.
 @end itemize
 
address@hidden Clean view, TTY keys, Updating settings, Miscellaneous
address@hidden Clean view, TTY keys, The very busy C-c C-c key, Miscellaneous
 @section A cleaner outline view
 @cindex hiding leading stars
 @cindex clean outline view
@@ -3445,8 +3562,8 @@
 link text.  Please give them back to me, don't tell me it is not
 address@hidden
 @c
-Would I let you down like that?  If you must (even if I don't understand
-why), you can do this
+Would I let you down like that?  If you must, you can do this
+
 @lisp
 (setq org-link-style 'plain
       org-link-format "<%s>")
@@ -3571,12 +3688,14 @@
 &%%(org-diary) ~/path/to/another/org-file.org
 @end example
 
-If you now launch the calendar and press @kbd{d} to display a diary,
-the headlines of entries containing a timestamp, date range, schedule,
-or deadline referring to the selected date will be listed.  Just like
-in Org-mode's agenda view, the diary for @emph{today} contains
-additional entries for overdue deadlines and scheduled items.  See
-also the documentation of the @command{org-diary} function.
+If you now launch the calendar and press @kbd{d} to display a diary, the
+headlines of entries containing a timestamp, date range, schedule, or
+deadline referring to the selected date will be listed.  Just like in
+Org-mode's agenda view, the diary for @emph{today} contains additional
+entries for overdue deadlines and scheduled items.  See also the
+documentation of the @command{org-diary} function.  Under XEmacs, it is
+not possible to jump back from the diary to the org, this works only in
+the agenda buffer.
 
 @end enumerate
 
@@ -3591,9 +3710,9 @@
 @item @file{org-mouse.el} by Piotr Zielinski
 This package implements extended mouse functionality for Org-mode.  It
 allows you to cycle visibility and to edit the document structure with
-the mouse.  It also provides a context-sensitive menu that changes
-depending on the context of a mouse-click.  Use a search engine to find
-this package on the web.
+the mouse.  Best of all, it provides a context-sensitive menu on
address@hidden that changes depending on the context of a mouse-click.
+Use a search engine to find this package on the web.
 @cindex @file{table.el}
 @item @file{table.el} by Takaaki Ota
 Org mode cooperates with table.el, see @ref{table.el}.  @file{table.el}
@@ -3684,12 +3803,6 @@
 If a formula uses @emph{calculated} fields further down the row,
 multiple recalculation may be needed to get all fields consistent.
 @item
-Under XEmacs, if Org-mode entries are included into the diary, it is
-not possible to jump back from the diary to the org file.  Apparently,
-the text properties are lost when the fancy-diary-display is used.
-However, from Org-mode's timeline and agenda buffers (created with
address@hidden C-r} and @kbd{C-c a}), things do work correctly.
address@hidden
 You can only make a single word boldface or italic.  To emphasize
 several words in a row, each must have the emphasize markers, like in
 @samp{*three* *bold* *words*}.