summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dye <dk@poto.westell.com>2011-11-23 08:34:31 -1000
committerEric Schulte <schulte.eric@gmail.com>2011-11-23 12:39:44 -0700
commit38f70b7e259135efdb9fd2660115f123180d1ecf (patch)
tree40c2fe0e117e4768e4ce868cf821cea8cb331164
parentc52c23fdfd36a5739c1faec120738224ba6b0c3d (diff)
downloadorg-mode-38f70b7e259135efdb9fd2660115f123180d1ecf.tar.gz
* doc/org.texi: Augmented discussion of babel property inheritance. Put footnote outside sentence ending period.
-rw-r--r--doc/org.texi14
1 files changed, 8 insertions, 6 deletions
diff --git a/doc/org.texi b/doc/org.texi
index baa0dca..fdad8ba 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -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