diff --git a/content/about/features.md b/content/about/features.md
index 2a9af34f8..437308578 100644
--- a/content/about/features.md
+++ b/content/about/features.md
@@ -52,7 +52,7 @@ toc: true
See what's coming next in the [Hugo roadmap][].
-[Ace]: /templates/ace-templating/
+[Ace]: /templates/alternatives/
[aliases]: /content-management/urls/#aliases
[Amber]: https://github.com/eknkc/amber
[content summaries]: /content-management/summaries/
@@ -68,7 +68,7 @@ See what's coming next in the [Hugo roadmap][].
[hostanywhere]: /hosting-and-deployment/
[Hugo roadmap]: /about/roadmap
[install]: /getting-started/installing/
-[LiveReload]: /getting-started/using-hugo/
+[LiveReload]: /getting-started/usage/
[organization for your projects]: /getting-started/directory-structure/
[pagevars]: /variables/page/
[Permalink]: /content-management/urls/#permalinks
diff --git a/content/content-management/archetypes.md b/content/content-management/archetypes.md
index 535aa31c3..6dcbb2075 100644
--- a/content/content-management/archetypes.md
+++ b/content/content-management/archetypes.md
@@ -186,7 +186,7 @@ The preceding archetype is kept up to date with every Hugo build by using Hugo's
[archetypes directory]: /getting-started/directory-structure/
[`now()`]: http://golang.org/pkg/time/#Now
[configuration file]: /getting-started/configuration/
-[sections]: /sections/
+[sections]: /content-management/sections/
[content types]: /content-management/types/
[front matter]: /content-management/front-matter/
[RFC 3339 format]: https://www.ietf.org/rfc/rfc3339.txt
diff --git a/content/content-management/shortcodes.md b/content/content-management/shortcodes.md
index 8d3e4906d..2c46e6af2 100644
--- a/content/content-management/shortcodes.md
+++ b/content/content-management/shortcodes.md
@@ -403,7 +403,7 @@ To learn more about creating your own shortcode templates, see the [shortcode te
[`figure` shortcode]: #figure
[Instagram]: https://www.instagram.com/
[pagevariables]: /variables/page/
-[partials]: /templates/partials-templates/
+[partials]: /templates/partials/
[Pygments]: http://pygments.org/
[quickstart]: /getting-started/quick-start/
[shortcode template documentation]: /templates/shortcode-templates/
diff --git a/content/content-management/taxonomies.md b/content/content-management/taxonomies.md
index f18ef055e..aadbec428 100644
--- a/content/content-management/taxonomies.md
+++ b/content/content-management/taxonomies.md
@@ -248,8 +248,8 @@ Currently taxonomies only support the [default `weight => date` ordering of list
{{% /note %}}
[`urlize` template function]: /functions/urlize/
-[content section]: /content-section/
-[content type]: /content-type/
+[content section]: /content-management/sections/
+[content type]: /content-management/types/
[documentation on archetypes]: /content-management/archetypes/
[front matter]: /content-management/front-matter/
[taxonomy list templates]: /templates/taxonomy-templates/#taxonomy-page-templates
diff --git a/content/content-management/toc.md b/content/content-management/toc.md
index 61d8387c0..c996e9733 100644
--- a/content/content-management/toc.md
+++ b/content/content-management/toc.md
@@ -62,4 +62,4 @@ The following is an example of very basic [single page template][]:
[pagevars]: /variables/page/
[partials]: /templates/partials/
-[single page template]: /templates/single-page-template/
\ No newline at end of file
+[single page template]: /templates/single-page-templates/
\ No newline at end of file
diff --git a/content/functions/with.md b/content/functions/with.md
new file mode 100644
index 000000000..8923a4e7c
--- /dev/null
+++ b/content/functions/with.md
@@ -0,0 +1,28 @@
+---
+title: with
+linktitle: with
+description: Rebinds the context (`.`) within its scope and skips the block if the variable is absent.
+godocref:
+date: 2017-03-12
+publishdate: 2017-03-12
+lastmod: 2017-03-12
+categories: [functions]
+tags: [conditionals,fundamentals]
+signature:
+workson: []
+hugoversion:
+relatedfuncs: []
+deprecated: false
+---
+
+An alternative way of writing the "`if`" and then referencing the same value is to use `with` instead. `with` rebinds the context (`.`) within its scope and skips the block if the variable is absent:
+
+{{% code file="layouts/partials/twitter.html" %}}
+```html
+{{with .Site.Params.TwitterUser}}{{end}}
+```
+{{% /code %}}
diff --git a/content/hosting-and-deployment/deployment-with-wercker.md b/content/hosting-and-deployment/deployment-with-wercker.md
index acdd63865..7ed86ef23 100644
--- a/content/hosting-and-deployment/deployment-with-wercker.md
+++ b/content/hosting-and-deployment/deployment-with-wercker.md
@@ -340,4 +340,4 @@ If you want to see an example of how you can deploy to S3 instead of GitHub page
[hugoconfig]: /getting-started/configuration/
[publicappurl]: https://app.wercker.com/#applications/5586dcbdaf7de9c51b02b0d5
[quickstart]: /getting-started/quick-start/
-[werckerdocs]: (http://devcenter.wercker.com/docs/deploy/s3.html)
\ No newline at end of file
+[werckerdocs]: http://devcenter.wercker.com/docs/deploy/s3.html
\ No newline at end of file
diff --git a/content/news/press-and-articles.md b/content/news/press-and-articles.md
index 58b868e70..936c8f323 100644
--- a/content/news/press-and-articles.md
+++ b/content/news/press-and-articles.md
@@ -61,7 +61,7 @@ Hugo has been featured in the following Blog Posts, Press, and Media.
| [Good-Bye Wordpress, Hello Hugo!](http://blog.arminhanisch.de/2015/08/blog-migration-zu-hugo/) (German) | Armin Hanisch | 2015-08-18 |
| [Static Site E-Commerce: Integrating Snipcart with Hugo](https://snipcart.com/blog/snipcart-hugo-integration) | Francis Tremblay | 2015-08-13 |
| [Générer votre site web statique avec Hugo (Generate your static site with Hugo)](http://www.linux-pratique.com/?p=191) | Benoît Benedetti | 2015-06-26 |
-| [Hugo向けの新しいテーマを作った (I created a new theme for Hugo)](http://yet.unresolved.xyz/blog/2015/06/20/making-new-theme-robust-for-hugo/) | Daisuke Tsuji | 2015-06-20 |
+| [Hugo向けの新しいテーマを作った (I created a new theme for Hugo)](https://yet.unresolved.xyz/blog/2016/10/03/how-to-make-of-hugo-theme/) | Daisuke Tsuji | 2015-06-20 |
| [Hugo - Gerando um site com conteúdo estático. (Portuguese Brazil)](http://blog.ffrizzo.com/posts/hugo/) | Fabiano Frizzo | 2015-06-02 |
| [An Introduction to Static Site Generators](http://davidwalsh.name/introduction-static-site-generators) | Eduardo Bouças | 2015-05-20 |
| [Hugo Still Rules](http://cheekycoder.com/2015/05/hugo-still-rules/) | Cheeky Coder | 2015-05-18 |
@@ -75,7 +75,6 @@ Hugo has been featured in the following Blog Posts, Press, and Media.
| [Static Websites with Hugo on Google Cloud Storage](http://www.moxie.io/post/static-websites-with-hugo-on-google-cloud-storage/) | Moxie Input/Output | 2015-04-02 |
| [De nuevo iniciando un blog](http://alvarolizama.net/blog/denuevo-iniciando-un-blog/) | Alvaro Lizama | 2015-03-29 |
| [We moved our blog from Posthaven to Hugo after only three posts. Why?](http://blog.hypriot.com/post/moved-from-posthaven-to-hugo/) | Hypriot | 2015-03-27 |
-| [Hugo is cool](http://tnt.wicast.tk/2015/03/23/hugo-is-cool/) (中文 Chinese) | wicast | 2015-03-23 |
| [Top Static Site Generators in 2015](http://superdevresources.com/static-site-generators-2015/) | Kanishk Kunal | 2015-03-12 |
| [Moving to Hugo](http://abiosoft.com/moving-to-hugo/) | Abiola Ibrahim | 2015-03-08 |
| [Hugoで試行錯誤する - log](http://deprode.net/log/logs/first/) | Deprode | 2015-02-28 |
@@ -92,7 +91,6 @@ Hugo has been featured in the following Blog Posts, Press, and Media.
| [Jekyllが許されるのは小学生までだよね](http://t32k.me/mol/log/hugo/) | Ishimoto Koji | 2015-01-16 |
| [Getting started with Hugo](http://anthonyfok.org/post/getting-started-with-hugo/) | Anthony Fok | 2015-01-12 |
| [把这个博客静态化了 (Migrate to Hugo)](http://lich-eng.com/2015/01/03/migrate-to-hugo/)| Li Cheng | 2015-01-03 |
-| [My Hugo Experiment](http://tilde.club/~jbaty/2014/12/2014-12-31-my-hugo-experiment/) | Jack Baty | 2014-12-31 |
| [Porting my blog with Hugo](http://blog.srackham.com/posts/porting-my-blog-with-hugo/) | Stuart Rackham | 2014-12-30 |
| [Hugoを使ってみたときのメモ](http://machortz.github.io/posts/usinghugo/) | Machortz | 2014-12-29 |
| [OctopressからHugoへ移行した](http://deeeet.com/writing/2014/12/25/hugo/) | Taichi Nakashima | 2014-12-25 |
diff --git a/content/news/release-notes.md b/content/news/release-notes.md
index 8dd360c40..9f6ee5b34 100644
--- a/content/news/release-notes.md
+++ b/content/news/release-notes.md
@@ -38,7 +38,7 @@ Also, a considerably amount of work have been put into cleaning up the Hugo sour
Hugo `0.18` was bringing full-parallel page rendering, so workarounds depending on rendering order did not work anymore, and pages with duplicate target paths (common examples would be `/index.md` or `/about/index.md`) would now conflict with the home page or the section listing.
-With Hugo `0.19`, you can control this behaviour by turning off page types you do not want ({{}}). In its most extreme case, if you put the below setting in your `config.toml`, you will get **nothing!**:
+With Hugo `0.19`, you can control this behaviour by turning off page types you do not want ({{}}). In its most extreme case, if you put the below setting in your [`config.toml`](/getting-started/configuration/), you will get **nothing!**:
```
disableKinds = ["page", "home", "section", "taxonomy", "taxonomyTerm", "RSS", "sitemap", "robotsTXT", "404"]
@@ -46,7 +46,7 @@ disableKinds = ["page", "home", "section", "taxonomy", "taxonomyTerm", "RSS", "s
### Other New Features
-* Add ability to sort pages by frontmatter parameters, enabling easy custom "top 10" page lists. {{}}
+* Add ability to sort pages by front matter parameters, enabling easy custom "top 10" page lists. {{}}
* Add `truncate` template function {{}}
* Add `now` function, which replaces the now deprecated `.Now` {{}}
* Make RSS item limit configurable {{}}
@@ -81,7 +81,7 @@ disableKinds = ["page", "home", "section", "taxonomy", "taxonomyTerm", "RSS", "s
* Fix infinite loop in template AST handling for recursive templates {{}}
* Fix issue with watching when config loading fails {{}}
* Correctly flush the imageConfig on live-reload {{}}
-* Fix parsing of TOML arrays in frontmatter {{}}
+* Fix parsing of TOML arrays in front matter {{}}
### Docs
@@ -364,7 +364,7 @@ times decreased anywhere from 10% to 99%.
* Add async version of Google Analytics internal template {{}}
* Add autostart option to YouTube shortcode {{}}
* Set Date and Lastmod for main home page {{}}
-* Allow URL with extension in frontmatter {{}}
+* Allow URL with extension in front matter {{}}
* Add list support in Scratch {{}}
* Add file option to gist shortcode {{}}
@@ -639,24 +639,24 @@ A special shout out to {{< gh "@bep" >}} and
maintainers and their tremendous contributions this release.
### New major features
-* Support for [data files](/extras/datafiles/) in [YAML](http://yaml.org/),
+* Support for [data files](/templates/data-templates/) in [YAML](http://yaml.org/),
[JSON](http://www.json.org/), or [TOML](https://github.com/toml-lang/toml)
located in the `data` directory ({{< gh 885 >}})
-* Support for [dynamic content](/extras/dynamiccontent/) by loading JSON & CSV
+* Support for [dynamic content](/templates/data-templates/) by loading JSON & CSV
from remote sources via GetJson and GetCsv in short codes or other layout
files ({{< gh 748 >}})
-* [Pagination support](/extras/pagination/) for home page, sections and
+* [Pagination support](/templates/pagination/) for home page, sections and
taxonomies ({{< gh 750 >}})
* Universal sequencing support
* A new, generic Next/Prev functionality is added to all lists of pages
(sections, taxonomies, etc.)
- * Add in-section [Next/Prev](/templates/variables/) content pointers
-* `Scratch` -- [a "scratchpad"](/extras/scratch) for your node- and page-scoped
+ * Add in-section [Next/Prev](/variables/) content pointers
+* `Scratch` -- [a "scratchpad"](/functions/scratch/) for your node- and page-scoped
variables
-* [Cross Reference](/extras/crossreferences/) support to easily link documents
+* [Cross Reference](/content-management/cross-references/) support to easily link documents
together with the ref and relref shortcodes.
-* [Ace](http://ace.yoss.si/) template engine support ({{< gh 541 >}})
-* A new [shortcode](/extras/shortcodes/) token of `{{}}` (raw HTML)
+* [Ace](https://github.com/yosssi/ace) template engine support ({{< gh 541 >}})
+* A new [shortcode](/content-management/shortcodes/) token of `{{}}` (raw HTML)
alongside the existing `{{%/* */%}}` (Markdown)
* A top level `Hugo` variable (on Page & Node) is added with various build
information
@@ -671,10 +671,10 @@ maintainers and their tremendous contributions this release.
### Notable enhancements to existing features
-* The [shortcode](/extras/shortcodes/) handling is rewritten for speed and
+* The [shortcode](/content-management/shortcodes/) handling is rewritten for speed and
better error messages.
-* Several improvements to the [template functions](/templates/functions/):
- * `where` is now even more powerful and accepts SQL-like syntax with the
+* Several improvements to the [template functions](/functions/):
+ * [`where`](/functions/where/) is now even more powerful and accepts SQL-like syntax with the
operators `==`, `eq`; `!=`, `<>`, `ne`; `>=`, `ge`; `>`, `gt`; `<=`,
`le`; `<`, `lt`; `in`, `not in`
* `where` template function now also accepts dot chaining key argument
@@ -690,7 +690,7 @@ maintainers and their tremendous contributions this release.
* `replace`
* `dateFormat`
* Several [configurable improvements related to Markdown
- rendering](/overview/configuration/#configure-blackfriday-rendering:a66b35d20295cb764719ac8bd35837ec):
+ rendering](/getting-started/configuration/):
* Configuration of footnote rendering
* Optional support for smart angled quotes, e.g. `"Hugo"` → «Hugo»
* Enable descriptive header IDs
@@ -702,13 +702,13 @@ maintainers and their tremendous contributions this release.
* Internal change to use byte buffer pool significantly lowering memory usage
and providing measurable performance improvements overall
* Changes to docs:
- * A new [Troubleshooting](/troubleshooting/overview/) section is added
+ * A new [Troubleshooting](/troubleshooting/) section is added
* It's now searchable through Google Custom Search ({{< gh 753 >}})
* Some new great tutorials:
* [Automated deployments with
Wercker](/tutorials/automated-deployments/)
* [Creating a new theme](/tutorials/creating-a-new-theme/)
-* [`hugo new`](/content/archetypes/) now copies the content in addition to the front matter
+* [`hugo new`](/content-management/archetypes/) now copies the content in addition to the front matter
* Improved unit test coverage
* Fixed a lot of Windows-related path issues
* Improved error messages for template and rendering errors
@@ -730,17 +730,17 @@ This release represents over 90 code commits from 28 different contributors.
* 10 [new themes](https://github.com/spf13/hugoThemes) created by the community
* Fully themable [Partials](/templates/partials/)
* [404 template](/templates/404/) support in themes
- * [Shortcode](/extras/shortcodes/) support in themes
+ * [Shortcode](/content-management/shortcodes/) support in themes
* [Views](/templates/views/) support in themes
- * Inner [shortcode](/extras/shortcodes/) content now treated as Markdown
+ * Inner [shortcode](/content-management/shortcodes/) content now treated as Markdown
* Support for header ids in Markdown (# Header {#myid})
- * [Where](/templates/list/) template function to filter lists of content, taxonomies, etc.
- * [GroupBy](/templates/list/) & [GroupByDate](/templates/list/) methods to group pages
- * Taxonomy [pages list](/taxonomies/methods/) now sortable, filterable, limitable & groupable
+ * [Where](/templates/lists/) template function to filter lists of content, taxonomies, etc.
+ * [GroupBy](/templates/lists/) & [GroupByDate](/templates/list/) methods to group pages
+ * Taxonomy [pages list](/templates/taxonomy-templates/) now sortable, filterable, limitable & groupable
* General cleanup to taxonomies & documentation to make it more clear and consistent
* [Showcase](/showcase/) returned and has been expanded
* Pretty links now always have trailing slashes
- * [BaseUrl](/overview/configuration/) can now include a subdirectory
+ * [BaseUrl](/getting-started/configuration/) can now include a subdirectory
* Better feedback about draft & future post rendering
* A variety of improvements to [the website](http://gohugo.io/)
@@ -751,20 +751,20 @@ This release represents over 90 code commits from 28 different contributors.
This release represents over 110 code commits from 29 different contributors.
* Considerably faster... about 3 - 4x faster on average
- * [LiveReload](/extras/livereload/). Hugo will automatically reload the browser when the build is complete
+ * [LiveReload](/getting-started/usage/). Hugo will automatically reload the browser when the build is complete
* Theme engine w/[Theme Repository](https://github.com/spf13/hugoThemes)
- * [Menu system](/extras/menus/) with support for active page
- * [Builders](/extras/builders/) to quickly create a new site, content or theme
- * [XML sitemap](/templates/sitemap/) generation
- * [Integrated Disqus](/extras/comments/) support
- * Streamlined [template organization](/templates/overview/)
+ * [Menu system](/content-management/menus/) with support for active page
+ * [Builders](/getting-started/usage/) to quickly create a new site, content or theme
+ * [XML sitemap](/templates/sitemap-template/) generation
+ * [Integrated Disqus](/content-management/comments/) support
+ * Streamlined [template organization](/templates/)
* [Brand new docs site](http://gohugo.io/)
* Support for publishDate which allows for posts to be dated in the future
- * More [sort](/content/ordering/) options
+ * More [sort](/content-management/ordering/) options
* Logging support
* Much better error handling
* More informative verbose output
- * Renamed Indexes > [Taxonomies](/taxonomies/overview/)
+ * Renamed Indexes > [Taxonomies](/content-management/taxonomies/)
* Renamed Chrome > [Partials](/templates/partials/)
----
@@ -773,18 +773,18 @@ This release represents over 110 code commits from 29 different contributors.
This release represents over 110 code commits from 29 different contributors.
- * [Syntax highlighting](/extras/highlighting/) powered by pygments (**slow**)
- * Ability to [sort content](/content/ordering/) many more ways
- * Automatic [table of contents](/extras/toc/) generation
+ * [Syntax highlighting](/tools/syntax-highlighting/) powered by pygments (**slow**)
+ * Ability to [sort content](/templates/ordering-and-grouping/) many more ways
+ * Automatic [table of contents](/content-management/toc/) generation
* Support for Unicode URLs, aliases and indexes
- * Configurable per-section [permalink](/extras/permalinks/) pattern support
- * Support for [paired shortcodes](/extras/shortcodes/)
- * Shipping with some [shortcodes](/extras/shortcodes/) (highlight & figure)
- * Adding [canonify](/extras/urls/) option to keep urls relative
- * A bunch of [additional template functions](/layout/functions/)
+ * Configurable per-section [permalink](/content-management/urls/) pattern support
+ * Support for [paired shortcodes](/content-management/shortcodes/)
+ * Shipping with some [shortcodes](/content-management/shortcodes/) (highlight & figure)
+ * Adding [canonify](/content-management/urls/) option to keep urls relative
+ * A bunch of [additional template functions](/functions/)
* Watching very large sites now works on Mac
- * RSS generation improved. Limited to 50 items by default, can limit further in [template](/layout/rss/)
- * Boolean params now supported in [fm](/content/front-matter/)
+ * RSS generation improved. Limited to 50 items by default, can limit further in [template](/templates/rss/)
+ * Boolean params now supported in [fm](/content-management/front-matter/)
* Launched website [showcase](/showcase/). Show off your own hugo site!
* A bunch of [bug fixes](https://github.com/spf13/hugo/commits/master)
@@ -794,19 +794,19 @@ This release represents over 110 code commits from 29 different contributors.
This release represents over 220 code commits from 22 different contributors.
- * New [command based interface](/overview/usage/) similar to git (`hugo server -s ./`)
+ * New [command based interface](/getting-started/usage/) similar to git (`hugo server -s ./`)
* Amber template support
- * [Aliases](/extras/aliases/) (redirects)
+ * [Aliases](/content-management/urls/) (redirects)
* Support for top level pages (in addition to homepage)
* Complete overhaul of the documentation site
* Full Windows support
- * Better index support including [ordering by content weight](/content/ordering/)
+ * Better index support including [ordering by content weight](/templates/ordering-and-grouping/)
* Add params to site config, available in .Site.Params from templates
- * Friendlier json support
- * Support for html & xml content (with frontmatter support)
- * Support for [summary](/content/summaries/) content divider (<!--more-->)
- * HTML in [summary](/content/summaries/) (when using divider)
- * Added ["Minutes to Read"](/layout/variables/) functionality
+ * Friendlier JSON support
+ * Support for html & xml content (with front matter support)
+ * Support for [summary](/content-management/summaries/) content divider (<!--more-->)
+ * HTML in [summary](/content-management/summaries/) (when using divider)
+ * Added ["Minutes to Read"](/variables/) functionality
* Support for a custom 404 page
* Cleanup of how content organization is handled
* Loads of unit and performance tests
@@ -815,11 +815,11 @@ This release represents over 220 code commits from 22 different contributors.
* Support for relative permalinks
* Fixed watching being triggered multiple times for the same event
* Watch now ignores temp files (as created by Vim)
- * Configurable number of posts on [homepage](/layout/homepage/)
- * [Front matter](/content/front-matter/) supports multiple types (int, string, date, float)
+ * Configurable number of posts on [homepage](/templates/homepage/)
+ * [Front matter](/content-management/front-matter/) supports multiple types (int, string, date, float)
* Indexes can now use a default template
* Addition of truncated bool to content to determine if should show 'more' link
- * Support for [linkTitles](/layout/variables/)
+ * Support for [linkTitles](/variables/)
* Better handling of most errors with directions on how to resolve
* Support for more date / time formats
* Support for go 1.2
diff --git a/content/templates/custom-404-page.md b/content/templates/404.md
similarity index 100%
rename from content/templates/custom-404-page.md
rename to content/templates/404.md
diff --git a/content/templates/lists.md b/content/templates/lists.md
index 6ed8f769a..eb385a5e4 100644
--- a/content/templates/lists.md
+++ b/content/templates/lists.md
@@ -76,13 +76,13 @@ If `where` or `first` receives invalid input or a field name that doesn’t exis
[homepage]: /templates/homepage/
[limitkeyword]: https://www.techonthenet.com/sql/select_limit.php
[mentalmodel]: http://webstyleguide.com/wsg3/3-information-architecture/3-site-structure.html
-[pagevars]: /variables/pagevars/
+[pagevars]: /variables/page/
[partials]: /templates/partials/
[RSS 2.0]: http://cyber.law.harvard.edu/rss/rss.html "RSS 2.0 Specification"
[rss]: /templates/rss/
[sections]: /content-management/sections/
-[sectiontemps]: /templates/section-templates
+[sectiontemps]: /templates/section-templates/
[sitevars]: /variables/site/
[taxlists]: /templates/taxonomy-templates/#taxonomy-list-templates/
-[taxvars]: /templates/taxonomy-variables/
+[taxvars]: /variables/taxonomy/
[taxterms]: /templates/taxonomy-templates/#taxonomy-terms-templates/
diff --git a/content/templates/lookup-order.md b/content/templates/lookup-order.md
index 4d1d63aef..8b137bcdd 100644
--- a/content/templates/lookup-order.md
+++ b/content/templates/lookup-order.md
@@ -176,7 +176,7 @@ The respective lookup order for each of Hugo's templates has been defined throug
[sections]: /content-management/sections/
[sectionlookup]: /templates/section-templates/#section-template-lookup-order
[single content]: /templates/single-page-templates/
-[singlelookup]: templates/single-page-templates/#single-page-template-lookup-order
+[singlelookup]: /templates/single-page-templates/#single-page-template-lookup-order
[switch]: https://en.wikipedia.org/wiki/Switch_statement#Fallthrough
[taxonomylookup]: /templates/taxonomy-templates/#taxonomy-list-template-lookup-order
[termslookup]: /templates/taxonomy-templates/#taxonomy-terms-template-lookup-order
\ No newline at end of file
diff --git a/content/templates/ordering-and-grouping.md b/content/templates/ordering-and-grouping.md
index 737a0b365..bcd5e9d36 100644
--- a/content/templates/ordering-and-grouping.md
+++ b/content/templates/ordering-and-grouping.md
@@ -15,9 +15,9 @@ toc: true
In Hugo, A list template is any template that will be used to render multiple pieces of content in a single HTML page.
-## Examples of List Templates
+## Example List Templates
-### Section Template: `post.html`
+### Section Template
This list template is used for [spf13.com](http://spf13.com/). It makes use of [partial templates][partials]. All examples use a [view](/templates/views/) called either "li" or "summary."
diff --git a/content/templates/robots.md b/content/templates/robots.md
index aa2506051..7f63e4c73 100644
--- a/content/templates/robots.md
+++ b/content/templates/robots.md
@@ -50,5 +50,5 @@ Disallow: {{.RelPermalink}}
This template disallows all the pages of the site by creating one `Disallow` entry for each page.
[config]: /getting-started/configuration/
-[lookup]: /layouts/lookup-order
+[lookup]: /templates/lookup-order/
[robots]: http://www.robotstxt.org/
\ No newline at end of file
diff --git a/content/templates/shortcode-templates.md b/content/templates/shortcode-templates.md
index f37d0f1d8..83b8e3c4a 100644
--- a/content/templates/shortcode-templates.md
+++ b/content/templates/shortcode-templates.md
@@ -260,7 +260,7 @@ More shortcode examples can be found in the [shortcodes directory for spf13.com]
[docsshortcodes]: https://github.com/spf13/hugo/tree/master/docs/layouts/shortcodes "See the shortcode source directory for the documentation site you're currently reading."
[figure]: /content-management/shortcodes/#figure
[pagevars]: /variables/page/ "See which variables you can leverage in your templating for page vs list templates."
-[shortcodesvars]: /variables/shortcode-variables/ "Certain variables are specific to shortcodes, although most .Page variables can be accessed within your shortcode template."
+[shortcodesvars]: /variables/shortcodes/ "Certain variables are specific to shortcodes, although most .Page variables can be accessed within your shortcode template."
[spf13shortcodes]: https://github.com/spf13/spf13.com/tree/master/layouts/shortcodes "See more examples of shortcodes by visiting the shortcode directory of the source for spf13.com, the blog of Hugo's creator, Steve Francia."
[templates]: /templates/ "The templates section of the Hugo docs."
[vimeoexample]: #single-flexible-example-vimeo
diff --git a/content/themes/creating.md b/content/themes/creating.md
index 4126484c7..603588e97 100644
--- a/content/themes/creating.md
+++ b/content/themes/creating.md
@@ -9,7 +9,7 @@ categories: [themes]
tags: [themes, source, organization, directories]
weight: 30
draft: false
-aliases: [/themes/creation/]
+aliases: [/themes/creation/,/tutorials/creating-a-new-theme/]
toc: true
wip: true
---
diff --git a/content/tools/migrations.md b/content/tools/migrations.md
index c4caed4b7..191a6cb03 100644
--- a/content/tools/migrations.md
+++ b/content/tools/migrations.md
@@ -22,7 +22,7 @@ Take a look at this list of migration tools if you currently use other logging t
## Jekyll
-Alternatively, you can follow the manual [migration guide](/tutorials/migrate-from-jekyll-to-hugo/) or use the new [Jekyll import command](/commands/hugo_import_jekyll/).
+Alternatively, you can use the new [Jekyll import command](/commands/hugo_import_jekyll/).
- [JekyllToHugo](https://github.com/SenjinDarashiva/JekyllToHugo) - A Small script for converting Jekyll blog posts to a Hugo site.
- [ConvertToHugo](https://github.com/coderzh/ConvertToHugo) - Convert your blog from Jekyll to Hugo.
diff --git a/content/variables/page.md b/content/variables/page.md
index a6d449041..9fca0f209 100644
--- a/content/variables/page.md
+++ b/content/variables/page.md
@@ -213,7 +213,7 @@ This template would render as follows, assuming you've set [`uglyURLs`](/content
{{% /output %}}
{{% note %}}
-See [Archetypes](/content-management/archetyps) for consistency of `Params` across pieces of content.
+See [Archetypes](/content-management/archetypes/) for consistency of `Params` across pieces of content.
{{% /note %}}
### The `.Param` Method
+