From: Holger Schurig <holgerschurig@gmail.com>
Date: Thu, 1 Jul 2010 08:51:29 +0000 (+0200)
Subject: misc re-orderings
X-Git-Url: https://oss.titaniummirror.com/gitweb?p=webber.git;a=commitdiff_plain;h=f26570a949a585b131e0be8eda39b522de0a7548

misc re-orderings
---

diff --git a/in/index.md b/in/index.md
index 29d57b7..7952eb3 100644
--- a/in/index.md
+++ b/in/index.md
@@ -6,6 +6,7 @@ mtime: 2009-06-24
 * [[configuration]]
  * [[commandline]]
  * [[inheritance]]
+* [[inheritance]]
 * [[Plugins]]
  * [[read_rst]]
  * [[read_markdown]]
diff --git a/in/pageformat.md b/in/pageformat.md
index e032481..0fc91b5 100644
--- a/in/pageformat.md
+++ b/in/pageformat.md
@@ -26,8 +26,8 @@ by "`file.XXXX`" and you're free to invent your own keywords:
 
 	Hi, I'm Mario and I won't tell you more about me :-)
 
-Now you can access "`${file.subtitle}`" in your template and as
-"`params.file.subtitle`" in your own [[macros|macros]] or
+Now you can access "`${file.subtitle}`" in your template or
+"`params.file.subtitle`" in your [[macros|macros]] and
 [[functions|functions]].
 
 
@@ -68,6 +68,12 @@ breadcrumbs and a side-menu.
 Used by [[hierarchy]] to indicate relationship.
 
 
+== links ==
+
+Used by [[hierarchy]] to indicate relationship. Usually it's better to use
+"`parent`" instead.
+
+
 == order ==
 
 All pages with the same "`parent`" will end up below the parent on the
@@ -78,11 +84,6 @@ If you don't want this default sort order, you can specify your own ordering.
 The default order is 100, so anything with a lower order will show up on the
 top, anything higher at the bottom of the side-menu.
 
-== links ==
-
-Used by [[hierarchy]] to indicate relationship. Usually it's better to use
-"`parent`" instead.
-
 
 == ctime ==
 
diff --git a/webber.py b/webber.py
index 07136de..3ab9178 100644
--- a/webber.py
+++ b/webber.py
@@ -477,9 +477,9 @@ def read_file(direc, file):
 		return_holder=False)
 	if not contents:
 		return
+	file.contents = contents
 
 	log("filtering file %s" % file.rel_path, level=6)
-	file.contents = contents
 	res = run_hooks("filter",
 		direc=direc,
 		file=file)