diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-22 16:01:01 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-22 16:01:01 +0100 |
commit | 0aae38f8fa15b99a93ffca4b94dff7ac4d2f8205 (patch) | |
tree | aee295a054089fe5aa382ece8ae96bec11eb7083 | |
parent | 1d6d4e99e49bea6ffb73c65e02d9ed266d05eb8b (diff) | |
parent | ecd9a1cc21f8e1f0282917a7b5cefa2c85cba521 (diff) | |
download | org-mode-0aae38f8fa15b99a93ffca4b94dff7ac4d2f8205.tar.gz |
Merge branch 'maint'
-rw-r--r-- | doc/org.texi | 4 | ||||
-rw-r--r-- | lisp/org-agenda.el | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi index 61f1ee5..5145150 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -4547,7 +4547,7 @@ off a box while there are unchecked boxes above it. @orgcmd{C-c C-c,org-toggle-checkbox} Toggle checkbox status or (with prefix arg) checkbox presence at point. With a single prefix argument, add an empty checkbox or remove the current -one@footnote{`C-u C-c C-c' on the @emph{first} item of a list with no checkbox +one@footnote{@kbd{C-u C-c C-c} on the @emph{first} item of a list with no checkbox will add checkboxes to the rest of the list.}. With a double prefix argument, set it to @samp{[-]}, which is considered to be an intermediate state. @orgcmd{C-c C-x C-b,org-toggle-checkbox} @@ -16093,7 +16093,7 @@ Here is a @LaTeX{} example. Let's say that you have this in your \end@{comment@} @end example -Pressing `C-c C-c' on @code{a new house} and will insert the converted +Pressing @kbd{C-c C-c} on @code{a new house} and will insert the converted @LaTeX{} list between the two marker lines. @node Dynamic blocks, Special agenda views, Tables in arbitrary syntax, Hacking diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ad114ae..a3d713e 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -530,7 +530,7 @@ This is a list of four items: the project is considered to be not stuck. If you specify \"*\" as a tag, any tag will mark the project unstuck. Note that this is about the explicit presence of a tag somewhere in the subtree, inherited - tags to not count here. If inherited tags make a project not stuck, + tags do not count here. If inherited tags make a project not stuck, use \"-TAG\" in the tags part of the matcher under (1.) above. 4. An arbitrary regular expression matching non-stuck projects. |