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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-10-24 11:18:19 +02:00
parent aff4f10d79 6541e1632f
commit 5a78f12866
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/org.texi
View File

@ -10108,13 +10108,11 @@ the sun is R_@{sun@} = 6.96 x 10^8 m.
@end example @end example
@vindex org-use-sub-superscripts @vindex org-use-sub-superscripts
To avoid interpretation as raised or lowered text, you can quote @samp{^} and If you write a text where the underscore is often used in a different
@samp{_} with a backslash: @samp{\^} and @samp{\_}. If you write a text context, Org's convention to always interpret these as subscripts can get in
where the underscore is often used in a different context, Org's convention your way. Configure the variable @code{org-use-sub-superscripts} to change
to always interpret these as subscripts can get in your way. Configure the this convention. For example, when setting this variable to @code{@{@}},
variable @code{org-use-sub-superscripts} to change this convention. For @samp{a_b} will not be interpreted as a subscript, but @samp{a_@{b@}} will.
example, when setting this variable to @code{@{@}}, @samp{a_b} will not be
interpreted as a subscript, but @samp{a_@{b@}} will.
@table @kbd @table @kbd
@kindex C-c C-x \ @kindex C-c C-x \
@ -10840,9 +10838,10 @@ data between frames, or to properly close a @code{column} environment.
Headlines also support @code{BEAMER_ACT} and @code{BEAMER_OPT} properties. Headlines also support @code{BEAMER_ACT} and @code{BEAMER_OPT} properties.
The former is translated as an overlay/action specification, or a default The former is translated as an overlay/action specification, or a default
overlay specification when enclosed within square brackets. The latter overlay specification when enclosed within square brackets. The latter
specifies options for the current frame. Though, @code{fragile} option is specifies options@footnote{The @code{fragile} option is added automatically
added automatically if it contains source code that uses any verbatim if it contains code that requires a verbatim environment, though.} for the
environment. current frame or block. The export back-end will automatically wrap
properties within angular or square brackets when appropriate.
@cindex property, BEAMER_COL @cindex property, BEAMER_COL
Moreover, headlines handle the @code{BEAMER_COL} property. Its value should Moreover, headlines handle the @code{BEAMER_COL} property. Its value should