Merge branch 't/patch423' into brian

This commit is contained in:
Carsten Dominik 2010-12-04 19:12:35 +01:00
commit 1cb57f37fd
1 changed files with 3 additions and 3 deletions

View File

@ -768,8 +768,8 @@ As a project planning environment, Org works by adding metadata to outline
nodes. Based on this data, specific entries can be extracted in queries and nodes. Based on this data, specific entries can be extracted in queries and
create dynamic @i{agenda views}. create dynamic @i{agenda views}.
Org mode contains the Org Babel environment which allows to work with Org mode contains the Org Babel environment which allows you to work with
embedded source code block in a file, to facilitate code evaluation, embedded source code blocks in a file, to facilitate code evaluation,
documentation, and tangling. documentation, and tangling.
Org's automatic, context-sensitive table editor with spreadsheet Org's automatic, context-sensitive table editor with spreadsheet
@ -4769,7 +4769,7 @@ a regular expression and matched against the property values.
@cindex inheritance, of properties @cindex inheritance, of properties
@vindex org-use-property-inheritance @vindex org-use-property-inheritance
The outline structure of Org-mode documents lends itself for an The outline structure of Org-mode documents lends itself to an
inheritance model of properties: if the parent in a tree has a certain inheritance model of properties: if the parent in a tree has a certain
property, the children can inherit this property. Org-mode does not property, the children can inherit this property. Org-mode does not
turn this on by default, because it can slow down property searches turn this on by default, because it can slow down property searches