Merge branch 'master' of code.orgmode.org:bzg/org-mode

This commit is contained in:
Bastien 2018-10-28 09:45:42 +01:00
commit 4b2a7b621e
1 changed files with 9 additions and 6 deletions

View File

@ -340,8 +340,9 @@ conventions:
- =boss=, =ARCHIVE= :: - =boss=, =ARCHIVE= ::
User-defined tags are written in lowercase; built-in tags with Tags are case-sensitive. User-defined tags are written in
special meaning are written with all capitals. lowercase; built-in tags with special meaning are written as they
should appear in the document, usually with all capitals.
- =Release=, =PRIORITY= :: - =Release=, =PRIORITY= ::
@ -3259,10 +3260,12 @@ current buffer:
- /Email/News clients: VM, Rmail, Wanderlust, MH-E, Gnus/ :: - /Email/News clients: VM, Rmail, Wanderlust, MH-E, Gnus/ ::
#+vindex: org-email-link-description-format
Pretty much all Emacs mail clients are supported. The link Pretty much all Emacs mail clients are supported. The link
points to the current article, or, in some Gnus buffers, to the points to the current article, or, in some Gnus buffers, to the
group. The description is constructed from the author and the group. The description is constructed according to the variable
subject. ~org-email-link-description-format~. By default, it refers to
the addressee and the subject, possibly truncated.
- /Web browsers: W3, W3M and EWW/ :: - /Web browsers: W3, W3M and EWW/ ::
@ -4769,8 +4772,8 @@ With the above setup, you could clear the current tags and set
=@home=, =laptop= and =pc= tags with just the following keys: =@home=, =laptop= and =pc= tags with just the following keys:
{{{kbd(C-c C-c SPC h l p RET)}}}. Switching from =@home= to =@work= {{{kbd(C-c C-c SPC h l p RET)}}}. Switching from =@home= to =@work=
would be done with {{{kbd(C-c C-c w RET)}}} or alternatively with would be done with {{{kbd(C-c C-c w RET)}}} or alternatively with
{{{kbd(C-c C-c C-c w)}}}. Adding the non-predefined tag =Sarah= could {{{kbd(C-c C-c C-c w)}}}. Adding the non-predefined tag =sarah= could
be done with {{{kbd(C-c C-c TAB S a r a h RET)}}}. be done with {{{kbd(C-c C-c TAB s a r a h RET)}}}.
#+vindex: org-fast-tag-selection-single-key #+vindex: org-fast-tag-selection-single-key
If you find that most of the time you need only a single key press to If you find that most of the time you need only a single key press to