forked from mirrors/org-mode
Merge branch 'maint'
Conflicts: doc/org.texi
This commit is contained in:
commit
c00379dc77
|
@ -9961,9 +9961,9 @@ include your @file{.emacs} file, you could use:
|
|||
@end example
|
||||
|
||||
@noindent
|
||||
The optional second and third parameter are the markup (e.g., @samp{quote},
|
||||
@samp{example}, or @samp{src}), and, if the markup is @samp{src}, the
|
||||
language for formatting the contents.
|
||||
The optional second and third parameter are the markup (i.e., @samp{example}
|
||||
or @samp{src}), and, if the markup is @samp{src}, the language for formatting
|
||||
the contents.
|
||||
|
||||
If no markup is given, the text will be assumed to be in Org mode format and
|
||||
will be processed normally. However, footnote labels (@pxref{Footnotes}) in
|
||||
|
|
|
@ -2261,11 +2261,11 @@ include your @file{.emacs} file, you could use:
|
|||
#+INCLUDE: "~/.emacs" src emacs-lisp
|
||||
@end smallexample
|
||||
@noindent
|
||||
The optional second and third parameter are the markup (e.g.@: @samp{quote},
|
||||
@samp{example}, or @samp{src}), and, if the markup is @samp{src}, the
|
||||
language for formatting the contents. The markup is optional, if it is not
|
||||
given, the text will be assumed to be in Org mode format and will be
|
||||
processed normally. @kbd{C-c '} will visit the included file.
|
||||
The optional second and third parameter are the markup (i.e., @samp{example}
|
||||
or @samp{src}), and, if the markup is @samp{src}, the language for formatting
|
||||
the contents. The markup is optional, if it is not given, the text will be
|
||||
assumed to be in Org mode format and will be processed normally. @kbd{C-c '}
|
||||
will visit the included file.
|
||||
|
||||
@node Embedded @LaTeX{}, , Include files, Markup
|
||||
@section Embedded @LaTeX{}
|
||||
|
|
Loading…
Reference in a new issue