Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-10-06 12:09:22 +02:00
commit ee6bb635dc
1 changed files with 4 additions and 4 deletions

View File

@ -4919,8 +4919,8 @@ within curly brackets. Here is an expanded example:
Searching for the tag =Project= now lists all tags also including Searching for the tag =Project= now lists all tags also including
regular expression matches for =P@.+=, and similarly for tag searches regular expression matches for =P@.+=, and similarly for tag searches
on =Vision=, =Goal= and =AOF=. For example, this would work well for on =Vision=, =Goal= and =AOF=. For example, this would work well for
a project tagged with a common project-identifier, a project tagged with a common project-identifier, e.g.,
e.g. =P@2014_OrgTags=. =P@2014_OrgTags=.
#+kindex: C-c C-x q #+kindex: C-c C-x q
#+findex: org-toggle-tags-groups #+findex: org-toggle-tags-groups
@ -7853,8 +7853,8 @@ capture template associated to the =X= key with them.
: emacsclient org-protocol://capture?template=X?url=URL?title=TITLE?body=BODY : emacsclient org-protocol://capture?template=X?url=URL?title=TITLE?body=BODY
To use this feature, add a bookmark with an arbitrary name, e.g. To use this feature, add a bookmark with an arbitrary name, e.g.,
=Org: capture= and enter this as =Location=: =Org: capture=, and enter this as =Location=:
#+begin_example #+begin_example
javascript:location.href='org-protocol://capture?template=x'+ javascript:location.href='org-protocol://capture?template=x'+