Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'maint'

  • Loading branch information...
commit 5a78f12866e94d435bce541b05a2dc198eccdb97 2 parents aff4f10 + 6541e16
ngz ngz authored
Showing with 9 additions and 10 deletions.
  1. +9 −10 doc/org.texi
19 doc/org.texi
View
@@ -10108,13 +10108,11 @@ the sun is R_@{sun@} = 6.96 x 10^8 m.
@end example
@vindex org-use-sub-superscripts
-To avoid interpretation as raised or lowered text, you can quote @samp{^} and
-@samp{_} with a backslash: @samp{\^} and @samp{\_}. If you write a text
-where the underscore is often used in a different context, Org's convention
-to always interpret these as subscripts can get in your way. Configure the
-variable @code{org-use-sub-superscripts} to change this convention. For
-example, when setting this variable to @code{@{@}}, @samp{a_b} will not be
-interpreted as a subscript, but @samp{a_@{b@}} will.
+If you write a text where the underscore is often used in a different
+context, Org's convention to always interpret these as subscripts can get in
+your way. Configure the variable @code{org-use-sub-superscripts} to change
+this convention. For example, when setting this variable to @code{@{@}},
+@samp{a_b} will not be interpreted as a subscript, but @samp{a_@{b@}} will.
@table @kbd
@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.
The former is translated as an overlay/action specification, or a default
overlay specification when enclosed within square brackets. The latter
-specifies options for the current frame. Though, @code{fragile} option is
-added automatically if it contains source code that uses any verbatim
-environment.
+specifies options@footnote{The @code{fragile} option is added automatically
+if it contains code that requires a verbatim environment, though.} for the
+current frame or block. The export back-end will automatically wrap
+properties within angular or square brackets when appropriate.
@cindex property, BEAMER_COL
Moreover, headlines handle the @code{BEAMER_COL} property. Its value should
Please sign in to comment.
Something went wrong with that request. Please try again.