Merge branch 'master' of github.com:hyde/hyde

hyde/layouts/doc/content/configuration.html

@@ -152,13 +152,10 @@ markdown:
         - headerid
 ~~~~~~~~~~
 
-will use the [def_list][], [tables][] and [headerid][] extensions in python markdown.
+will use the def_list, tables and headerid extensions in python markdown.
 
 
-[commandline]: [[commandline]]
-[plugins]: [[plugins]]
+[commandline]: [[commandline.html]]
+[plugins]: [[plugins.html]]
 [pymarkdown]: http://www.freewisdom.org/projects/python-markdown/Available_Extensions
-[hydedocpages]: https://github.com/hydepy/hyde/blob/master/hyde/layouts/doc/pages.yaml
-[def_list]: http://www.freewisdom.org/projects/python-markdown/Definition_Lists
-[headerid]: http://www.freewisdom.org/projects/python-markdown/HeaderId
-[tables]: http://www.freewisdom.org/projects/python-markdown/Tables
+[hydedocpages]: https://github.com/hyde/hyde/blob/master/hyde/layouts/doc/pages.yaml

hyde/layouts/doc/content/install.html

@@ -9,7 +9,7 @@ created: 2011-01-26 23:17:44
 Installing hyde is as simple as running the following command:
 
 ~~~sh~~~
-pip install -e git://github.com/hydepy/hyde.git#egg=hyde
+pip install -e git://github.com/hyde/hyde.git#egg=hyde
 ~~~~~~~~
 
 However, based on your choice and use of plugins you may need to install
@@ -53,7 +53,7 @@ pip install markdown
 pip install pyyaml
 pip install pygments
 pip  install smartypants
-pip install -e git://github.com/hydepy/typogrify#egg=typogrify
+pip install -e git://github.com/hyde/typogrify#egg=typogrify
 ~~~~~~~~
 
 [plugins]: [[plugins]]

hyde/layouts/doc/content/overview.html

@@ -33,7 +33,7 @@ There will be a package soon on pypi, but this works for now:
 
 ~~~sh~~~
 
-pip install -e https://github.com/hydepy/hyde#egg=hyde
+pip install -e https://github.com/hyde/hyde#egg=hyde
 
 ~~~~~~~~
 
@@ -70,7 +70,7 @@ or run `hyde -h`.
 
 ## Source
 
-Hyde is [socially coded][hydepy]. Feel free to [fork][forking].
+Hyde is [socially coded][hyde]. Feel free to [fork][forking].
 
 ## Project Roadmap
 
@@ -98,7 +98,7 @@ Hyde is [socially coded][hydepy]. Feel free to [fork][forking].
 [evil twin]: http://ringce.com/blog/2009/introducing_hyde
 [Jinja2]: http://jinja.pocoo.org/
 [object model]: [[template/#variables]]
-[hydepy]: https://github.com/hydepy/hyde
+[hyde]: https://github.com/hyde/hyde
 [install]: [[install]]
 [metadata]: [[plugins/metadata]]
 [plugins]: [[plugins]]