Carsten Dominik 18 лет назад
Родитель
Сommit
d21dfc8541
6 измененных файлов с 599 добавлено и 643 удалено
  1. 228 235
      org
  2. 252 297
      org.el
  3. BIN
      org.pdf
  4. 112 101
      org.texi
  5. BIN
      orgcard.pdf
  6. 7 10
      orgcard.tex

+ 228 - 235
org

@@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
 * Org Mode: (org).	outline-based notes management and organizer
 * Org Mode: (org).	outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 END-INFO-DIR-ENTRY
 
 
-   This manual is for Org-mode (version 4.19b).
+   This manual is for Org-mode (version 4.20).
 
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
    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
 Org Mode Manual
 ***************
 ***************
 
 
-This manual is for Org-mode (version 4.19b).
+This manual is for Org-mode (version 4.20).
 
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
 
@@ -265,12 +265,6 @@ this:
 which will select Org-mode for this buffer no matter what the file's
 which will select Org-mode for this buffer no matter what the file's
 name is.  See also the variable `org-insert-mode-line-in-empty-file'.
 name is.  See also the variable `org-insert-mode-line-in-empty-file'.
 
 
-   If you are upgrading to version 4.20 or later from a version 4.14 or
-earlier, some links may stop working.  These are links containing space
-characters.  To make such links work again, and also to transform all
-links from the old `<link>' format to the new `[[link]]' format,
-execute once in each file: `M-x org-upgrade-old-links'.
-
 
 
 File: org,  Node: Feedback,  Prev: Installation and activation,  Up: Introduction
 File: org,  Node: Feedback,  Prev: Installation and activation,  Up: Introduction
 
 
@@ -681,18 +675,16 @@ unpredictable for you, configure the variables
 Creation and conversion
 Creation and conversion
 .......................
 .......................
 
 
-`M-x org-table-create'
-     Creates an empty Org-mode table.  However, it is much easier to
-     just start typing, like `|Name|Phone|Age <RET> |- <TAB>'
-
-`C-c C-c'
-     Convert region to table.  Works when the cursor is not in an
-     existing table, and when there is a region defined.  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).
+`C-c |'
+     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).
+     If there is no active region, this command creates an empty
+     Org-mode table.  However, it's easier to just start typing, like
+     `|Name|Phone|Age <RET> |- <TAB>'.
 
 
 Re-aligning and field motion
 Re-aligning and field motion
 ............................
 ............................
@@ -834,11 +826,6 @@ Miscellaneous
      This is an alias for `C-u C-c `' to make the current field fully
      This is an alias for `C-u C-c `' to make the current field fully
      visible.
      visible.
 
 
-`C-c |'
-     Toggle the visibility of vertical lines in tables.  The lines are
-     still there, only made invisible with a text property.  Any `|'
-     added by hand will become invisible on the next align.
-
 `M-x org-table-import'
 `M-x org-table-import'
      Import a file as a table.  The table should be TAB- or whitespace
      Import a file as a table.  The table should be TAB- or whitespace
      separated.  Useful, for example, to import an Excel table or data
      separated.  Useful, for example, to import an Excel table or data
@@ -1236,25 +1223,27 @@ File: org,  Node: Link format,  Next: Internal links,  Prev: Hyperlinks,  Up: Hy
 4.1 Link format
 4.1 Link format
 ===============
 ===============
 
 
-Org-mode will recognize plain URL-like links in the buffer and activate
-them as clickable links.  However, the general linkformat looks like
-this:
+Org-mode will recognize plain URL-like links and activate them as
+clickable links.  However, the general linkformat looks like this:
 
 
      [[link][description]]       or alternatively           [[link]]
      [[link][description]]       or alternatively           [[link]]
 
 
-   The description part is optional.  Once a link in the buffer is
-complete, Org-mode will change the display so that `description'( is
-displayed instead of `[[link][description]]' and `link' is displayed
-instead of `[[link]]'.  Links will be highlighted in the face
-`org-link', which by default is an underlined face.  You can directly
-edit the visible part of a link.  To edit the invisible part, use `C-c
-C-l' with the cursor on the link.  If you place the cursor at the
-beginning of end of the displayed text and press <BACKSPACE>, you will
-remove the (invisible) bracket at that location.  This makes the link
-incomplete and the internals are again displayed as plain text.
-Inserting the missing bracket does hide the link internal again.
-Finally, you may also use the menu entry `Org->Hperlinks->Literal
-links' to unhide all links.
+   Once a link in the buffer is complete (all brackets present),
+Org-mode will change the display so that `description' is displayed
+instead of `[[link][description]]' and `link' is displayed instead of
+`[[link]]'.  Links will be highlighted in the face `org-link', which by
+default is an underlined face.  You can directly edit the visible part
+of a link.  Note that this can be either the `link' part (if there is
+not description) or the `description' part.  To edit also the invisible
+`link' part, use `C-c C-l' with the cursor on the link.
+
+   If you place the cursor at the beginning or just behind the end of
+the displayed text and press <BACKSPACE>, you will remove the
+(invisible) bracket at that location.  This makes the link incomplete
+and the internals are again displayed as plain text.  Inserting the
+missing bracket does hide the link internals again.  To show the
+internal structure of all links, use the menu entry
+`Org->Hyperlinks->Literal links'.
 
 
 
 
 File: org,  Node: Internal links,  Next: External links,  Prev: Link format,  Up: Hyperlinks
 File: org,  Node: Internal links,  Next: External links,  Prev: Link format,  Up: Hyperlinks
@@ -1325,13 +1314,9 @@ File: org,  Node: CamelCase links,  Prev: Radio targets,  Up: Internal links
 
 
 Org-mode also supports CamelCase words as links.  This feature is not
 Org-mode also supports CamelCase words as links.  This feature is not
 turned on by default because of the inconsistencies this system suffers
 turned on by default because of the inconsistencies this system suffers
-from.  It is mainly kept for backward compatibility, but the use is
-deprecated.  To activate CamelCase words as links, and to make headline
-completion offer CamelCase version of headlines, the following
-customization is needed:
-
-     (setq org-activate-camels t
-           org-file-link-context-use-camel-case t)
+from.  To activate CamelCase words as links, you need to customize the
+option `org-activate-links'.  A CamelCase word then leads to a text
+search such that `CamelCaseLink' is equivalent to `[[camel case link]]'.
 
 
 
 
 File: org,  Node: External links,  Next: Managing links,  Prev: Internal links,  Up: Hyperlinks
 File: org,  Node: External links,  Next: Managing links,  Prev: Internal links,  Up: Hyperlinks
@@ -1360,7 +1345,7 @@ following list shows examples for each link type.
      gnus:group                               GNUS group link
      gnus:group                               GNUS group link
      gnus:group#id                            GNUS article link
      gnus:group#id                            GNUS article link
      bbdb:Richard Stallman                    BBDB link
      bbdb:Richard Stallman                    BBDB link
