ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc fixes.

This commit is contained in:
Carsten Dominik 2008-06-13 10:20:45 +02:00
parent 4c0752c700
commit d546fd332d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-13 Carsten Dominik <dominik@science.uva.nl>
* org.texi: Modify license to no longer include back- and front
cover matters.
2008-06-11 Carsten Dominik <dominik@science.uva.nl> 2008-06-11 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Using the mapping API): New section. * org.texi (Using the mapping API): New section.

39
doc/org.texi
View File

@ -40,15 +40,7 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free Software Foundation
@quotation @quotation
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with no any later version published by the Free Software Foundation.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License.''
(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
this GNU Manual, like GNU software. Copies published by the Free
Software Foundation raise funds for GNU development.''
@end quotation @end quotation
@end copying @end copying
@ -4816,26 +4808,29 @@ use:
@noindent In these entries, the first string is just a name, and the @noindent In these entries, the first string is just a name, and the
character specifies how to select the template. It is useful if the character specifies how to select the template. It is useful if the
character is also the first letter of the name. The next string character is also the first letter of the name. The next string specifies
specifies the template. Two more (optional) strings give the file in the template. Two more (optional) strings give the file in which, and the
which, and the headline under which the new note should be stored. The headline under which the new note should be stored. The file (if not present
file (if not present or @code{nil}) defaults to or @code{nil}) defaults to @code{org-default-notes-file}, the heading to
@code{org-default-notes-file}, the heading to @code{org-remember-default-headline}. If the file name is not an absolute
@code{org-remember-default-headline}. If the file name is not an path, it will be interpreted relative to @code{org-directory}. The heading
absolute path, it will be interpreted relative to @code{org-directory}. can also be the symbols @code{top} or @code{bottom} to send note as level 1
entries to the beginning or end of the file, respectively.
An optional sixth element specifies the contexts in which the user can An optional sixth element specifies the contexts in which the user can select
select the template. This element can be either a list of major modes the template. This element can be a list of major modes or a function.
or a function. @code{org-remember} will first check whether the function @code{org-remember} will first check whether the function returns @code{t} or
returns @code{t} or if we are in any of the listed major mode, and select if we are in any of the listed major mode, and exclude templates fo which
the template accordingly. this condition is not fulfilled. Templates that do not specify this element
at all, or that use @code{nil} or @code{t} as a value will always be
selectable.
So for example: So for example:
@example @example
(setq org-remember-templates (setq org-remember-templates
'(("Bug" ?b "* BUG %?\n %i\n %a" "~/org/BUGS.org" "Bugs" (emacs-lisp-mode)) '(("Bug" ?b "* BUG %?\n %i\n %a" "~/org/BUGS.org" "Bugs" (emacs-lisp-mode))
("Journal" ?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org" my-check) ("Journal" ?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org" "X" my-check)
("Idea" ?i "* %^@{Title@}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas"))) ("Idea" ?i "* %^@{Title@}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas")))
@end example @end example