0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 21:46:27 +00:00

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
David Maus 2011-11-23 21:35:47 +01:00
commit e401ec09ec

View file

@ -11692,8 +11692,8 @@ The following sections describe Org-mode's code block handling facilities.
@cindex #+BEGIN_SRC
Live code blocks can be specified with a @samp{src} block or
inline@footnote{Note that @samp{src} blocks may be inserted using Org-mode's
@ref{Easy Templates} system}. The structure of a @samp{src} block is
inline.@footnote{Note that @samp{src} blocks may be inserted using Org-mode's
@ref{Easy Templates} system} The structure of a @samp{src} block is
@example
#+NAME: <name>
@ -12125,13 +12125,15 @@ syntax}), which can be set on a buffer-wide or per-heading basis. An example
of setting a header argument for all code blocks in a buffer is
@example
#+property: tangle yes
#+PROPERTY: tangle yes
@end example
@vindex org-use-property-inheritance
When properties are used to set default header arguments, they are looked up
with inheritance, so the value of the @code{:cache} header argument will default
to @code{yes} in all code blocks in the subtree rooted at the following
heading:
with inheritance, regardless of the value of
@code{org-use-property-inheritance}. In the following example the value of
the @code{:cache} header argument will default to @code{yes} in all code
blocks in the subtree rooted at the following heading:
@example
* outline header