From 8ff95a211532f4917a714bf029fedef52ae338db Mon Sep 17 00:00:00 2001
From: Lakshmi Vyasarajan <lakshmi.vyas@gmail.com>
Date: Sun, 13 Mar 2011 16:01:56 +0530
Subject: [PATCH] Fixes to README and syntax html

---
 README.markdown             | 9 ++++-----
 hyde/ext/templates/jinja.py | 6 ++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.markdown b/README.markdown
index 530020f..5da14eb 100644
--- a/README.markdown
+++ b/README.markdown
@@ -4,11 +4,9 @@ Version 0.8b1
 
 This is the new version of hyde under active development. Incomplete documentation
 can be found [here][hydedocs]. [This][hyde1-0] should give a good understanding of
-the motivation behind this version. You can also take a look at the
-[documentation source][docs] for a reference implementation.
+the motivation behind this version.
 
 [hyde1-0]: http://groups.google.com/group/hyde-dev/web/hyde-1-0
-[docs]: https://github.com/hyde/hyde/tree/master/hyde/layouts/doc
 [hydedocs]: http://hyde.github.com/overview
 
 [Here](http://groups.google.com/group/hyde-dev/browse_thread/thread/2a143bd2081b3322) is
@@ -50,8 +48,9 @@ you can make changes to your source and refresh the browser to view the changes.
 
 ## Examples
 
-1. [Cloudpanic](https://github.com/tipiirai/cloudpanic)
-2. [Ringce](https://github.com/lakshmivyas/ringce/tree/v3.0)
+1. [Hyde Documentation](https://github.com/hyde/docs)
+2. [Cloudpanic](https://github.com/tipiirai/cloudpanic)
+3. [Ringce](https://github.com/lakshmivyas/ringce/tree/v3.0)
 
 ## A brief list of features
 
diff --git a/hyde/ext/templates/jinja.py b/hyde/ext/templates/jinja.py
index 57d737c..05b8c8b 100644
--- a/hyde/ext/templates/jinja.py
+++ b/hyde/ext/templates/jinja.py
@@ -65,8 +65,10 @@ def markdown(env, value):
                                         'extension_configs',
                                         Expando({})).to_dict()
     marked = md.Markdown(**d)
+
     return marked.convert(output)
 
+
 @environmentfilter
 def syntax(env, value, lexer=None, filename=None):
     """
@@ -95,8 +97,8 @@ def syntax(env, value, lexer=None, filename=None):
     code = code.replace('\n\n', '\n&nbsp;\n').replace('\n', '<br />')
     caption = filename if filename else pyg.name
     return Markup(
-            '<figure class="code"><figcaption>%s</figcaption>%s</figure>\n\n'
-                        % (caption, code))
+            '<figure class="code">%s<figcaption>%s</figcaption></figure>\n\n'
+                        % (code, caption))
 
 class Spaceless(Extension):
     """