-     shell:ls *.org(1)                          A shell command
+     shell:ls *.org                           A shell command
 
 
    A link should be enclosed in double brackets and may contain a
    A link should be enclosed in double brackets and may contain a
 descriptive text to be displayed instead of the url (*note Link
 descriptive text to be displayed instead of the url (*note Link
@@ -1369,13 +1354,9 @@ format::), for example:
      [[http://www.gnu.org/software/emacs/][GNU Emacs]]
      [[http://www.gnu.org/software/emacs/][GNU Emacs]]
 
 
    Org-mode also finds external links in the normal text and activates
    Org-mode also finds external links in the normal text and activates
-them as links.  Plain text links cannot contain spaces.  To remove
-ambiguities about the end of the link, enclose them in angular brackets.
-
-   ---------- Footnotes ----------
-
-   (1) Note that `<' and `>' cannot be part of a link, and therefore of
-a shell command.  If you need redirection, use @{ and @} instead.
+them as links.  If spaces must be part of the link (for example in
+`bbdb:Richard Stallman') or to remove ambiguities about the end of the
+link, enclose them in angular brackets.
 
 
 
 
 File: org,  Node: Managing links,  Next: Search Options,  Prev: External links,  Up: Hyperlinks
 File: org,  Node: Managing links,  Next: Search Options,  Prev: External links,  Up: Hyperlinks
@@ -1390,9 +1371,9 @@ insert it into an org-mode file, and to follow the link.
      Store a link to the current location.  This is a _global_ command
      Store a link to the current location.  This is a _global_ command
      which can be used in any buffer to create a link.  The link will be
      which can be used in any buffer to create a link.  The link will be
      stored for later insertion into an Org-mode buffer (see below).
      stored for later insertion into an Org-mode buffer (see below).
-     For VM, RMAIL, WANDERLUST, GNUS and BBDB buffers, the link will
-     point to the current article/entry.  For W3 and W3M buffers, the
-     link goes to the current URL.  For Org-mode files, the current
+     For VM, RMAIL, WANDERLUST, MH-E, GNUS and BBDB buffers, the link
+     will point to the current article/entry.  For W3 and W3M buffers,
+     the link goes to the current URL.  For Org-mode files, the current
      headline is targeted.  For any other files, the link will point to
      headline is targeted.  For any other files, the link will point to
      the file, with a search string (*note Search Options::) pointing
      the file, with a search string (*note Search Options::) pointing
      to the contents of the current line.  If there is an active
      to the contents of the current line.  If there is an active
@@ -1519,11 +1500,11 @@ location in your Org-mode outline tree.  The following customization(1)
 will tell _Remember_ to use org files as target, and to create
 will tell _Remember_ to use org files as target, and to create
 annotations compatible with Org-mode links.
 annotations compatible with Org-mode links.
 
 
+     (setq org-directory "~/path/to/my/orgfiles/")
+     (setq org-default-notes-file "~/.notes")
      (autoload 'org-remember-annotation "org")
      (autoload 'org-remember-annotation "org")
      (autoload 'org-remember-apply-template "org")
      (autoload 'org-remember-apply-template "org")
      (autoload 'org-remember-handler "org")
      (autoload 'org-remember-handler "org")
-     (setq org-directory "~/path/to/my/orgfiles/")
-     (setq org-default-notes-file "~/.notes")
      (setq remember-annotation-functions '(org-remember-annotation))
      (setq remember-annotation-functions '(org-remember-annotation))
      (setq remember-handler-functions '(org-remember-handler))
      (setq remember-handler-functions '(org-remember-handler))
      (add-hook 'remember-mode-hook 'org-remember-apply-template)
      (add-hook 'remember-mode-hook 'org-remember-apply-template)
@@ -1538,9 +1519,9 @@ journal entries, you could use:
              (?j "* %U %?\n\n  %i\n  %a" "~/org/JOURNAL.org")))
              (?j "* %U %?\n\n  %i\n  %a" "~/org/JOURNAL.org")))
 
 
 In these entries, the character specifies how to select the template,
 In these entries, the character specifies how to select the template,
-the first string specifies the template, and the second string
-specifies a default file (overruling `org-default-notes-file') as a
-target for this note.
+the first string specifies the template, and the (optional) second
+string specifies a default file (overruling `org-default-notes-file')
+as a target for this note.
 
 
    When you call `M-x remember' to remember something, org will prompt
    When you call `M-x remember' to remember something, org will prompt
 for a key to select the template and then prepare the buffer like
 for a key to select the template and then prepare the buffer like
@@ -1556,14 +1537,13 @@ or
 See the variable `org-remember-templates' for more details.
 See the variable `org-remember-templates' for more details.
 
 
    When you are finished composing a note with remember, you have to
    When you are finished composing a note with remember, you have to
-press `C-c C-c' to exit remember-mode and to file the note away.  The
-handler first prompts for a target file - if you press <RET>, the value
-of `org-default-notes-file' is used.  Then the command offers the
-headings tree of the selected file.  You can either immediately press
-<RET> to get the note appended to the file.  Or you can use vertical
-cursor motion (<up> and <down>) and visibility cycling (<TAB>) to find
-a better place.  Pressing <RET> or <left> or <right> leads to the
-following result.
+press `C-c C-c' to file the note away.  The handler first prompts for a
+target file - if you press <RET>, the value of `org-default-notes-file'
+is used.  Then the command offers the headings tree of the selected
+file.  You can either immediately press <RET> to get the note appended
+to the file.  Or you can use vertical cursor motion (<up> and <down>)
+and visibility cycling (<TAB>) to find a better place.  Pressing <RET>
+or <left> or <right> leads to the following result.
 
 
 Cursor         Key     Note gets inserted
 Cursor         Key     Note gets inserted
 position               
 position               
@@ -2532,7 +2512,7 @@ Remote editing
      original org file.
      original org file.
 
 
 `T'
 `T'
-     Show all tags assiciated with the current item.  Because of
+     Show all tags associated with the current item.  Because of
      inheritance, this may be more than the tags listed in the line
      inheritance, this may be more than the tags listed in the line
      itself.
      itself.
 
 
@@ -2591,7 +2571,7 @@ Calendar commands
      date at the cursor.
      date at the cursor.
 
 
 `M'
 `M'
-     Show the phases of the moon for the three month around current
+     Show the phases of the moon for the three months around current
      date.
      date.
 
 
 `S'
 `S'
@@ -3049,33 +3029,53 @@ File: org,  Node: FAQ,  Next: Interaction,  Prev: TTY keys,  Up: Miscellaneous
 
 
   2. Some of my links stopped working after I upgraded to a version
   2. Some of my links stopped working after I upgraded to a version
      4.20 or later.  Why is this, and how can I fix it?
      4.20 or later.  Why is this, and how can I fix it?
-     The newer versions of Org-mode have a better link system and no
-     longer allow unescaped space characters as part of a link.  To fix
-     these links, and also to move all `<link>' style links to the new
-     `[[link]]' system, execute once in each Org-mode file: `M-x
-     org-upgrade-old-links'.
-
-  3. I really like the old style links with angular brackets better.
-     Please give them back to me, don't tell me it is not possible!
+     These must be links in plain text, containing white space, such as
+     `bbdb:Richard Stallman'.  You need to protect these links by
+     putting double brackets around them, like `[[bbdb:Richard
+     Stallman]]'.
+
+  3. I see that Org-mode now creates links using the double bracket
+     convention that hides the link part and the brackets, only showing
+     the description part.  How can I convert my old links to this new
+     format?
+     Execute once in each Org-mode file: `M-x org-upgrade-old-links'.
+     The replaces angular brackets with the link format.
+
+  4. I don't care if you find the new bracket links great, I am
+     attached to the old style using angular brackets and no hiding of
+     the link text.  Please give them back to me, don't tell me it is
+     not possible!
      Would I let you down like that?  If you must (even if I don't
      Would I let you down like that?  If you must (even if I don't
      understand why), you can do this
      understand why), you can do this
-          (setq org-allow-space-in-plain-links t
-                org-link-style 'plain
+          (setq org-link-style 'plain
                 org-link-format "<%s>")
                 org-link-format "<%s>")
 
 
-  4. All these stars are driving me mad, I just find the Emacs outlines
+  5. When I am executing shell links I always get a confirmation prompt
+     and need to type `yes <RET>', thats 4 key presses!  Can I get rid
+     of this?
+     The confirmation is there to protect you from unwantingly execute
+     potentially dangerous commands.  For example, imagine a link
+     `[[shell:rm -rf ~/*][Google Search]]'.  In an Org-mode buffer, this
+     command would look like `Google Search', but really it would remove
+     your home directory.  If you wish, you can make it easier to
+     respond to the query by setting `org-confirm-shell-links' to
+     `y-or-n-p'.  Then a single `y' keypress will be enough to confirm
+     shell links.  It is also possible to turn off this check entirely,
+     but I do not recommend to do this.  Be warned.
+
+  6. All these stars are driving me mad, I just find the Emacs outlines
      unreadable. Can't you just put white space and a single star as a
      unreadable. Can't you just put white space and a single star as a
      starter for headlines?
      starter for headlines?
      See *Note Clean view::.
      See *Note Clean view::.
 
 
-  5. I would like to have two windows on the same Org-mode file, but
+  7. I would like to have two windows on the same Org-mode file, but
      with different outline visibility.  Is that possible?
      with different outline visibility.  Is that possible?
-     In GNU Emacs, you may use _indirect buffers_ which do exactly
-     this.  See the documentation on the command
-     `make-indirect-buffer'.  In XEmacs, this is currently not possible
-     because of the different outline implementation.
+     In GNU Emacs, you may use _indirect buffers_ which do exactly this.
+     See the documentation on the command `make-indirect-buffer'.  In
+     XEmacs, this is currently not possible because of the different
+     outline implementation.
 
 
-  6. When I export my TODO list, every TODO item becomes a separate
+  8. When I export my TODO list, every TODO item becomes a separate
      section.  How do I enforce these items to be exported as an
      section.  How do I enforce these items to be exported as an
      itemized list?
      itemized list?
      If you plan to use ASCII or HTML export, make sure things you want
      If you plan to use ASCII or HTML export, make sure things you want
@@ -3093,42 +3093,35 @@ File: org,  Node: FAQ,  Next: Interaction,  Prev: TTY keys,  Up: Miscellaneous
 
 
           +OPTIONS:   H:2; ...
           +OPTIONS:   H:2; ...
 
 
-  7. I would like to export only a subtree of my file to HTML.  How?
+  9. I would like to export only a subtree of my file to HTML.  How?
      If you want to export a subtree, mark the subtree as region and
      If you want to export a subtree, mark the subtree as region and
      then export.  Marking can be done with `C-c @ C-x C-x', for
      then export.  Marking can be done with `C-c @ C-x C-x', for
      example.
      example.
 
 
-  8. Org-mode takes over the S-cursor keys.  I also want to use
+ 10. Org-mode takes over the S-cursor keys.  I also want to use
      CUA-mode, is there a way to fix this conflict?
      CUA-mode, is there a way to fix this conflict?
      Yes, see *Note Interaction::.
      Yes, see *Note Interaction::.
 
 
-  9. Is there an easy way to insert an empty table template with a
-     default number of rows and columns?
-     To insert an empty table template, just type `|-' and use <TAB>.
-     The default size can be changed with the variable
-     `org-table-default-size'.  However, just starting to type the
-     first line is usually much easier.
-
- 10. One of my table columns has started to fill up with `#ERROR'.
+ 11. One of my table columns has started to fill up with `#ERROR'.
      What is going on?
      What is going on?
      Org-mode tried to compute the column from other fields using a
      Org-mode tried to compute the column from other fields using a
      formula stored in the `#+TBLFMT:' line just below the table, and
      formula stored in the `#+TBLFMT:' line just below the table, and
      the evaluation of the formula fails.  Fix the fields used in the
      the evaluation of the formula fails.  Fix the fields used in the
      formula, or fix the formula, or remove it!
      formula, or fix the formula, or remove it!
 
 
- 11. When I am in the last column of a table and just above a
+ 12. When I am in the last column of a table and just above a
      horizontal line in the table, pressing TAB creates a new table line
      horizontal line in the table, pressing TAB creates a new table line
      before the horizontal line.  How can I quickly move to the line
      before the horizontal line.  How can I quickly move to the line
      below the horizontal line instead?
      below the horizontal line instead?
      Press <down> (to get on the separator line) and then <TAB>.  Or
      Press <down> (to get on the separator line) and then <TAB>.  Or
      configure the variable `org-table-tab-jumps-over-hlines'.
      configure the variable `org-table-tab-jumps-over-hlines'.
 
 
- 12. How can I change the indentation of an entire table without fixing
+ 13. How can I change the indentation of an entire table without fixing
      every line by hand?
      every line by hand?
      The indentation of a table is set by the first line.  So just fix
      The indentation of a table is set by the first line.  So just fix
      the indentation of the first line and realign with <TAB>.
      the indentation of the first line and realign with <TAB>.
 
 
- 13. Is it possible to include entries from org-mode files into my
+ 14. Is it possible to include entries from org-mode files into my
      emacs diary?
      emacs diary?
      Since the org-mode agenda is much more powerful and can contain the
      Since the org-mode agenda is much more powerful and can contain the
      diary (*note Calendar/Diary integration::), you should think twice
      diary (*note Calendar/Diary integration::), you should think twice
@@ -3374,7 +3367,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * active region <1>:                     HTML export.         (line  10)
 * active region <1>:                     HTML export.         (line  10)
 * active region <2>:                     ASCII export.        (line   6)
 * active region <2>:                     ASCII export.        (line   6)
 * active region <3>:                     Built-in table editor.
 * active region <3>:                     Built-in table editor.
-                                                              (line 167)
+                                                              (line 165)
 * active region:                         Structure editing.   (line  46)
 * active region:                         Structure editing.   (line  46)
 * agenda:                                Weekly/Daily Agenda. (line   6)
 * agenda:                                Weekly/Daily Agenda. (line   6)
 * agenda commands, custom:               Agenda dispatcher.   (line   6)
 * agenda commands, custom:               Agenda dispatcher.   (line   6)
@@ -3398,7 +3391,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * calc.el:                               Interaction.         (line  17)
 * calc.el:                               Interaction.         (line  17)
 * calculations, in tables <1>:           Table calculations.  (line   6)
 * calculations, in tables <1>:           Table calculations.  (line   6)
 * calculations, in tables:               Built-in table editor.
 * calculations, in tables:               Built-in table editor.
-                                                              (line 137)
+                                                              (line 135)
 * calendar integration:                  Calendar/Diary integration.
 * calendar integration:                  Calendar/Diary integration.
                                                               (line   6)
                                                               (line   6)
 * calendar, for selecting date:          Creating timestamps. (line  68)
 * calendar, for selecting date:          Creating timestamps. (line  68)
@@ -3436,6 +3429,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * cutting, of subtrees:                  Structure editing.   (line   6)
 * cutting, of subtrees:                  Structure editing.   (line   6)
 * cycling, of TODO states:               TODO basics.         (line  13)
 * cycling, of TODO states:               TODO basics.         (line  13)
 * cycling, visibility:                   Visibility cycling.  (line   6)
 * cycling, visibility:                   Visibility cycling.  (line   6)
+* dangerous commands:                    FAQ.                 (line  37)
 * date stamps:                           Time stamps.         (line   6)
 * date stamps:                           Time stamps.         (line   6)
 * date, reading in minibuffer:           Creating timestamps. (line  68)
 * date, reading in minibuffer:           Creating timestamps. (line  68)
 * DEADLINE keyword:                      Time stamps.         (line  27)
 * DEADLINE keyword:                      Time stamps.         (line  27)
@@ -3454,7 +3448,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * emphasized text:                       Export options.      (line  22)
 * emphasized text:                       Export options.      (line  22)
 * evaluate time range:                   Creating timestamps. (line  63)
 * evaluate time range:                   Creating timestamps. (line  63)
 * exporting:                             Exporting.           (line   6)
 * exporting:                             Exporting.           (line   6)
-* exporting a subtree:                   FAQ.                 (line  58)
+* exporting a subtree:                   FAQ.                 (line  78)
 * exporting, not:                        Comment lines.       (line   6)
 * exporting, not:                        Comment lines.       (line   6)
 * extended TODO keywords:                TODO extensions.     (line   6)
 * extended TODO keywords:                TODO extensions.     (line   6)
 * external links:                        External links.      (line   6)
 * external links:                        External links.      (line   6)
@@ -3479,7 +3473,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
                                                               (line   6)
                                                               (line   6)
 * formula, for table column:             Column formulas.     (line   6)
 * formula, for table column:             Column formulas.     (line   6)
 * formula, in tables:                    Built-in table editor.
 * formula, in tables:                    Built-in table editor.
-                                                              (line 137)
+                                                              (line 135)
 * global keybindings:                    Installation and activation.
 * global keybindings:                    Installation and activation.
                                                               (line   6)
                                                               (line   6)
 * global TODO list:                      Global TODO list.    (line   6)
 * global TODO list:                      Global TODO list.    (line   6)
@@ -3499,8 +3493,8 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * HTML tags:                             HTML formatting.     (line  33)
 * HTML tags:                             HTML formatting.     (line  33)
 * hyperlinks:                            Hyperlinks.          (line   6)
 * hyperlinks:                            Hyperlinks.          (line   6)
 * iCalendar export:                      iCalendar export.    (line   6)
 * iCalendar export:                      iCalendar export.    (line   6)
-* indentation, of tables:                FAQ.                 (line  89)
-* indirect buffers:                      FAQ.                 (line  34)
+* indentation, of tables:                FAQ.                 (line 102)
+* indirect buffers:                      FAQ.                 (line  54)
 * inheritance, of tags:                  Tag inheritance.     (line   6)
 * inheritance, of tags:                  Tag inheritance.     (line   6)
 * inserting links:                       Managing links.      (line  23)
 * inserting links:                       Managing links.      (line  23)
 * installation:                          Installation and activation.
 * installation:                          Installation and activation.
@@ -3523,7 +3517,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * lists, plain:                          Plain Lists.         (line   6)
 * lists, plain:                          Plain Lists.         (line   6)
 * logging, of progress:                  Progress logging.    (line   6)
 * logging, of progress:                  Progress logging.    (line   6)
 * maintainer:                            Feedback.            (line   6)
 * maintainer:                            Feedback.            (line   6)
-* make-indirect-buffer:                  FAQ.                 (line  34)
+* make-indirect-buffer:                  FAQ.                 (line  54)
 * mark ring:                             Managing links.      (line  72)
 * mark ring:                             Managing links.      (line  72)
 * marking characters, tables:            Advanced features.   (line  34)
 * marking characters, tables:            Advanced features.   (line  34)
 * matching, of tags:                     Matching headline tags.
 * matching, of tags:                     Matching headline tags.
@@ -3569,7 +3563,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * region, active <1>:                    HTML export.         (line  10)
 * region, active <1>:                    HTML export.         (line  10)
 * region, active <2>:                    ASCII export.        (line   6)
 * region, active <2>:                    ASCII export.        (line   6)
 * region, active <3>:                    Built-in table editor.
 * region, active <3>:                    Built-in table editor.
-                                                              (line 167)
+                                                              (line 165)
 * region, active:                        Structure editing.   (line  46)
 * region, active:                        Structure editing.   (line  46)
 * remember.el <1>:                       Interaction.         (line  39)
 * remember.el <1>:                       Interaction.         (line  39)
 * remember.el:                           Remember.            (line   6)
 * remember.el:                           Remember.            (line   6)
@@ -3580,6 +3574,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * section-numbers:                       Export options.      (line  22)
 * section-numbers:                       Export options.      (line  22)
 * setting tags:                          Setting tags.        (line   6)
 * setting tags:                          Setting tags.        (line   6)
 * SHELL links:                           External links.      (line   6)
 * SHELL links:                           External links.      (line   6)
+* shell links, confirmation:             FAQ.                 (line  37)
 * show all, command:                     Visibility cycling.  (line  27)
 * show all, command:                     Visibility cycling.  (line  27)
 * show all, global visibility state:     Visibility cycling.  (line  19)
 * show all, global visibility state:     Visibility cycling.  (line  19)
 * show hidden text:                      Visibility cycling.  (line   6)
 * show hidden text:                      Visibility cycling.  (line   6)
@@ -3604,7 +3599,6 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
                                                               (line   6)
                                                               (line   6)
 * table editor, table.el:                table.el.            (line   6)
 * table editor, table.el:                table.el.            (line   6)
 * table of contents:                     Export options.      (line  22)
 * table of contents:                     Export options.      (line  22)
-* table, empty template:                 FAQ.                 (line  68)
 * table.el <1>:                          Interaction.         (line  13)
 * table.el <1>:                          Interaction.         (line  13)
 * table.el:                              table.el.            (line   6)
 * table.el:                              table.el.            (line   6)
 * tables <1>:                            Export options.      (line  22)
 * tables <1>:                            Export options.      (line  22)
@@ -3636,7 +3630,7 @@ File: org,  Node: Index,  Next: Key Index,  Prev: Miscellaneous,  Up: Top
 * transient-mark-mode <1>:               HTML export.         (line  10)
 * transient-mark-mode <1>:               HTML export.         (line  10)
 * transient-mark-mode <2>:               ASCII export.        (line   6)
 * transient-mark-mode <2>:               ASCII export.        (line   6)
 * transient-mark-mode <3>:               Built-in table editor.
 * transient-mark-mode <3>:               Built-in table editor.
-                                                              (line 167)
+                                                              (line 165)
 * transient-mark-mode:                   Structure editing.   (line  46)
 * transient-mark-mode:                   Structure editing.   (line  46)
 * trees, sparse:                         Sparse trees.        (line   6)
 * trees, sparse:                         Sparse trees.        (line   6)
 * trees, visibility:                     Visibility cycling.  (line   6)
 * trees, visibility:                     Visibility cycling.  (line   6)
@@ -3672,12 +3666,12 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * <RET> <1>:                             Agenda commands.     (line  41)
 * <RET> <1>:                             Agenda commands.     (line  41)
 * <RET> <2>:                             Creating timestamps. (line 100)
 * <RET> <2>:                             Creating timestamps. (line 100)
 * <RET>:                                 Built-in table editor.
 * <RET>:                                 Built-in table editor.
-                                                              (line  66)
+                                                              (line  64)
 * <right>:                               Agenda commands.     (line  81)
 * <right>:                               Agenda commands.     (line  81)
 * <SPC>:                                 Agenda commands.     (line  28)
 * <SPC>:                                 Agenda commands.     (line  28)
 * <TAB> <1>:                             Agenda commands.     (line  35)
 * <TAB> <1>:                             Agenda commands.     (line  35)
 * <TAB> <2>:                             Built-in table editor.
 * <TAB> <2>:                             Built-in table editor.
-                                                              (line  59)
+                                                              (line  57)
 * <TAB> <3>:                             Plain Lists.         (line  37)
 * <TAB> <3>:                             Plain Lists.         (line  37)
 * <TAB>:                                 Visibility cycling.  (line  10)
 * <TAB>:                                 Visibility cycling.  (line  10)
 * > <1>:                                 Agenda commands.     (line 140)
 * > <1>:                                 Agenda commands.     (line 140)
@@ -3685,7 +3679,7 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C:                                     Agenda commands.     (line 170)
 * C:                                     Agenda commands.     (line 170)
 * c:                                     Agenda commands.     (line 154)
 * c:                                     Agenda commands.     (line 154)
 * C-#:                                   Built-in table editor.
 * C-#:                                   Built-in table editor.
-                                                              (line 157)
+                                                              (line 155)
 * C-,:                                   Agenda files.        (line  18)
 * C-,:                                   Agenda files.        (line  18)
 * C-c !:                                 Creating timestamps. (line  21)
 * C-c !:                                 Creating timestamps. (line  21)
 * C-c $:                                 Archiving.           (line   9)
 * C-c $:                                 Archiving.           (line   9)
@@ -3694,35 +3688,35 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c ' <1>:                             Editing/debugging formulas.
 * C-c ' <1>:                             Editing/debugging formulas.
                                                               (line  20)
                                                               (line  20)
 * C-c ':                                 Built-in table editor.
 * C-c ':                                 Built-in table editor.
-                                                              (line 146)
+                                                              (line 144)
 * C-c *:                                 Built-in table editor.
 * C-c *:                                 Built-in table editor.
-                                                              (line 150)
+                                                              (line 148)
 * C-c +:                                 Built-in table editor.
 * C-c +:                                 Built-in table editor.
-                                                              (line 167)
+                                                              (line 165)
 * C-c ,:                                 Priorities.          (line  18)
 * C-c ,:                                 Priorities.          (line  18)
 * C-c -:                                 Built-in table editor.
 * C-c -:                                 Built-in table editor.
-                                                              (line  94)
+                                                              (line  92)
 * C-c .:                                 Creating timestamps. (line  10)
 * C-c .:                                 Creating timestamps. (line  10)
 * C-c /:                                 Sparse trees.        (line  15)
 * C-c /:                                 Sparse trees.        (line  15)
 * C-c ::                                 HTML export.         (line  17)
 * C-c ::                                 HTML export.         (line  17)
 * C-c ;:                                 Comment lines.       (line  12)
 * C-c ;:                                 Comment lines.       (line  12)
 * C-c <:                                 Creating timestamps. (line  25)
 * C-c <:                                 Creating timestamps. (line  25)
 * C-c <TAB>:                             Built-in table editor.
 * C-c <TAB>:                             Built-in table editor.
-                                                              (line 189)
+                                                              (line 187)
 * C-c =:                                 Built-in table editor.
 * C-c =:                                 Built-in table editor.
-                                                              (line 137)
+                                                              (line 135)
 * C-c >:                                 Creating timestamps. (line  29)
 * C-c >:                                 Creating timestamps. (line  29)
 * C-c ? <1>:                             Editing/debugging formulas.
 * C-c ? <1>:                             Editing/debugging formulas.
                                                               (line  20)
                                                               (line  20)
 * C-c ?:                                 Built-in table editor.
 * C-c ?:                                 Built-in table editor.
-                                                              (line 163)
+                                                              (line 161)
 * C-c [:                                 Agenda files.        (line  12)
 * C-c [:                                 Agenda files.        (line  12)
 * C-c \:                                 Tag searches.        (line   9)
 * C-c \:                                 Tag searches.        (line   9)
 * C-c ]:                                 Agenda files.        (line  15)
 * C-c ]:                                 Agenda files.        (line  15)
 * C-c ^:                                 Built-in table editor.
 * C-c ^:                                 Built-in table editor.
-                                                              (line  98)
+                                                              (line  96)
 * C-c `:                                 Built-in table editor.
 * C-c `:                                 Built-in table editor.
-                                                              (line 183)
+                                                              (line 181)
 * C-c a a:                               Weekly/Daily Agenda. (line   9)
 * C-c a a:                               Weekly/Daily Agenda. (line   9)
 * C-c a C:                               Agenda dispatcher.   (line  30)
 * C-c a C:                               Agenda dispatcher.   (line  30)
 * C-c a M:                               Matching headline tags.
 * C-c a M:                               Matching headline tags.
@@ -3741,7 +3735,7 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c C-c <3>:                           Editing/debugging formulas.
 * C-c C-c <3>:                           Editing/debugging formulas.
                                                               (line  16)
                                                               (line  16)
 * C-c C-c <4>:                           Built-in table editor.
 * C-c C-c <4>:                           Built-in table editor.
-                                                              (line  44)
+                                                              (line  54)
 * C-c C-c:                               Plain Lists.         (line  61)
 * C-c C-c:                               Plain Lists.         (line  61)
 * C-c C-d:                               Creating timestamps. (line  37)
 * C-c C-d:                               Creating timestamps. (line  37)
 * C-c C-f:                               Motion.              (line  12)
 * C-c C-f:                               Motion.              (line  12)
@@ -3754,7 +3748,7 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c C-q <1>:                           Editing/debugging formulas.
 * C-c C-q <1>:                           Editing/debugging formulas.
                                                               (line  20)
                                                               (line  20)
 * C-c C-q:                               Built-in table editor.
 * C-c C-q:                               Built-in table editor.
-                                                              (line 121)
+                                                              (line 119)
 * C-c C-r:                               Timeline.            (line  13)
 * C-c C-r:                               Timeline.            (line  13)
 * C-c C-s:                               Creating timestamps. (line  47)
 * C-c C-s:                               Creating timestamps. (line  47)
 * C-c C-t:                               TODO basics.         (line  13)
 * C-c C-t:                               TODO basics.         (line  13)
@@ -3768,26 +3762,26 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * C-c C-x C-i:                           iCalendar export.    (line  15)
 * C-c C-x C-i:                           iCalendar export.    (line  15)
 * C-c C-x C-k:                           Structure editing.   (line  31)
 * C-c C-x C-k:                           Structure editing.   (line  31)
 * C-c C-x C-w <1>:                       Built-in table editor.
 * C-c C-x C-w <1>:                       Built-in table editor.
-                                                              (line 110)
+                                                              (line 108)
 * C-c C-x C-w:                           Structure editing.   (line  31)
 * C-c C-x C-w:                           Structure editing.   (line  31)
 * C-c C-x C-y <1>:                       Built-in table editor.
 * C-c C-x C-y <1>:                       Built-in table editor.
-                                                              (line 114)
+                                                              (line 112)
 * C-c C-x C-y:                           Structure editing.   (line  38)
 * C-c C-x C-y:                           Structure editing.   (line  38)
 * C-c C-x h:                             HTML export.         (line  10)
 * C-c C-x h:                             HTML export.         (line  10)
 * C-c C-x i:                             iCalendar export.    (line  13)
 * C-c C-x i:                             iCalendar export.    (line  13)
 * C-c C-x M-w <1>:                       Built-in table editor.
 * C-c C-x M-w <1>:                       Built-in table editor.
-                                                              (line 107)
+                                                              (line 105)
 * C-c C-x M-w:                           Structure editing.   (line  35)
 * C-c C-x M-w:                           Structure editing.   (line  35)
 * C-c C-x t:                             HTML export.         (line  14)
 * C-c C-x t:                             HTML export.         (line  14)
 * C-c C-x v:                             Sparse trees.        (line  39)
 * C-c C-x v:                             Sparse trees.        (line  39)
 * C-c C-y:                               Creating timestamps. (line  63)
 * C-c C-y:                               Creating timestamps. (line  63)
 * C-c l:                                 Managing links.      (line   9)
 * C-c l:                                 Managing links.      (line   9)
 * C-c |:                                 Built-in table editor.
 * C-c |:                                 Built-in table editor.
-                                                              (line 193)
+                                                              (line  40)
 * C-c ~:                                 table.el.            (line  18)
 * C-c ~:                                 table.el.            (line  18)
 * C-u C-c .:                             Creating timestamps. (line  16)
 * C-u C-c .:                             Creating timestamps. (line  16)
 * C-u C-c =:                             Built-in table editor.
 * C-u C-c =:                             Built-in table editor.
-                                                              (line 141)
+                                                              (line 139)
 * C-u C-c C-l:                           Managing links.      (line  36)
 * C-u C-c C-l:                           Managing links.      (line  36)
 * D:                                     Agenda commands.     (line  66)
 * D:                                     Agenda commands.     (line  66)
 * d:                                     Agenda commands.     (line  63)
 * d:                                     Agenda commands.     (line  63)
@@ -3799,37 +3793,37 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * L:                                     Agenda commands.     (line  32)
 * L:                                     Agenda commands.     (line  32)
 * M:                                     Agenda commands.     (line 161)
 * M:                                     Agenda commands.     (line 161)
 * M-<down>:                              Built-in table editor.
 * M-<down>:                              Built-in table editor.
-                                                              (line  84)
+                                                              (line  82)
 * M-<left> <1>:                          Built-in table editor.
 * M-<left> <1>:                          Built-in table editor.
-                                                              (line  74)
+                                                              (line  72)
 * M-<left>:                              Structure editing.   (line  13)
 * M-<left>:                              Structure editing.   (line  13)
 * M-<RET> <1>:                           Plain Lists.         (line  42)
 * M-<RET> <1>:                           Plain Lists.         (line  42)
 * M-<RET>:                               Structure editing.   (line   6)
 * M-<RET>:                               Structure editing.   (line   6)
 * M-<right> <1>:                         Built-in table editor.
 * M-<right> <1>:                         Built-in table editor.
-                                                              (line  74)
+                                                              (line  72)
 * M-<right>:                             Structure editing.   (line  16)
 * M-<right>:                             Structure editing.   (line  16)
 * M-<TAB> <1>:                           Completion.          (line  10)
 * M-<TAB> <1>:                           Completion.          (line  10)
 * M-<TAB> <2>:                           Setting tags.        (line   6)
 * M-<TAB> <2>:                           Setting tags.        (line   6)
 * M-<TAB>:                               Per file keywords.   (line  17)
 * M-<TAB>:                               Per file keywords.   (line  17)
 * M-<up>:                                Built-in table editor.
 * M-<up>:                                Built-in table editor.
-                                                              (line  84)
+                                                              (line  82)
 * M-S-<down> <1>:                        Built-in table editor.
 * M-S-<down> <1>:                        Built-in table editor.
-                                                              (line  91)
+                                                              (line  89)
 * M-S-<down> <2>:                        Plain Lists.         (line  46)
 * M-S-<down> <2>:                        Plain Lists.         (line  46)
 * M-S-<down>:                            Structure editing.   (line  28)
 * M-S-<down>:                            Structure editing.   (line  28)
 * M-S-<left> <1>:                        Creating timestamps. (line  97)
 * M-S-<left> <1>:                        Creating timestamps. (line  97)
 * M-S-<left> <2>:                        Built-in table editor.
 * M-S-<left> <2>:                        Built-in table editor.
-                                                              (line  78)
+                                                              (line  76)
 * M-S-<left> <3>:                        Plain Lists.         (line  52)
 * M-S-<left> <3>:                        Plain Lists.         (line  52)
 * M-S-<left>:                            Structure editing.   (line  19)
 * M-S-<left>:                            Structure editing.   (line  19)
 * M-S-<RET>:                             Structure editing.   (line  10)
 * M-S-<RET>:                             Structure editing.   (line  10)
 * M-S-<right> <1>:                       Creating timestamps. (line  94)
 * M-S-<right> <1>:                       Creating timestamps. (line  94)
 * M-S-<right> <2>:                       Built-in table editor.
 * M-S-<right> <2>:                       Built-in table editor.
-                                                              (line  81)
+                                                              (line  79)
 * M-S-<right> <3>:                       Plain Lists.         (line  52)
 * M-S-<right> <3>:                       Plain Lists.         (line  52)
 * M-S-<right>:                           Structure editing.   (line  22)
 * M-S-<right>:                           Structure editing.   (line  22)
 * M-S-<up> <1>:                          Built-in table editor.
 * M-S-<up> <1>:                          Built-in table editor.
-                                                              (line  88)
+                                                              (line  86)
 * M-S-<up> <2>:                          Plain Lists.         (line  46)
 * M-S-<up> <2>:                          Plain Lists.         (line  46)
 * M-S-<up>:                              Structure editing.   (line  25)
 * M-S-<up>:                              Structure editing.   (line  25)
 * mouse-1 <1>:                           Agenda commands.     (line  35)
 * mouse-1 <1>:                           Agenda commands.     (line  35)
@@ -3853,11 +3847,11 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 * S-<left> <1>:                          Agenda commands.     (line 136)
 * S-<left> <1>:                          Agenda commands.     (line 136)
 * S-<left>:                              Creating timestamps. (line  50)
 * S-<left>:                              Creating timestamps. (line  50)
 * S-<RET>:                               Built-in table editor.
 * S-<RET>:                               Built-in table editor.
-                                                              (line 172)
+                                                              (line 170)
 * S-<right> <1>:                         Agenda commands.     (line 128)
 * S-<right> <1>:                         Agenda commands.     (line 128)
 * S-<right>:                             Creating timestamps. (line  50)
 * S-<right>:                             Creating timestamps. (line  50)
 * S-<TAB> <1>:                           Built-in table editor.
 * S-<TAB> <1>:                           Built-in table editor.
-                                                              (line  63)
+                                                              (line  61)
 * S-<TAB>:                               Visibility cycling.  (line  19)
 * S-<TAB>:                               Visibility cycling.  (line  19)
 * S-<up> <1>:                            Agenda commands.     (line 118)
 * S-<up> <1>:                            Agenda commands.     (line 118)
 * S-<up> <2>:                            Creating timestamps. (line  55)
 * S-<up> <2>:                            Creating timestamps. (line  55)
@@ -3870,97 +3864,96 @@ File: org,  Node: Key Index,  Prev: Index,  Up: Top
 
 
 
 
 Tag Table:
 Tag Table:
-Node: Top960
-Node: Introduction7181
-Node: Summary7495
-Node: Installation and activation9607
-Node: Feedback11612
-Node: Document Structure12398
-Node: Outlines13164
-Node: Headlines13824
-Node: Visibility cycling14447
-Node: Motion15638
-Node: Structure editing16422
-Node: Archiving18165
-Node: Sparse trees19025
-Ref: Sparse trees-Footnote-121054
-Ref: Sparse trees-Footnote-221146
-Node: Plain Lists21260
-Ref: Plain Lists-Footnote-124016
-Node: Tables24373
-Node: Built-in table editor24921
-Node: Narrow columns32811
-Ref: Narrow columns-Footnote-134744
-Node: Table calculations34790
-Node: Formula syntax35966
-Ref: Formula syntax-Footnote-138900
-Node: Column formulas39199
-Node: Advanced features40961
-Node: Named-field formulas44216
-Node: Editing/debugging formulas44856
-Node: Appetizer46614
-Node: orgtbl-mode47716
-Node: table.el48207
-Node: Hyperlinks49184
-Node: Link format49818
-Node: Internal links51000
-Node: Radio targets52890
-Node: CamelCase links53605
-Node: External links54204
-Ref: External links-Footnote-156129
-Node: Managing links56268
-Node: Search Options60246
-Ref: Search Options-Footnote-161566
-Node: Remember61647
-Ref: Remember-Footnote-165528
-Node: TODO items65652
-Node: TODO basics66575
-Node: Progress logging68090
-Node: TODO extensions68876
-Node: Workflow states69676
-Node: TODO types70544
-Ref: TODO types-Footnote-172202
-Node: Per file keywords72284
-Ref: Per file keywords-Footnote-173737
-Node: Priorities73965
-Node: Timestamps75174
-Node: Time stamps75495
-Node: Creating timestamps77510
-Node: Tags80639
-Node: Tag inheritance81374
-Node: Setting tags82311
-Node: Tag searches83273
-Node: Agenda Views84482
-Node: Agenda files86021
-Ref: Agenda files-Footnote-186981
-Ref: Agenda files-Footnote-287130
-Node: Agenda dispatcher87322
-Node: Weekly/Daily Agenda89452
-Node: Categories90587
-Node: Time-of-day specifications91235
-Node: Calendar/Diary integration93211
-Node: Sorting of agenda items94588
-Node: Global TODO list95420
-Node: Matching headline tags96835
-Node: Timeline97778
-Node: Agenda commands98651
-Node: Exporting103906
-Node: ASCII export104478
-Node: HTML export105313
-Node: HTML formatting106429
-Node: Export options108061
-Node: Comment lines110252
-Node: iCalendar export110722
-Node: Miscellaneous112517
-Node: Completion113144
-Node: Customization114140
-Node: Clean view114588
-Node: TTY keys117228
-Node: FAQ118829
-Node: Interaction124335
-Node: Bugs127176
-Node: Acknowledgments129485
-Node: Index132415
-Node: Key Index152984
+Node: Top959
+Node: Introduction7179
+Node: Summary7493
+Node: Installation and activation9605
+Node: Feedback11274
+Node: Document Structure12060
+Node: Outlines12826
+Node: Headlines13486
+Node: Visibility cycling14109
+Node: Motion15300
+Node: Structure editing16084
+Node: Archiving17827
+Node: Sparse trees18687
+Ref: Sparse trees-Footnote-120716
+Ref: Sparse trees-Footnote-220808
+Node: Plain Lists20922
+Ref: Plain Lists-Footnote-123678
+Node: Tables24035
+Node: Built-in table editor24583
+Node: Narrow columns32197
+Ref: Narrow columns-Footnote-134130
+Node: Table calculations34176
+Node: Formula syntax35352
+Ref: Formula syntax-Footnote-138286
+Node: Column formulas38585
+Node: Advanced features40347
+Node: Named-field formulas43602
+Node: Editing/debugging formulas44242
+Node: Appetizer46000
+Node: orgtbl-mode47102
+Node: table.el47593
+Node: Hyperlinks48570
+Node: Link format49204
+Node: Internal links50500
+Node: Radio targets52390
+Node: CamelCase links53105
+Node: External links53603
+Node: Managing links55528
+Node: Search Options59512
+Ref: Search Options-Footnote-160832
+Node: Remember60913
+Ref: Remember-Footnote-164779
+Node: TODO items64903
+Node: TODO basics65826
+Node: Progress logging67341
+Node: TODO extensions68127
+Node: Workflow states68927
+Node: TODO types69795
+Ref: TODO types-Footnote-171453
+Node: Per file keywords71535
+Ref: Per file keywords-Footnote-172988
+Node: Priorities73216
+Node: Timestamps74425
+Node: Time stamps74746
+Node: Creating timestamps76761
+Node: Tags79890
+Node: Tag inheritance80625
+Node: Setting tags81562
+Node: Tag searches82524
+Node: Agenda Views83733
+Node: Agenda files85272
+Ref: Agenda files-Footnote-186232
+Ref: Agenda files-Footnote-286381
+Node: Agenda dispatcher86573
+Node: Weekly/Daily Agenda88703
+Node: Categories89838
+Node: Time-of-day specifications90486
+Node: Calendar/Diary integration92462
+Node: Sorting of agenda items93839
+Node: Global TODO list94671
+Node: Matching headline tags96086
+Node: Timeline97029
+Node: Agenda commands97902
+Node: Exporting103158
+Node: ASCII export103730
+Node: HTML export104565
+Node: HTML formatting105681
+Node: Export options107313
+Node: Comment lines109504
+Node: iCalendar export109974
+Node: Miscellaneous111769
+Node: Completion112396
+Node: Customization113392
+Node: Clean view113840
+Node: TTY keys116480
+Node: FAQ118081
+Node: Interaction124316
+Node: Bugs127157
+Node: Acknowledgments129466
+Node: Index132396
+Node: Key Index153038
 
 
 End Tag Table
 End Tag Table

Разница между файлами не показана из-за своего большого размера
+ 252 - 297
org.el



+ 112 - 101
org.texi

@@ -4,8 +4,8 @@
 @c @setfilename ../info/org
 @c @setfilename ../info/org
 @settitle Org Mode Manual
 @settitle Org Mode Manual
 
 
-@set VERSION 4.19b
-@set DATE March 2006
+@set VERSION 4.20
+@set DATE April 2006
 
 
 @dircategory Emacs
 @dircategory Emacs
 @direntry
 @direntry
@@ -311,12 +311,6 @@ MY PROJECTS    -*- mode: org; -*-
 the file's name is.  See also the variable
 the file's name is.  See also the variable
 @code{org-insert-mode-line-in-empty-file}.
 @code{org-insert-mode-line-in-empty-file}.
 
 
-If you are upgrading to version 4.20 or later from a version 4.14 or
-earlier, some links may stop working.  These are links containing space
-characters.  To make such links work again, and also to transform all
-links from the old @samp{<link>} format to the new @samp{[[link]]}
-format, execute once in each file: @kbd{M-x org-upgrade-old-links}.
-
 @node Feedback,  , Installation and activation, Introduction
 @node Feedback,  , Installation and activation, Introduction
 @section Feedback
 @section Feedback
 @cindex feedback
 @cindex feedback
@@ -786,18 +780,16 @@ unpredictable for you, configure the variables
 
 
 @table @kbd
 @table @kbd
 @tsubheading{Creation and conversion}
 @tsubheading{Creation and conversion}
-@item M-x org-table-create
-Creates an empty Org-mode table.  However, it is much easier to just
-start typing, like @kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}
-
-@kindex C-c C-c
-@item C-c C-c
-Convert region to table.  Works when the cursor is not in an existing
-table, and when there is a region defined.  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).
+@kindex C-c |
+@item C-c |
+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).@* 
+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}}.
 
 
 @tsubheading{Re-aligning and field motion}
 @tsubheading{Re-aligning and field motion}
 @kindex C-c C-c
 @kindex C-c C-c
@@ -958,12 +950,6 @@ edited in place.
 This is an alias for @kbd{C-u C-c `} to make the current field fully
 This is an alias for @kbd{C-u C-c `} to make the current field fully
 visible.
 visible.
 
 
-@kindex C-c |
-@item C-c |
-Toggle the visibility of vertical lines in tables.  The lines are
-still there, only made invisible with a text property.  Any @samp{|}
-added by hand will become invisible on the next align.
-
 @item M-x org-table-import
 @item M-x org-table-import
 Import a file as a table.  The table should be TAB- or whitespace
 Import a file as a table.  The table should be TAB- or whitespace
 separated.  Useful, for example, to import an Excel table or data from a
 separated.  Useful, for example, to import an Excel table or data from a
@@ -1381,28 +1367,30 @@ links to other files, Usenet articles, emails and much more.
 @cindex link format
 @cindex link format
 @cindex format, of links
 @cindex format, of links
 
 
-Org-mode will recognize plain URL-like links in the buffer and activate
-them as clickable links.  However, the general linkformat looks like
-this:
+Org-mode will recognize plain URL-like links and activate them as
+clickable links.  However, the general linkformat looks like this:
 
 
 @example
 @example
 [[link][description]]       @r{or alternatively}           [[link]]  
 [[link][description]]       @r{or alternatively}           [[link]]  
 @end example
 @end example
 
 
-The description part is optional.  Once a link in the buffer is
-complete, Org-mode will change the display so that
-@u{@samp{description}} is displayed instead of
-@samp{[[link][description]]} and @samp{link} is displayed instead of
+Once a link in the buffer is complete (all brackets present), Org-mode
+will change the display so that @samp{description} is displayed instead
+of @samp{[[link][description]]} and @samp{link} is displayed instead of
 @samp{[[link]]}.  Links will be highlighted in the face @code{org-link},
 @samp{[[link]]}.  Links will be highlighted in the face @code{org-link},
 which by default is an underlined face.  You can directly edit the
 which by default is an underlined face.  You can directly edit the
-visible part of a link.  To edit the invisible part, use @kbd{C-c C-l}
-with the cursor on the link.  If you place the cursor at the beginning
-of end of the displayed text and press @key{BACKSPACE}, you will remove
-the (invisible) bracket at that location.  This makes the link incomplete
+visible part of a link.  Note that this can be either the @samp{link}
+part (if there is not description) or the @samp{description} part.  To
+edit also the invisible @samp{link} part, use @kbd{C-c C-l} with the
+cursor on the link.
+
+If you place the cursor at the beginning or just behind the end of the
+displayed text and press @key{BACKSPACE}, you will remove the
+(invisible) bracket at that location.  This makes the link incomplete
 and the internals are again displayed as plain text.  Inserting the
 and the internals are again displayed as plain text.  Inserting the
-missing bracket does hide the link internal again.  Finally, you may also
-use the menu entry @code{Org->Hperlinks->Literal links} to unhide all
-links.
+missing bracket does hide the link internals again.  To show the
+internal structure of all links, use the menu entry
+@code{Org->Hyperlinks->Literal links}.
 
 
 @node Internal links, External links, Link format, Hyperlinks
 @node Internal links, External links, Link format, Hyperlinks
 @section Internal links
 @section Internal links
@@ -1473,15 +1461,10 @@ loaded into Emacs.  To update the target list during editing, press
 
 
 Org-mode also supports CamelCase words as links.  This feature is not
 Org-mode also supports CamelCase words as links.  This feature is not
 turned on by default because of the inconsistencies this system suffers
 turned on by default because of the inconsistencies this system suffers
-from.  It is mainly kept for backward compatibility, but the use is
-deprecated.  To activate CamelCase words as links, and to make headline
-completion offer CamelCase version of headlines, the following
-customization is needed:
-
-@lisp
-(setq org-activate-camels t
-      org-file-link-context-use-camel-case t)
-@end lisp
+from.  To activate CamelCase words as links, you need to customize
+the option @code{org-activate-links}.  A CamelCase word then leads to a
+text search such that @samp{CamelCaseLink} is equivalent to
+@samp{[[camel case link]]}.
 
 
 @node External links, Managing links, Internal links, Hyperlinks
 @node External links, Managing links, Internal links, Hyperlinks
 @section External links
 @section External links
@@ -1521,7 +1504,7 @@ rmail:folder#id                          @r{RMAIL message link}
 gnus:group                               @r{GNUS group link}
 gnus:group                               @r{GNUS group link}
 gnus:group#id                            @r{GNUS article link}
 gnus:group#id                            @r{GNUS article link}
 bbdb:Richard Stallman                    @r{BBDB link}
 bbdb:Richard Stallman                    @r{BBDB link}
-shell:ls *.org@footnote{Note that @samp{<} and @samp{>} cannot be part of a link, and therefore of a shell command.  If you need redirection, use @@@{ and @@@} instead.}                          @r{A shell command}
+shell:ls *.org                           @r{A shell command}
 @end example
 @end example
 
 
 A link should be enclosed in double brackets and may contain a
 A link should be enclosed in double brackets and may contain a
@@ -1535,8 +1518,9 @@ format}), for example:
 @cindex angular brackets, around links
 @cindex angular brackets, around links
 @cindex plain text external links
 @cindex plain text external links
 Org-mode also finds external links in the normal text and activates them
 Org-mode also finds external links in the normal text and activates them
