mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint' 

Conflicts:
	doc/org.texi
This commit is contained in:
Nicolas Goaziou 2014-06-01 08:54:44 +02:00
parent 51e1131ff8 c34121c60f
commit c00379dc77
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/org.texi
View File

@ -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

10
doc/orgguide.texi
View File

@ -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{}