diff --git a/docs/archetypes/default.md b/docs/archetypes/default.md
index d83d98445..6d6497c4d 100644
--- a/docs/archetypes/default.md
+++ b/docs/archetypes/default.md
@@ -1,6 +1,4 @@
+++
-date = "2013-07-01"
-title = "Title of the Content"
weight = 5
[menu]
[menu.main]
diff --git a/docs/content/content/example.md b/docs/content/content/example.md
index 03487f4c5..2fc070151 100644
--- a/docs/content/content/example.md
+++ b/docs/content/content/example.md
@@ -14,35 +14,33 @@ Somethings are better shown than explained. The following is a very basic exampl
**mysite/project/nitro.md <- http://mysite.com/project/nitro.html**
-{{% highlight yaml %}}
----
-Title: "Nitro : A quick and simple profiler for Go"
-Description: "Nitro is a simple profiler for you go lang applications"
-Tags: [ "Development", "Go", "profiling" ]
-date: "2013-06-19"
-Topics: [ "Development", "Go" ]
-Slug: "nitro"
-project_url: "http://github.com/spf13/nitro"
----
+ ---
+ Title: "Nitro : A quick and simple profiler for Go"
+ Description: "Nitro is a simple profiler for you go lang applications"
+ Tags: [ "Development", "Go", "profiling" ]
+ date: "2013-06-19"
+ Topics: [ "Development", "Go" ]
+ Slug: "nitro"
+ project_url: "http://github.com/spf13/nitro"
+ ---
-# Nitro
+ # Nitro
-Quick and easy performance analyzer library for Go.
+ Quick and easy performance analyzer library for Go.
-## Overview
+ ## Overview
-Nitro is a quick and easy performance analyzer library for Go.
-It is useful for comparing A/B against different drafts of functions
-or different functions.
+ Nitro is a quick and easy performance analyzer library for Go.
+ It is useful for comparing A/B against different drafts of functions
+ or different functions.
-## Implementing Nitro
+ ## Implementing Nitro
-Using Nitro is simple. First use go get to install the latest version
-of the library.
+ Using Nitro is simple. First use go get to install the latest version
+ of the library.
- $ go get github.com/spf13/nitro
+ $ go get github.com/spf13/nitro
-Next include nitro in your application.
+ Next include nitro in your application.
-{{% /highlight %}}
diff --git a/docs/content/content/front-matter.md b/docs/content/content/front-matter.md
index fd600f720..e67dafd98 100644
--- a/docs/content/content/front-matter.md
+++ b/docs/content/content/front-matter.md
@@ -19,53 +19,47 @@ Supported formats:
### YAML Example
-{{% highlight yaml %}}
----
-title: "spf13-vim 3.0 release and new website"
-description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-date: "2012-04-06"
-categories:
- - "Development"
- - "VIM"
-slug: "spf13-vim-3-0-release-and-new-website"
----
-Content of the file goes Here
-{{% /highlight %}}
+ ---
+ title: "spf13-vim 3.0 release and new website"
+ description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
+ tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
+ date: "2012-04-06"
+ categories:
+ - "Development"
+ - "VIM"
+ slug: "spf13-vim-3-0-release-and-new-website"
+ ---
+ Content of the file goes Here
### TOML Example
-{{% highlight yaml %}}
-+++
-title = "spf13-vim 3.0 release and new website"
-description = "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-tags = [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-date = "2012-04-06"
-categories = [
- "Development",
- "VIM"
-]
-slug = "spf13-vim-3-0-release-and-new-website"
-+++
-Content of the file goes Here
-{{% /highlight %}}
+ +++
+ title = "spf13-vim 3.0 release and new website"
+ description = "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
+ tags = [ ".vimrc", "plugins", "spf13-vim", "vim" ]
+ date = "2012-04-06"
+ categories = [
+ "Development",
+ "VIM"
+ ]
+ slug = "spf13-vim-3-0-release-and-new-website"
+ +++
+ Content of the file goes Here
### JSON Example
-{{% highlight json %}}
-{
- "title": "spf13-vim 3.0 release and new website",
- "description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
- "tags": [ ".vimrc", "plugins", "spf13-vim", "vim" ],
- "date": "2012-04-06",
- "categories": [
- "Development",
- "VIM"
- ],
- "slug": "spf13-vim-3-0-release-and-new-website",
-}
-Content of the file goes Here
-{{% /highlight %}}
+ {
+ "title": "spf13-vim 3.0 release and new website",
+ "description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
+ "tags": [ ".vimrc", "plugins", "spf13-vim", "vim" ],
+ "date": "2012-04-06",
+ "categories": [
+ "Development",
+ "VIM"
+ ],
+ "slug": "spf13-vim-3-0-release-and-new-website",
+ }
+ Content of the file goes Here
## Variables
diff --git a/docs/content/content/ordering.md b/docs/content/content/ordering.md
index 93a66441d..926a539fd 100644
--- a/docs/content/content/ordering.md
+++ b/docs/content/content/ordering.md
@@ -10,13 +10,15 @@ weight: 60
In Hugo you have a good degree of control of how your content can be ordered.
-By default, content is ordered by weight, then by date with the most recent date first, but alternative sorting (by title and linktitle) is also available.
+By default, content is ordered by weight, then by date with the most recent
+date first, but alternative sorting (by title and linktitle) is also available.
_Both the date and weight fields are optional._
-Unweighted pages appear at the end of the list.
-If no weights are provided (or if weights are the same) date will be used to sort. If neither are provided
-content will be ordered based on how it's read off the disk and no order is guaranteed.
+Unweighted pages appear at the end of the list. If no weights are provided (or
+if weights are the same) date will be used to sort. If neither are provided
+content will be ordered based on how it's read off the disk and no order is
+guaranteed.
## Assigning Weight to content
@@ -29,81 +31,67 @@ content will be ordered based on how it's read off the disk and no order is guar
## Order by Weight -> Date (default)
-{{% highlight html %}}
-{{ range .Data.Pages }}
-
+ {{ end }}
## Reverse Order
Can be applied to any of the above. Using Date for an example.
-{{% highlight html %}}
-{{ range .Data.Pages.ByDate.Reverse }}
-
+ {{ end }}
## Ordering Content Within Indexes
diff --git a/docs/content/content/types.md b/docs/content/content/types.md
index 72291d43a..0448e0267 100644
--- a/docs/content/content/types.md
+++ b/docs/content/content/types.md
@@ -13,7 +13,6 @@ of meta data and template. A good example of when multiple types are
needed is to look at Tumblr. A piece of content could be a photo, quote
or post, each with different meta data and rendered differently.
-
## Defining a content type
Creating a new content type is easy in Hugo. You simply provide the
@@ -49,6 +48,3 @@ this then each new piece of content you place into a section will automatically
inherit the type.
Alternatively you can set the type in the meta data under the key "type".
-
-
-
diff --git a/docs/content/extras/aliases.md b/docs/content/extras/aliases.md
index f96740018..c2d6eb01c 100644
--- a/docs/content/extras/aliases.md
+++ b/docs/content/extras/aliases.md
@@ -18,13 +18,12 @@ Luckily, this can be handled easily with aliases in Hugo.
## Example
**content/posts/my-awesome-blog-post.md**
-{{% highlight yaml %}}
----
-aliases:
- - /posts/my-original-url/
- - /2010/even-earlier-url.html
----
-{{% /highlight %}}
+
+ ---
+ aliases:
+ - /posts/my-original-url/
+ - /2010/even-earlier-url.html
+ ---
Now when you go to any of the aliases locations they
will redirect to the page.
diff --git a/docs/content/extras/highlighting.md b/docs/content/extras/highlighting.md
index 0f82202bc..6183ee429 100644
--- a/docs/content/extras/highlighting.md
+++ b/docs/content/extras/highlighting.md
@@ -24,8 +24,7 @@ silently simply pass the content along unhighlighted.
### Disclaimers
- * **Warning** pygments is relatively slow and our integration isn't
-as optimized as it could be. Expect much longer build times when using server side highlighting.
+ * **Warning** pygments is relatively slow. Expect much longer build times when using server side highlighting.
* Languages available depends on your pygments installation.
* Styles are inline in order to be supported in syndicated content when references
to style sheets are not carried over.
@@ -40,8 +39,9 @@ Highlight takes exactly one required parameter of language and requires a
closing shortcode.
### Example
-{{% highlight html %}}
- {{% highlight html %}}
+The example has an extra space between the “{{” and “%” characters to prevent rendering here.
+
+ {{ % highlight html %}}
{{ .Title }}
@@ -50,22 +50,19 @@ closing shortcode.
{{ end }}
- {{% /highlight %}}
-{{% /highlight %}}
+ {{ % /highlight %}}
### Example Output
-{{% highlight html %}}
-<sectionid="main">
- <div>
- <h1id="title">{{ .Title }}</h1>
- {{ range .Data.Pages }}
- {{ .Render "summary"}}
- {{ end }}
- </div>
-</section>
-{{% /highlight %}}
+ <sectionid="main">
+ <div>
+ <h1id="title">{{ .Title }}</h1>
+ {{ range .Data.Pages }}
+ {{ .Render "summary"}}
+ {{ end }}
+ </div>
+ </section>
## Client-side
@@ -74,10 +71,10 @@ Alternatively, code highlighting can be done in client-side JavaScript.
Client-side syntax highlighting is very simple to add. You'll need to pick
a library and a corresponding theme. Some popular libraries are:
+- [Highlight.js]
- [Rainbow]
- [Syntax Highlighter]
- [Google Prettify]
-- [Highlight.js]
This example uses the popular [Highlight.js] library, hosted by [Yandex], a
popular Russian search engine.
@@ -86,17 +83,15 @@ In your `./layouts/chrome/` folder, depending on your specific theme, there
will be a snippet that will be included in every generated HTML page, such
as `header.html` or `header.includes.html`. Simply add:
-{{% highlight html %}}
-
-
-{{% /highlight %}}
+
+
You can of course use your own copy of these files, typically in `./static/`.
+[Highlight.js]: http://highlightjs.org/
[Rainbow]: http://craig.is/making/rainbows
[Syntax Highlighter]: http://alexgorbatchev.com/SyntaxHighlighter/
[Google Prettify]: https://code.google.com/p/google-code-prettify/
[Yandex]: http://yandex.ru/
-[Highlight.js]: http://highlightjs.org/
Please see individual libraries documentation for how to implement the JavaScript based libraries.
diff --git a/docs/content/extras/shortcodes.md b/docs/content/extras/shortcodes.md
index fa26f4d0a..a72b4b535 100644
--- a/docs/content/extras/shortcodes.md
+++ b/docs/content/extras/shortcodes.md
@@ -37,7 +37,8 @@ Some shortcodes use or require closing shortcodes. Like HTML, the opening and cl
shortcodes match (name only), the closing being prepended with a slash.
Example of a paired shortcode:
-{{% highlight go %}} A bunch of code here {{% /highlight %}}
+
+ {{ % highlight go %}} A bunch of code here {{ % /highlight %}}
## Hugo Shortcodes
@@ -54,8 +55,9 @@ Highlight takes exactly one required parameter of language and requires a
closing shortcode.
#### Example
-{{% highlight html %}}
- {{% highlight html %}}
+The example has an extra space between the “{{” and “%” characters to prevent rendering here.
+
+ {{ % highlight html %}}
{{ .Title }}
@@ -64,13 +66,11 @@ closing shortcode.
{{ end }}
- {{% /highlight %}}
-{{% /highlight %}}
+ {{ % /highlight %}}
#### Example Output
-{{% highlight html %}}
<sectionid="main"><div><h1id="title">{{ .Title }}</h1>
@@ -79,7 +79,6 @@ closing shortcode.
{{ end }}
</div></section>
-{{% /highlight %}}
### figure
Figure is simply an extension of the image capabilities present with Markdown.
@@ -98,16 +97,18 @@ figure can use the following parameters
* alt
#### Example
+*Example has an extra space so Hugo doesn't actually render it*.
-{{% highlight html %}}
- {{% figure src="/media/spf13.jpg" title="Steve Francia" %}}
-{{% /highlight %}}
+ {{ % figure src="/media/spf13.jpg" title="Steve Francia" %}}
#### Example output
-{{% highlight html %}}
-
-{{% /highlight %}}
+
## Creating your own shortcodes
@@ -173,6 +174,7 @@ This would be rendered as
{{ % img src="/media/spf13.jpg" title="Steve Francia" %}}
Would load the template /layouts/shortcodes/img.html
+