-as links.  Plain text links cannot contain spaces.  To remove
-ambiguities about the end of the link, enclose them in angular brackets.
+as links.  If spaces must be part of the link (for example in
+@samp{bbdb:Richard Stallman}) or to remove ambiguities about the end of
+the link, enclose them in angular brackets.
 
 
 @node Managing links, Search Options, External links, Hyperlinks
 @node Managing links, Search Options, External links, Hyperlinks
 @section Managing links
 @section Managing links
@@ -1550,16 +1534,15 @@ insert it into an org-mode file, and to follow the link.
 @item C-c l
 @item C-c l
 Store a link to the current location.  This is a @emph{global} command
 Store a link to the current location.  This is a @emph{global} command
 which can be used in any buffer to create a link.  The link will be
 which can be used in any buffer to create a link.  The link will be
-stored for later insertion into an Org-mode buffer (see below).  For
-VM, RMAIL, WANDERLUST, GNUS and BBDB buffers, the link will point to
-the current article/entry.  For W3 and W3M buffers, the link goes to
-the current URL.  For Org-mode files, the current headline is
-targeted.  For any other files, the link will point to the file, with
-a search string (@pxref{Search Options}) pointing to the
-contents of the current line.  If there is an active region, the
-selected words will form the basis of the search string.  The key
-binding @kbd{C-c l} is only a suggestion - see @ref{Installation and
-activation}.
+stored for later insertion into an Org-mode buffer (see below).  For VM,
+RMAIL, WANDERLUST, MH-E, GNUS and BBDB buffers, the link will point to
+the current article/entry.  For W3 and W3M buffers, the link goes to the
+current URL.  For Org-mode files, the current headline is targeted.  For
+any other files, the link will point to the file, with a search string
+(@pxref{Search Options}) pointing to the contents of the current line.
+If there is an active region, the selected words will form the basis of
+the search string.  The key binding @kbd{C-c l} is only a suggestion -
+see @ref{Installation and activation}.
 
 
 @kindex C-c C-l
 @kindex C-c C-l
 @cindex link completion
 @cindex link completion
