diff --git a/docs/content/content/organization.md b/docs/content/content/organization.md
index bf32aa699..7b887ef78 100644
--- a/docs/content/content/organization.md
+++ b/docs/content/content/organization.md
@@ -67,7 +67,7 @@ This isn't in the front matter, but is the actual name of the file minus the
extension. This will be the name of the file in the destination.
### slug
-Defined in the front matter, the slug can take the place of the filename for the
+Defined in the front matter, the `slug` can take the place of the filename for the
destination.
### filepath
@@ -75,18 +75,18 @@ The actual path to the file on disk. Destination will create the destination
with the same path. Includes [section](/content/sections/).
### section
-section can be provided in the front matter overriding the section derived from
+`section` can be provided in the front matter overriding the section derived from
the source content location on disk. See [section](/content/sections/).
### path
-path can be provided in the front matter. This will replace the actual
+`path` can be provided in the front matter. This will replace the actual
path to the file on disk. Destination will create the destination with the same
path. Includes [section](/content/sections/).
### url
A complete URL can be provided. This will override all the above as it pertains
-to the end destination. This must be the path from the baseurl (starting with a "/").
-When a url is provided, it will be used exactly. Using url will ignore the
+to the end destination. This must be the path from the baseURL (starting with a "/").
+When a `url` is provided, it will be used exactly. Using `url` will ignore the
`--uglyUrls` setting.
@@ -116,27 +116,27 @@ When a url is provided, it will be used exactly. Using url will ignore the
http://spf13.com/projects/hugo
- baseUrl section slug
+ baseURL section slug
⊢-----^--------⊣ ⊢--^---⊣ ⊢-^⊣
http://spf13.com/projects/hugo
- baseUrl section slug
+ baseURL section slug
⊢-----^--------⊣ ⊢--^--⊣ ⊢--^--⊣
http://spf13.com/extras/indexes/example
- baseUrl path slug
+ baseURL path slug
⊢-----^--------⊣ ⊢------^-----⊣ ⊢--^--⊣
http://spf13.com/extras/indexes/example
- baseUrl url
+ baseURL url
⊢-----^--------⊣ ⊢-----^-----⊣
http://spf13.com/projects/hugo
- baseUrl url
+ baseURL url
⊢-----^--------⊣ ⊢--------^-----------⊣
http://spf13.com/extras/indexes/example
diff --git a/docs/content/extras/dynamiccontent.md b/docs/content/extras/dynamiccontent.md
index 45fe2efd2..9691ede33 100644
--- a/docs/content/extras/dynamiccontent.md
+++ b/docs/content/extras/dynamiccontent.md
@@ -19,8 +19,8 @@ any [JSON](http://www.json.org/) or
[CSV](http://en.wikipedia.org/wiki/Comma-separated_values) file
from nearly any resource.
-"Dynamic Content" currently consists of two functions, `getJson`
-and `getCsv`, which are available in **all template files**.
+"Dynamic Content" currently consists of two functions, `getJSON`
+and `getCSV`, which are available in **all template files**.
## Implementation details
@@ -28,33 +28,33 @@ and `getCsv`, which are available in **all template files**.
In any HTML template or Markdown document, call the functions like this:
- {{ $dataJ := getJson "url" }}
- {{ $dataC := getCsv "separator" "url" }}
+ {{ $dataJ := getJSON "url" }}
+ {{ $dataC := getCSV "separator" "url" }}
or, if you use a prefix or postfix for the URL, the functions
accept [variadic arguments](http://en.wikipedia.org/wiki/Variadic_function):
- {{ $dataJ := getJson "url prefix" "arg1" "arg2" "arg n" }}
- {{ $dataC := getCsv "separator" "url prefix" "arg1" "arg2" "arg n" }}
+ {{ $dataJ := getJSON "url prefix" "arg1" "arg2" "arg n" }}
+ {{ $dataC := getCSV "separator" "url prefix" "arg1" "arg2" "arg n" }}
-The separator for `getCsv` must be put in the first position and can only
+The separator for `getCSV` must be put in the first position and can only
be one character long.
All passed arguments will be joined to the final URL; for example:
{{ $urlPre := "https://api.github.com" }}
- {{ $gistJ := getJson $urlPre "/users/GITHUB_USERNAME/gists" }}
+ {{ $gistJ := getJSON $urlPre "/users/GITHUB_USERNAME/gists" }}
will resolve internally to:
- {{ $gistJ := getJson "https://api.github.com/users/GITHUB_USERNAME/gists" }}
+ {{ $gistJ := getJSON "https://api.github.com/users/GITHUB_USERNAME/gists" }}
Finally, you can range over an array. This example will output the
first 5 gists for a GitHub user:
@@ -65,7 +65,7 @@ first 5 gists for a GitHub user:
### Example for CSV files
-For `getCsv`, the one-character long separator must be placed in the
+For `getCSV`, the one-character long separator must be placed in the
first position followed by the URL.
@@ -79,7 +79,7 @@ first position followed by the URL.
{{ $url := "http://a-big-corp.com/finance/employee-salaries.csv" }}
{{ $sep := "," }}
- {{ range $i, $r := getCsv $sep $url }}
+ {{ range $i, $r := getCSV $sep $url }}
{{ index $r 0 }}
{{ index $r 1 }}
@@ -113,7 +113,7 @@ other authentication methods are not implemented.
### Loading local files
-To load local files with the two functions `getJson` and `getCsv`, the
+To load local files with the two functions `getJSON` and `getCSV`, the
source files must reside within Hugo's working directory. The file
extension does not matter but the content.
diff --git a/docs/content/extras/menus.md b/docs/content/extras/menus.md
index c751f8326..c7450547e 100644
--- a/docs/content/extras/menus.md
+++ b/docs/content/extras/menus.md
@@ -27,7 +27,7 @@ access it via `.Site.Menus.main`.
A menu entry has the following properties:
-* **Url** string
+* **URL** string
* **Name** string
* **Menu** string
* **Identifier** string
@@ -112,15 +112,15 @@ And the equivalent example `config.yaml`:
Pre: ""
Weight: -110
Identifier: "about"
- Url: "/about/"
+ URL: "/about/"
- Name: "getting started"
Pre: ""
Weight: -100
- Url: "/getting-started/"
+ URL: "/getting-started/"
---
-**NOTE:** The urls must be relative to the context root. If the `BaseUrl` is `http://example.com/mysite/`, then the urls in the menu must not include the context root `mysite`.
+**NOTE:** The URLs must be relative to the context root. If the `BaseURL` is `http://example.com/mysite/`, then the URLs in the menu must not include the context root `mysite`.
## Nesting
@@ -164,12 +164,12 @@ The following is an example:
-
+
{{ .Pre }}
{{ .Name }}
diff --git a/docs/content/extras/pagination.md b/docs/content/extras/pagination.md
index 95c915b58..598f4b077 100644
--- a/docs/content/extras/pagination.md
+++ b/docs/content/extras/pagination.md
@@ -17,16 +17,16 @@ Hugo supports pagination for the home page, sections and taxonomies. It's built
Pagination can be configured in the site configuration (e.g. `config.toml`):
-* `Paginate` (default `10`)
+* `Paginate` (default `10`)
* `PaginatePath` (default `page`)
Setting `Paginate` to a positive value will split the list pages for the home page, sections and taxonomies into chunks of that size. But note that the generation of the pagination pages for sections, taxonomies and home page is *lazy* --- the pages will not be created if not referenced by a `.Paginator` (see below).
- `PaginatePath` is used to adapt the `Url` to the pages in the paginator (the default setting will produce urls on the form `/page/1/`.
+`PaginatePath` is used to adapt the `URL` to the pages in the paginator (the default setting will produce URLs on the form `/page/1/`.
## List the pages
-**A `.Paginator` is provided to help building a pager menu. This is only relevant for the templates for the home page and the list pages (sections and taxonomies).**
+**A `.Paginator` is provided to help building a pager menu. This is only relevant for the templates for the home page and the list pages (sections and taxonomies).**
There are two ways to configure and use a `.Paginator`:
@@ -37,7 +37,7 @@ For a given **Node**, it's one of the options above. The `.Paginator` is static
## Build the navigation
-The `.Paginator` contains enough information to build a paginator interface.
+The `.Paginator` contains enough information to build a paginator interface.
The easiest way to add this to your pages is to include the built-in template (with `Bootstrap`-compatible styles):
@@ -67,7 +67,7 @@ Without the where-filter, the above is simpler:
If you want to build custom navigation, you can do so using the `.Paginator` object:
* `PageNumber`: The current page's number in the pager sequence
-* `Url`: The relative Url to the current pager
+* `URL`: The relative URL to the current pager
* `Pages`: The pages in the current pager
* `NumberOfElements`: The number of elements on this page
* `HasPrev`: Whether there are page(s) before the current
diff --git a/docs/content/overview/configuration.md b/docs/content/overview/configuration.md
index 8122b543c..ce9107a8c 100644
--- a/docs/content/overview/configuration.md
+++ b/docs/content/overview/configuration.md
@@ -40,11 +40,11 @@ The following is an example of a toml config file with some of the default value
builddrafts = false
baseurl = "http://yoursite.example.com/"
canonifyurls = true
-
+
[taxonomies]
category = "categories"
tag = "tags"
-
+
[params]
description = "Tesla's Awesome Hugo Site"
author = "Nikola Tesla"
@@ -74,67 +74,67 @@ Following is a list of Hugo-defined variables that you can configure and their c
---
archetypedir: "archetype"
# hostname (and path) to the root eg. http://spf13.com/
- baseurl: ""
+ baseURL: ""
# include content marked as draft
- buildDrafts: false
+ buildDrafts: false
# include content with datePublished in the future
- buildFuture: false
- canonifyUrls: false
+ buildFuture: false
+ canonifyURLs: false
# config file (default is path/config.yaml|json|toml)
- config: "config.toml"
+ config: "config.toml"
contentdir: "content"
dataDir: "data"
defaultExtension: "html"
defaultLayout: "post"
# filesystem path to write files to
- destination: ""
+ destination: ""
disableLiveReload: false
# Do not build RSS files
- disableRSS: false
+ disableRSS: false
# Do not build Sitemap file
- disableSitemap: false
+ disableSitemap: false
# edit new content with this editor, if provided
- editor: ""
+ editor: ""
footnoteAnchorPrefix: ""
footnoteReturnLinkContents: ""
languageCode: ""
layoutdir: "layouts"
# Enable Logging
- log: false
+ log: false
# Log File path (if set, logging enabled automatically)
- logFile: ""
+ logFile: ""
# "yaml", "toml", "json"
- metaDataFormat: "toml"
+ metaDataFormat: "toml"
newContentEditor: ""
# Don't sync modification time of files
- noTimes: false
+ noTimes: false
paginate: 10
paginatePath: "page"
- permalinks:
+ permalinks:
# Pluralize titles in lists using inflect
- pluralizeListTitles: true
+ pluralizeListTitles: true
publishdir: "public"
# color-codes for highlighting derived from this style
pygmentsStyle: "monokai"
# true: use pygments-css or false: color-codes directly
- pygmentsUseClasses: false
+ pygmentsUseClasses: false
sitemap: ""
- # filesystem path to read files relative from
- source: ""
+ # filesystem path to read files relative from
+ source: ""
staticdir: "static"
# display memory and timing of different steps of the program
- stepAnalysis: false
+ stepAnalysis: false
# theme to use (located in /themes/THEMENAME/)
- theme: ""
+ theme: ""
title: ""
# if true, use /filename.html instead of /filename/
- uglyUrls: false
+ uglyURLs: false
# verbose output
- verbose: false
+ verbose: false
# verbose logging
- verboseLog: false
+ verboseLog: false
# watch filesystem for changes and recreate as needed
- watch: false
+ watch: false
---
diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
index d56b9b396..1d8e8c0d0 100644
--- a/docs/content/taxonomies/displaying.md
+++ b/docs/content/taxonomies/displaying.md
@@ -52,7 +52,7 @@ content.
` (Bad!)
Note: "ZgotmplZ" is a special value that indicates that unsafe content reached a
CSS or URL context.
-### safeUrl
+### safeURL
Declares the provided string as a "safe" URL or URL substring (see [RFC 3986][]).
A URL like `javascript:checkThatFormNotEditedBeforeLeavingPage()` from a trusted
source should go in the page, but by default dynamic `javascript:` URLs are
@@ -325,7 +325,7 @@ filtered out since they are a frequently exploited injection vector.
[RFC 3986]: http://tools.ietf.org/html/rfc3986
-Without `safeUrl`, only the URI schemes `http:`, `https:` and `mailto:`
+Without `safeURL`, only the URI schemes `http:`, `https:` and `mailto:`
are considered safe by Go. If any other URI schemes, e.g. `irc:` and
`javascript:`, are detected, the whole URL would be replaced with
`#ZgotmplZ`. This is to "defang" any potential attack in the URL,
@@ -341,16 +341,16 @@ The following template:
`
for the `irc://…` URL.
-To fix this, add ` | safeUrl` after `.Url` on the 3rd line, like this:
+To fix this, add ` | safeURL` after `.URL` on the 3rd line, like this:
-
`
as intended.
diff --git a/docs/content/templates/go-templates.md b/docs/content/templates/go-templates.md
index fb05282bd..c36f2a843 100644
--- a/docs/content/templates/go-templates.md
+++ b/docs/content/templates/go-templates.md
@@ -236,14 +236,14 @@ Could be rewritten as
By default, Go Templates remove HTML comments from output. This has the unfortunate side effect of removing Internet Explorer conditional comments. As a workaround, use something like this:
- {{ "" | safeHtml }}
+ {{ "" | safeHTML }}
Alternatively, use the backtick (`` ` ``) to quote the IE conditional comments, avoiding the tedious task of escaping every double quotes (`"`) inside, as demonstrated in the [examples](http://golang.org/pkg/text/template/#hdr-Examples) in the Go text/template documentation, e.g.:
```
-{{ `` | safeHtml }}
+{{ `` | safeHTML }}
```
## Context (a.k.a. the dot)
@@ -355,7 +355,7 @@ January 1st, instead of hunting through your templates.
```
{{if .Site.Params.CopyrightHTML}}{{end}}
```
diff --git a/docs/content/templates/homepage.md b/docs/content/templates/homepage.md
index e58fd842f..6c4512512 100644
--- a/docs/content/templates/homepage.md
+++ b/docs/content/templates/homepage.md
@@ -56,7 +56,7 @@ It makes use of [partial templates](/templates/partials/) and uses a similar app
{{ partial "meta.html" . }}
-
+ {{ .Site.Title }}
diff --git a/docs/content/templates/partials.md b/docs/content/templates/partials.md
index fc9c46274..911f6c9c6 100644
--- a/docs/content/templates/partials.md
+++ b/docs/content/templates/partials.md
@@ -60,7 +60,7 @@ This header template is used for [spf13.com](http://spf13.com/):
{{ partial "meta.html" . }}
-
+ {{ .Title }} : spf13.com
{{ if .RSSlink }}{{ end }}
diff --git a/docs/content/templates/sitemap.md b/docs/content/templates/sitemap.md
index 0741f89fc..893139f4b 100644
--- a/docs/content/templates/sitemap.md
+++ b/docs/content/templates/sitemap.md
@@ -39,7 +39,7 @@ Protocol](http://www.sitemaps.org/protocol.html).
{{ range .Data.Pages }}
{{ .Permalink }}
- {{ safeHtml ( .Date.Format "2006-01-02T15:04:05-07:00" ) }}{{ with .Sitemap.ChangeFreq }}
+ {{ safeHTML ( .Date.Format "2006-01-02T15:04:05-07:00" ) }}{{ with .Sitemap.ChangeFreq }}
{{ . }}{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
{{ .Sitemap.Priority }}{{ end }}
diff --git a/docs/content/templates/variables.md b/docs/content/templates/variables.md
index 5e5d34638..8ff46fe9e 100644
--- a/docs/content/templates/variables.md
+++ b/docs/content/templates/variables.md
@@ -72,7 +72,7 @@ includes taxonomies, lists and the homepage.
**.Title** The title for the content.
**.Date** The date the content is published on.
**.Permalink** The Permanent link for this node
-**.Url** The relative URL for this node.
+**.URL** The relative URL for this node.
**.Ref(ref)** Returns the permalink for `ref`. See [cross-references]({{% ref "extras/crossreferences.md" %}}). Does not handle in-page fragments correctly.
**.RelRef(ref)** Returns the relative permalink for `ref`. See [cross-references]({{% ref "extras/crossreferences.md" %}}). Does not handle in-page fragments correctly.
**.RSSLink** Link to the taxonomies' RSS link.
@@ -86,7 +86,7 @@ includes taxonomies, lists and the homepage.
Also available is `.Site` which has the following:
-**.Site.BaseUrl** The base URL for the site as defined in the site configuration file.
+**.Site.BaseURL** The base URL for the site as defined in the site configuration file.
**.Site.Taxonomies** The [taxonomies](/taxonomies/usage/) for the entire site. Replaces the now-obsolete `.Site.Indexes` since v0.11.
**.Site.LastChange** The date of the last change of the most recent content.
**.Site.Pages** Array of all content ordered by Date, newest first. Replaces the now-deprecated `.Site.Recent` starting v0.13.
diff --git a/docs/layouts/partials/menu.html b/docs/layouts/partials/menu.html
index 66b3a0a13..75cba6267 100644
--- a/docs/layouts/partials/menu.html
+++ b/docs/layouts/partials/menu.html
@@ -16,12 +16,12 @@