Revert "Squashed 'docs/' changes from 35abbc86..f887bd7b"

That did not go well...

This reverts commit 0373e4310263ac9f2b0307d437dcf69cf474eb69.

7 files changed, 16 insertions, 173 deletions

diff --git a/docs/content/content-management/taxonomies.md b/docs/content/content-management/taxonomies.md
index 409fe98d9..542bb6cfc 100644
--- a/docs/content/content-management/taxonomies.md
+++ b/docs/content/content-management/taxonomies.md
@@ -84,7 +84,7 @@ Moonrise Kingdom            <- Content
 
 ## Hugo Taxonomy Defaults
 
-Hugo natively supports taxonomies.
+Hugo natively supports taxonomies. 
 
 Without adding a single line to your site's configuration file, Hugo will automatically create taxonomies for `tags` and `categories`. If you do not want Hugo to create any taxonomies, set `disableKinds` in your site's configuration to the following:
 
@@ -229,19 +229,6 @@ By using taxonomic weight, the same piece of content can appear in different pos
 Currently taxonomies only support the [default `weight => date` ordering of list content](/templates/lists/#default-weight-date). For more information, see the documentation on [taxonomy templates](/templates/taxonomy-templates/).
 {{% /note %}}
 
-## Add custom metadata to a Taxonomy Term
-
-If you need to add custom metadata to your taxonomy terms, you will need to create a page for that term at `/content/<TAXONOMY>/<TERM>/_index.md` and add your metadata in it's front matter. Continuing with our 'Actors' example, let's say you want to add a wikipedia page link to each actor. Your terms pages would be something like this:
-
-{{< code file="/content/actors/bruce-willis/_index.md" >}}
-  ---
-  title: "Bruce Willis"
-  wikipedia: "https://en.wikipedia.org/wiki/Bruce_Willis"
-  ---
-{{< /code >}}
-
-You can later use your custom metadata as shown in the [Taxonomy Terms Templates documentation](/templates/taxonomy-templates/#displaying-custom-meta-data-in-taxonomy-terms-templates).
-
 [`urlize` template function]: /functions/urlize/
 [content section]: /content-management/sections/
 [content type]: /content-management/types/
diff --git a/docs/content/functions/scratch.md b/docs/content/functions/scratch.md
index 2dc858c99..f69d3b760 100644
--- a/docs/content/functions/scratch.md
+++ b/docs/content/functions/scratch.md
@@ -22,10 +22,6 @@ aliases: [/extras/scratch/,/doc/scratch/]
 
 In most cases you can do well without `Scratch`, but there are some use cases that aren't solvable with Go's templates without `Scratch`'s help, due to scoping issues.
 
-{{% note %}}
-See [this Go issue](https://github.com/golang/go/issues/10608) for the main motivation behind Scratch.
-{{% /note %}}
-
 `Scratch` is added to both `Page` and `Shortcode` -- with following methods:
 
 * `Set` and `Add` takes a `key` and the `value` to add.
diff --git a/docs/content/getting-started/configuration.md b/docs/content/getting-started/configuration.md
index 5fff5ca61..55e2f1cdc 100644
--- a/docs/content/getting-started/configuration.md
+++ b/docs/content/getting-started/configuration.md
@@ -155,10 +155,6 @@ stepAnalysis:               false
 themesDir:                  "themes"
 theme:                      ""
 title:                      ""
-# Title Case style guide for the title func and other automatic title casing in Hugo.
-// Valid values are "AP" (default), "Chicago" and "Go" (which was what you had in Hugo <= 0.25.1).
-// See https://www.apstylebook.com/ and http://www.chicagomanualofstyle.org/home.html
-titleCaseStyle:             "AP"
 # if true, use /filename.html instead of /filename/
 # Title Case style guide for the title func and other automatic title casing in Hugo.
 // Valid values are "AP" (default), "Chicago" and "Go" (which was what you had in Hugo <= 0.25.1).
@@ -396,4 +392,4 @@ Hugo v0.20 introduced the ability to render your content to multiple output form
 [Output Formats]: /templates/output-formats/
 [templates]: /templates/
 [toml]: https://github.com/toml-lang/toml
-[yaml]: http://yaml.org/spec/
+[yaml]: http://yaml.org/spec/
\ No newline at end of file
diff --git a/docs/content/getting-started/installing.md b/docs/content/getting-started/installing.md
index 46cad2a2b..bc87bff1d 100644
--- a/docs/content/getting-started/installing.md
+++ b/docs/content/getting-started/installing.md
@@ -441,12 +441,15 @@ sudo apt-get install hugo
 
 * Might not be the latest version, especially if you are using an older, stable version (e.g., Ubuntu 16.04 LTS). Until backports and PPA are available, you may consider installing the Hugo snap package to get the latest version of Hugo.
 
-### Arch Linux
+### Arch
 
-You can also install Hugo from the Arch Linux [community](https://www.archlinux.org/packages/community/x86_64/hugo/) repository. Applies also for derivatives such as Manjaro.
+You can also install Hugo from the [Arch user repository](https://aur.archlinux.org/) on Arch Linux or derivatives such as Manjaro.
+
+Be aware that Hugo is built from source. This means that additional tools like [Git](https://git-scm.com) and [Go](https://golang.org/doc/install) will be installed as well.
 
 ```
-sudo pacman -Sy hugo
+sudo pacman -S yaourt
+yaourt -S hugo
 ```
 
 ### Fedora, CentOS, and Red Hat
diff --git a/docs/content/readfiles/bfconfig.md b/docs/content/readfiles/bfconfig.md
index 7a060c5d2..98e357678 100644
--- a/docs/content/readfiles/bfconfig.md
+++ b/docs/content/readfiles/bfconfig.md
@@ -1,9 +1,7 @@
-## Blackfriday Options
-
 `taskLists`
 : default: **`true`**<br>
     Blackfriday flag: <br>
-    Purpose: `false` turns off GitHub-style automatic task/TODO list generation.
+    Purpose: `false` turns off GitHub-style automatic task/TODO list generation
 
 `smartypants`
 : default: **`true`** <br>
@@ -29,14 +27,14 @@
 `smartDashes`
 : default: **`true`** <br>
     Blackfriday flag: **`HTML_SMARTY_DASHES`** <br>
-    Purpose: `false` disables smart dashes; i.e., the conversion of multiple hyphens into an en-dash or em-dash. If `true`, its behavior can be modified with the `latexDashes` flag below.
+    Purpose: `false` disables smart dashes; i.e., the conversion of multiple hyphens into an en dash or em dash. If `true`, its behavior can be modified with the `latexDashes` flag below.
 
 `latexDashes`
 : default: **`true`** <br>
     Blackfriday flag: **`HTML_SMARTYPANTS_LATEX_DASHES`** <br>
     Purpose: `false` disables LaTeX-style smart dashes and selects conventional smart dashes. Assuming `smartDashes`: <br>
     If `true`, `--` is translated into &ndash; (`&ndash;`), whereas `---` is translated into &mdash; (`&mdash;`). <br>
-    However, *spaced* single hyphen between two words is translated into an en&nbsp;dash&mdash; e.g., "`12 June - 3 July`" becomes `12 June &ndash; 3 July` upon rendering.
+    However, *spaced* single hyphen between two words is translated into an en&nbsp;dash&mdash; e.g., "`12 June - 3 July`" becomes `12 June ndash; 3 July` upon rendering.
 
 `hrefTargetBlank`
 : default: **`false`** <br>
@@ -53,132 +51,10 @@
 : default: **`[]`** <br>
     Blackfriday flag: **`EXTENSION_*`** <br>
     Purpose: Enable one or more Blackfriday's Markdown extensions (if they aren't Hugo defaults). <br>
-    Example: Include `hardLineBreak` in the list to enable Blackfriday's `EXTENSION_HARD_LINK_BREAK`. <br>
-    *See [Blackfriday extensions](#blackfriday-extensions) section for more information.*
+    Example: Include `hardLineBreak` in the list to enable Blackfriday's `EXTENSION_HARD_LINK_BREAK`
 
 `extensionsmask`
 : default: **`[]`** <br>
     Blackfriday flag: **`EXTENSION_*`** <br>
     Purpose: Enable one or more of Blackfriday's Markdown extensions (if they aren't Hugo defaults). <br>
-    Example: Include `autoHeaderIds` as `false` in the list to disable Blackfriday's `EXTENSION_AUTO_HEADER_IDS`. <br>
-    *See [Blackfriday extensions](#blackfriday-extensions) section for more information.*
-
-## Blackfriday extensions
-
-`noIntraEmphasis`
-: default: *enabled* <br>
-    Purpose: The "\_" character is commonly used inside words when discussing
-    code, so having Markdown interpret it as an emphasis command is usually the
-    wrong thing.  When enabled, Blackfriday lets you treat all emphasis markers
-    as normal characters when they occur inside a word.
-
-`tables`
-: default: *enabled* <br>
-    Purpose: When enabled, tables can be created by drawing them in the input
-    using the below syntax:
-    Example:
-
-           Name | Age
-        --------|------
-            Bob | 27
-          Alice | 23
-
-`fencedCode`
-: default: *enabled* <br>
-    Purpose: When enabled, in addition to the normal 4-space indentation to mark
-    code blocks, you can explicitly mark them and supply a language (to make
-    syntax highlighting simple).
-
-    You can use 3 or more backticks to mark the beginning of the block, and the
-    same number to mark the end of the block.
-
-    Example:
-
-         ```md
-        # Heading Level 1
-        Some test
-        ## Heading Level 2
-        Some more test
-        ```
-
-`autolink`
-: default: *enabled* <br>
-    Purpose: When enabled, URLs that have not been explicitly marked as links
-    will be converted into links.
-
-`strikethrough`
-: default: *enabled* <br>
-    Purpose: When enabled, text wrapped with two tildes will be crossed out. <br>
-    Example: `~~crossed-out~~`
-
-`laxHtmlBlocks`
-: default: *disabled* <br>
-    Purpose: When enabled, loosen up HTML block parsing rules.
-
-`spaceHeaders`
-: default: *enabled* <br>
-    Purpose: When enabled, be strict about prefix header rules.
-
-`hardLineBreak`
-: default: *disabled* <br>
-    Purpose: When enabled, newlines in the input translate into line breaks in
-    the output.
-
-
-`tabSizeEight`
-: default: *disabled* <br>
-    Purpose: When enabled, expand tabs to eight spaces instead of four.
-
-`footnotes`
-: default: *enabled* <br>
-    Purpose: When enabled, Pandoc-style footnotes will be supported.  The
-    footnote marker in the text that will become a superscript text; the
-    footnote definition will be placed in a list of footnotes at the end of the
-    document. <br>
-    Example:
-
-        This is a footnote.[^1]
-
-        [^1]: the footnote text.
-
-`noEmptyLineBeforeBlock`
-: default: *disabled* <br>
-    Purpose: When enabled, no need to insert an empty line to start a (code,
-    quote, ordered list, unordered list) block.
-
-
-`headerIds`
-: default: *enabled* <br>
-    Purpose: When enabled, allow specifying header IDs with `{#id}`.
-
-`titleblock`
-: default: *disabled* <br>
-    Purpose: When enabled, support [Pandoc-style title blocks][1].
-
-`autoHeaderIds`
-: default: *enabled* <br>
-    Purpose: When enabled, auto-create the header ID's from the headline text.
-
-`backslashLineBreak`
-: default: *enabled* <br>
-    Purpose: When enabled, translate trailing backslashes into line breaks.
-
-`definitionLists`
-: default: *enabled* <br>
-    Purpose: When enabled, a simple definition list is made of a single-line
-    term followed by a colon and the definition for that term. <br>
-    Example:
-
-        Cat
-        : Fluffy animal everyone likes
-
-        Internet
-        : Vector of transmission for pictures of cats
-
-    Terms must be separated from the previous definition by a blank line.
-
-`joinLines`
-: default: *enabled* <br>
-    Purpose: When enabled, delete newlines and join the lines.
-
-[1]: http://pandoc.org/MANUAL.html#extension-pandoc_title_block
+    Example: Include `autoHeaderIds` as `false` in the list to disable Blackfriday's `EXTENSION_AUTO_HEADER_IDS`.
diff --git a/docs/content/templates/taxonomy-templates.md b/docs/content/templates/taxonomy-templates.md
index 6e5b6c40f..22fb0d053 100644
--- a/docs/content/templates/taxonomy-templates.md
+++ b/docs/content/templates/taxonomy-templates.md
@@ -117,21 +117,6 @@ type WeightedPages []WeightedPage
 .Pages
 : Returns a slice of pages, which then can be ordered using any of the [list methods][renderlists].
 
-## Displaying custom metadata in Taxonomy Terms Templates
-
-If you need to display custom metadata for each taxonomy term, you will need to create a page for that term at `/content/<TAXONOMY>/<TERM>/_index.md` and add your metadata in it's front matter, [as explained in the taxonomies documentation](/content-management/taxonomies/#add-custom-meta-data-to-a-taxonomy-term). Based on the Actors taxonomy example shown there, within your taxonomy terms template, you may access your custom fields by iterating through the variable `.Data.Pages` as such:
-
-```
-<ul>
-  {{ range .Data.Pages }}
-     <li>
-       <a href="{{ .Permalink }}">{{ .Title }}</a>
-       {{ .Params.wikipedia }}
-     </li>
-  {{ end }}
-</ul>
-```
-
 <!-- Begin /taxonomies/ordering/ -->
 
 ## Order Taxonomies
diff --git a/docs/netlify.toml b/docs/netlify.toml
index c556acabf..addb812a2 100644
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -3,15 +3,15 @@
   command = "hugo"
 
 [context.production.environment]
-  HUGO_VERSION = "0.26"
+  HUGO_VERSION = "0.25.1"
   HUGO_ENV = "production"
   HUGO_ENABLEGITINFO = "true"
 
 [context.deploy-preview.environment]
-  HUGO_VERSION = "0.26"
+  HUGO_VERSION = "0.25.1"
 
 [context.branch-deploy.environment]
-  HUGO_VERSION = "0.26"
+  HUGO_VERSION = "0.25.1"
 
 [context.next.environment]
   HUGO_BASEURL = "https://next--gohugoio.netlify.com/"