@@ -1697,11 +1680,11 @@ package.} will tell @emph{Remember} to use org files as target, and to
 create annotations compatible with Org-mode links.
 create annotations compatible with Org-mode links.
 
 
 @example
 @example
+(setq org-directory "~/path/to/my/orgfiles/")
+(setq org-default-notes-file "~/.notes")
 (autoload 'org-remember-annotation "org")
 (autoload 'org-remember-annotation "org")
 (autoload 'org-remember-apply-template "org")
 (autoload 'org-remember-apply-template "org")
 (autoload 'org-remember-handler "org")
 (autoload 'org-remember-handler "org")
-(setq org-directory "~/path/to/my/orgfiles/")
-(setq org-default-notes-file "~/.notes")
 (setq remember-annotation-functions '(org-remember-annotation))
 (setq remember-annotation-functions '(org-remember-annotation))
 (setq remember-handler-functions '(org-remember-handler))
 (setq remember-handler-functions '(org-remember-handler))
 (add-hook 'remember-mode-hook 'org-remember-apply-template)
 (add-hook 'remember-mode-hook 'org-remember-apply-template)
@@ -1720,9 +1703,9 @@ journal entries, you could use:
 @end example
 @end example
 
 
 @noindent In these entries, the character specifies how to select the
 @noindent In these entries, the character specifies how to select the
-template, the first string specifies the template, and the second string
-specifies a default file (overruling @code{org-default-notes-file}) as a
-target for this note.
+template, the first string specifies the template, and the (optional)
+second string specifies a default file (overruling
+@code{org-default-notes-file}) as a target for this note.
 
 
 When you call @kbd{M-x remember} to remember something, org will prompt
 When you call @kbd{M-x remember} to remember something, org will prompt
 for a key to select the template and then prepare the buffer like
 for a key to select the template and then prepare the buffer like
@@ -1742,12 +1725,12 @@ for a key to select the template and then prepare the buffer like
 @noindent See the variable @code{org-remember-templates} for more details.
 @noindent See the variable @code{org-remember-templates} for more details.
 
 
 When you are finished composing a note with remember, you have to press
 When you are finished composing a note with remember, you have to press
-@kbd{C-c C-c} to exit remember-mode and to file the note away.  The
-handler first prompts for a target file - if you press @key{RET}, the
-value of @code{org-default-notes-file} is used.  Then the command offers
-the headings tree of the selected file.  You can either immediately
-press @key{RET} to get the note appended to the file.  Or you can use
-vertical cursor motion (@key{up} and @key{down}) and visibility cycling
+@kbd{C-c C-c} to file the note away.  The handler first prompts for a
+target file - if you press @key{RET}, the value of
+@code{org-default-notes-file} is used.  Then the command offers the
+headings tree of the selected file.  You can either immediately press
+@key{RET} to get the note appended to the file.  Or you can use vertical
+cursor motion (@key{up} and @key{down}) and visibility cycling
 (@key{TAB}) to find a better place.  Pressing @key{RET} or @key{left} or
 (@key{TAB}) to find a better place.  Pressing @key{RET} or @key{left} or
 @key{right} leads to the following result.
 @key{right} leads to the following result.
 
 
@@ -2796,7 +2779,7 @@ original org file.
 
 
 @kindex T
 @kindex T
 @item T
 @item T
-Show all tags assiciated with the current item.  Because of
+Show all tags associated with the current item.  Because of
 inheritance, this may be more than the tags listed in the line itself.
 inheritance, this may be more than the tags listed in the line itself.
 
 
 @kindex :
 @kindex :
@@ -2866,7 +2849,7 @@ date at the cursor.
 
 
 @kindex M
 @kindex M
 @item M
 @item M
-Show the phases of the moon for the three month around current date.
+Show the phases of the moon for the three months around current date.
 
 
 @kindex S
 @kindex S
 @item S
 @item S
@@ -3401,45 +3384,75 @@ rather use @kbd{C-c .}  to re-insert the timestamp.
 @enumerate
 @enumerate
 @item @b{Org-mode seems to be a useful default mode for the various
 @item @b{Org-mode seems to be a useful default mode for the various
 @file{README} files I have scattered through my directories.  How do I
 @file{README} files I have scattered through my directories.  How do I
-turn it on for all @file{README} files?}
+turn it on for all @file{README} files?}@*
+@c
 @example
 @example
 (add-to-list 'auto-mode-alist '("README$" . org-mode))
 (add-to-list 'auto-mode-alist '("README$" . org-mode))
 @end example
 @end example
 
 
 @item @b{Some of my links stopped working after I upgraded to a version
 @item @b{Some of my links stopped working after I upgraded to a version
-4.20 or later.  Why is this, and how can I fix it?}@* The newer versions of
-Org-mode have a better link system and no longer allow unescaped space
-characters as part of a link.  To fix these links, and also to move all
-@samp{<link>} style links to the new @samp{[[link]]} system, execute
-once in each Org-mode file: @kbd{M-x org-upgrade-old-links}.
-
-@item @b{I really like the old style links with angular brackets
-better.  Please give them back to me, don't tell me it is not
-possible!}@* Would I let you down like that?  If you must (even if I
-don't understand why), you can do this
+4.20 or later.  Why is this, and how can I fix it?}@*
+@c
+These must be links in plain text, containing white space, such as
+@samp{bbdb:Richard Stallman}.  You need to protect these links by
+putting double brackets around them, like @samp{[[bbdb:Richard
+Stallman]]}.
+
+@item @b{I see that Org-mode now creates links using the double bracket
+convention that hides the link part and the brackets, only showing the
+description part.  How can I convert my old links to this new format?}@*
+@c
+Execute once in each Org-mode file: @kbd{M-x org-upgrade-old-links}.
+The replaces angular brackets with the link format.
+
+@item @b{I don't care if you find the new bracket links great, I am
+attached to the old style using angular brackets and no hiding of the
+link text.  Please give them back to me, don't tell me it is not
+possible!}@*
+@c
+Would I let you down like that?  If you must (even if I don't understand
+why), you can do this
 @lisp
 @lisp
-(setq org-allow-space-in-plain-links t
-      org-link-style 'plain
+(setq org-link-style 'plain
       org-link-format "<%s>")
       org-link-format "<%s>")
 @end lisp
 @end lisp
 
 
+@item @b{When I am executing shell links I always get a 
+confirmation prompt and need to type @kbd{yes @key{RET}}, thats 4 key
+presses!  Can I get rid of this?}@*
+@c
+@cindex shell links, confirmation
+@cindex dangerous commands
+The confirmation is there to protect you from unwantingly execute
+potentially dangerous commands.  For example, imagine a link
+@samp{[[shell:rm -rf ~/*][Google Search]]}.  In an Org-mode buffer, this
+command would look like @samp{Google Search}, but really it would remove
+your home directory.  If you wish, you can make it easier to respond to
+the query by setting @code{org-confirm-shell-links} to @code{y-or-n-p}.
+Then a single @kbd{y} keypress will be enough to confirm shell links.
+It is also possible to turn off this check entirely, but I do not
+recommend to do this.  Be warned.
+
 @item @b{All these stars are driving me mad, I just find the Emacs
 @item @b{All these stars are driving me mad, I just find the Emacs
 outlines unreadable. Can't you just put white space and a single star as a
 outlines unreadable. Can't you just put white space and a single star as a
 starter for headlines?}@*
 starter for headlines?}@*
+@c
 See @ref{Clean view}.
 See @ref{Clean view}.
 
 
 @item @b{I would like to have two windows on the same Org-mode
 @item @b{I would like to have two windows on the same Org-mode
 file, but with different outline visibility.  Is that possible?}@*
 file, but with different outline visibility.  Is that possible?}@*
+@c
 @cindex @code{make-indirect-buffer}
 @cindex @code{make-indirect-buffer}
 @cindex indirect buffers
 @cindex indirect buffers
-In GNU Emacs, you may use @emph{indirect buffers} which do exactly
-this.  See the documentation on the command
-@code{make-indirect-buffer}.  In XEmacs, this is currently not
-possible because of the different outline implementation.
+In GNU Emacs, you may use @emph{indirect buffers} which do exactly this.
+See the documentation on the command @code{make-indirect-buffer}.  In
+XEmacs, this is currently not possible because of the different outline
+implementation.
 
 
 @item @b{When I export my TODO list, every TODO item becomes a
 @item @b{When I export my TODO list, every TODO item becomes a
 separate section.  How do I enforce these items to be exported as an
 separate section.  How do I enforce these items to be exported as an
 itemized list?}@*
 itemized list?}@*
+@c
 If you plan to use ASCII or HTML export, make sure things you want to
 If you plan to use ASCII or HTML export, make sure things you want to
 be exported as item lists are level 4 at least, even if that does mean
 be exported as item lists are level 4 at least, even if that does mean
 there is a level jump.  For example:
 there is a level jump.  For example:
@@ -3459,7 +3472,9 @@ configure the @samp{H} switch.
 +OPTIONS:   H:2; ...
 +OPTIONS:   H:2; ...
 @end example
 @end example
 
 
-@item @b{I would like to export only a subtree of my file to HTML.  How?}@*
+@item @b{I would like to export only a subtree of my file to HTML.
+How?}@*
+@c
 @cindex exporting a subtree
 @cindex exporting a subtree
 If you want to export a subtree, mark the subtree as region and then
 If you want to export a subtree, mark the subtree as region and then
 export.  Marking can be done with @kbd{C-c @@ C-x C-x}, for example.
 export.  Marking can be done with @kbd{C-c @@ C-x C-x}, for example.
@@ -3468,16 +3483,9 @@ export.  Marking can be done with @kbd{C-c @@ C-x C-x}, for example.
 CUA-mode, is there a way to fix this conflict?}@*
 CUA-mode, is there a way to fix this conflict?}@*
 Yes, see @ref{Interaction}.
 Yes, see @ref{Interaction}.
 
 
-@item @b{Is there an easy way to insert an empty table template with a
-default number of rows and columns?}@*
-@cindex table, empty template
-To insert an empty table template, just type @samp{|-} and use
-@key{TAB}.  The default size can be changed with the variable
-@code{org-table-default-size}.  However, just starting to type the
-first line is usually much easier.
-
 @item @b{One of my table columns has started to fill up with
 @item @b{One of my table columns has started to fill up with
 @samp{#ERROR}.  What is going on?}@*
 @samp{#ERROR}.  What is going on?}@*
+@c
 Org-mode tried to compute the column from other fields using a
 Org-mode tried to compute the column from other fields using a
 formula stored in the @samp{#+TBLFMT:} line just below the table, and
 formula stored in the @samp{#+TBLFMT:} line just below the table, and
 the evaluation of the formula fails.  Fix the fields used in the
 the evaluation of the formula fails.  Fix the fields used in the
@@ -3487,17 +3495,20 @@ formula, or fix the formula, or remove it!
 horizontal line in the table, pressing TAB creates a new table line
 horizontal line in the table, pressing TAB creates a new table line
 @i{before} the horizontal line.  How can I quickly move to the line
 @i{before} the horizontal line.  How can I quickly move to the line
 @i{below} the horizontal line instead?}@*
 @i{below} the horizontal line instead?}@*
+@c
 Press @key{down} (to get on the separator line) and then @key{TAB}.
 Press @key{down} (to get on the separator line) and then @key{TAB}.
 Or configure the variable @code{org-table-tab-jumps-over-hlines}.
 Or configure the variable @code{org-table-tab-jumps-over-hlines}.
 
 
 @item @b{How can I change the indentation of an entire table without
 @item @b{How can I change the indentation of an entire table without
 fixing every line by hand?}@*
 fixing every line by hand?}@*
+@c
 @cindex indentation, of tables
 @cindex indentation, of tables
 The indentation of a table is set by the first line.  So just fix the
 The indentation of a table is set by the first line.  So just fix the
 indentation of the first line and realign with @key{TAB}.
 indentation of the first line and realign with @key{TAB}.
 
 
 @item @b{Is it possible to include entries from org-mode files into my
 @item @b{Is it possible to include entries from org-mode files into my
 emacs diary?}@*
 emacs diary?}@*
+@c
 Since the org-mode agenda is much more powerful and can contain the
 Since the org-mode agenda is much more powerful and can contain the
 diary (@pxref{Calendar/Diary integration}), you should think twice
 diary (@pxref{Calendar/Diary integration}), you should think twice
 before deciding to do this.  Integrating Org-mode information into the
 before deciding to do this.  Integrating Org-mode information into the


+ 7 - 10
orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
 % Reference Card for Org Mode
-\def\orgversionnumber{4.19b}
+\def\orgversionnumber{4.20}
 \def\year{2006}
 \def\year{2006}
 %
 %
 %**start of header
 %**start of header
@@ -427,9 +427,8 @@ To set archive location for current file, add a line like$^3$:
 
 
 %\metax{insert a new Org-mode table}{M-x org-table-create}
 %\metax{insert a new Org-mode table}{M-x org-table-create}
 \metax{just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
 \metax{just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
-\key{convert region to table}{C-c C-c}
-\key{... separator at least 3 spaces}{C-3 C-c C-c}
-%\key{... prompt for separator regexp}{C-u C-c C-c}
+\key{convert region to table}{C-c |}
+\key{... separator at least 3 spaces}{C-3 C-c |}
 
 
 {\bf Commands available inside tables}
 {\bf Commands available inside tables}
 
 
@@ -465,9 +464,7 @@ Outside of tables, the same keys may have other functionality.
 \key{paste rectangular region}{C-c C-x C-y}
 \key{paste rectangular region}{C-c C-x C-y}
 \key{fill paragraph across selected cells}{C-c C-q}
 \key{fill paragraph across selected cells}{C-c C-q}
 
 
-{\bf Calculations}
-
-These need the Emacs calc package installed.
+{\bf Calculations} (in combination with Emacs \kbd{calc} package)
 
 
 \key{set and eval column formula}{C-c =}
 \key{set and eval column formula}{C-c =}
 \key{set and eval named-field formula}{C-u C-c =}
 \key{set and eval named-field formula}{C-u C-c =}
@@ -475,8 +472,8 @@ These need the Emacs calc package installed.
 \key{re-apply all stored equations to current line}{C-c *}
 \key{re-apply all stored equations to current line}{C-c *}
 \key{re-apply all stored equations to entire table}{C-u C-c *}
 \key{re-apply all stored equations to entire table}{C-u C-c *}
 
 
-\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
-in lines starting with: {\tt | \# |}.
+%\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
+%in lines starting with: {\tt | \# |}.
 
 
 \key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
 \key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
 
 
@@ -496,9 +493,9 @@ formula, \kbd{:=} a named-field formula.
 
 
 {\bf Miscellaneous}
 {\bf Miscellaneous}
 
 
+\key{to limit column width to \kbd{N} characters, use}{...| <N> |...}
 \key{edit the current field in a separate window}{C-c `}
 \key{edit the current field in a separate window}{C-c `}
 \key{make current field fully visible}{C-u TAB}
 \key{make current field fully visible}{C-u TAB}
-\key{toggle visibility of vertical lines}{C-c |}
 \metax{export as tab-separated file}{M-x org-table-export}
 \metax{export as tab-separated file}{M-x org-table-export}
 \metax{import tab-separated file}{M-x org-table-import}
 \metax{import tab-separated file}{M-x org-table-import}
 
 

Некоторые файлы не были показаны из-за большого количества измененных файлов