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

Incorporate changes from downstream Emacs

This commit is contained in:
Carsten Dominik 2009-02-25 10:01:37 +01:00
parent 8f819da4d5
commit 0bf8a4e449
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/org.texi
View File

@ -6,11 +6,6 @@
@set VERSION 6.23b @set VERSION 6.23b
@set DATE February 2009 @set DATE February 2009
@dircategory Emacs
@direntry
* Org Mode: (org). Outline-based notes management and organizer
@end direntry
@c Version and Contact Info @c Version and Contact Info
@set MAINTAINERSITE @uref{http://orgmode.org,maintainers webpage} @set MAINTAINERSITE @uref{http://orgmode.org,maintainers webpage}
@set AUTHOR Carsten Dominik @set AUTHOR Carsten Dominik
@ -56,6 +51,11 @@ license to the document, as described in section 6 of the license.
@end quotation @end quotation
@end copying @end copying
@dircategory Emacs
@direntry
* Org Mode: (org). Outline-based notes management and organizer
@end direntry
@titlepage @titlepage
@title The Org Manual @title The Org Manual
@ -310,12 +310,12 @@ Markup rules
* Include files:: Include the contents of a file during export * Include files:: Include the contents of a file during export
* Tables exported:: Tables are exported richly * Tables exported:: Tables are exported richly
* Inlined images:: How to inline images during export * Inlined images:: How to inline images during export
* Footnote markup:: * Footnote markup:: ASCII representation of footnotes
* Emphasis and monospace:: To bold or not to bold * Emphasis and monospace:: To bold or not to bold
* TeX macros and LaTeX fragments:: Create special, rich export. * TeX macros and LaTeX fragments:: Create special, rich export.
* Horizontal rules:: A line across the page * Horizontal rules:: A line across the page
* Comment lines:: Some lines will not be exported * Comment lines:: Some lines will not be exported
* Macro replacement:: * Macro replacement:: Global replacement of place holdes
HTML export HTML export
@ -1442,7 +1442,7 @@ A LaTeX-like anonymous footnote where the definition is given directly at the
reference point. reference point.
@item [fn:name: a definition] @item [fn:name: a definition]
An inline definition of a footnote, which also specifies a name for the note. An inline definition of a footnote, which also specifies a name for the note.
Since Org allows multiple references to the same note, you can then use use Since Org allows multiple references to the same note, you can then use
@code{[fn:name]} to create additional references. @code{[fn:name]} to create additional references.
@end table @end table
@ -2783,7 +2783,7 @@ the current URL. For IRC links, if you set the variable
@code{org-irc-link-to-logs} to non-nil then @kbd{C-c l} will store a @code{org-irc-link-to-logs} to non-nil then @kbd{C-c l} will store a
@samp{file:/} style link to the relevant point in the logs for the current @samp{file:/} style link to the relevant point in the logs for the current
conversation. Otherwise an @samp{irc:/} style link to the user/channel/server conversation. Otherwise an @samp{irc:/} style link to the user/channel/server
under the point will be stored. under the point will be stored.
For any other files, the link will point to the file, with a search string 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 (@pxref{Search options}) pointing to the contents of the current line. If
@ -7576,7 +7576,7 @@ markup rule used in an Org mode buffer.
* Include files:: Include the contents of a file during export * Include files:: Include the contents of a file during export
* Tables exported:: Tables are exported richly * Tables exported:: Tables are exported richly
* Inlined images:: How to inline images during export * Inlined images:: How to inline images during export
* Footnote markup:: * Footnote markup:: ASCII representation of footnotes
* Emphasis and monospace:: To bold or not to bold * Emphasis and monospace:: To bold or not to bold
* TeX macros and LaTeX fragments:: Create special, rich export. * TeX macros and LaTeX fragments:: Create special, rich export.
* Horizontal rules:: A line across the page * Horizontal rules:: A line across the page
@ -10552,7 +10552,7 @@ archive @r{skip trees with the archive tag}
comment @r{skip trees with the COMMENT keyword} comment @r{skip trees with the COMMENT keyword}
function or Lisp form function or Lisp form
@r{will be used as value for @code{org-agenda-skip-function},} @r{will be used as value for @code{org-agenda-skip-function},}
@r{so whenever the the function returns t, FUNC} @r{so whenever the function returns t, FUNC}
@r{will not be called for that entry and search will} @r{will not be called for that entry and search will}
@r{continue from the point where the function leaves it} @r{continue from the point where the function leaves it}
@end example @end example