some more small release changes
--HG--
branch : trunk
rename : docs/build/jinjabanner.png => docs/html/jinjabanner.png
rename : docs/build/jinjalogo.png => docs/html/jinjalogo.png
rename : docs/build/style.css => docs/html/style.css
rename : docs/build/watermark.png => docs/html/watermark.png
diff --git a/docs/generate.py b/docs/generate.py
index 6b6b0ac..8d9f3a0 100755
--- a/docs/generate.py
+++ b/docs/generate.py
@@ -317,7 +317,7 @@
f.close()
-def main(dst='build/', preproc=False, *sources):
+def main(dst='html/', preproc=False, *sources):
run(os.path.realpath(dst), str(preproc).lower() == 'true', sources)
diff --git a/docs/build/jinjabanner.png b/docs/html/jinjabanner.png
similarity index 100%
rename from docs/build/jinjabanner.png
rename to docs/html/jinjabanner.png
Binary files differ
diff --git a/docs/build/jinjalogo.png b/docs/html/jinjalogo.png
similarity index 100%
rename from docs/build/jinjalogo.png
rename to docs/html/jinjalogo.png
Binary files differ
diff --git a/docs/build/style.css b/docs/html/style.css
similarity index 100%
rename from docs/build/style.css
rename to docs/html/style.css
diff --git a/docs/build/watermark.png b/docs/html/watermark.png
similarity index 100%
rename from docs/build/watermark.png
rename to docs/html/watermark.png
Binary files differ
diff --git a/docs/src/designerdoc.txt b/docs/src/designerdoc.txt
index 978565a..cc0cbde 100644
--- a/docs/src/designerdoc.txt
+++ b/docs/src/designerdoc.txt
@@ -281,7 +281,7 @@
inline `if` / `else` expression. The following two examples evaluate to the
same:
-.. source:: jinja
+.. sourcecode:: jinja
{{ "something" if expr else "otherthing" }}
diff --git a/docs/src/frameworks.txt b/docs/src/frameworks.txt
index 88aafea..96a1cfa 100644
--- a/docs/src/frameworks.txt
+++ b/docs/src/frameworks.txt
@@ -223,7 +223,7 @@
{{ render_author_details('John Doe') }}
-``clean_inclusion (func, template[, name[, run_processors]]) ``
+``clean_inclusion (func, template[, name[, run_processors]])``
Works like `context_inclusion` but doesn't use the calles
context but an empty context. If `run_processors` is `True`
it will lookup the context for a `request` object and pass
