releaser: Add release notes to /docs for release of 0.41

[ci skip]
releaser: Bump versions for release of 0.41
2026-08-30 02:02:38 +00:00 · 2018-05-25 16:57:18 +00:00 · 2018-05-25 16:57:17 +00:00 · 2018-05-25 18:46:45 +02:00 · 2018-05-25 16:01:30 +00:00 · 2018-05-25 17:53:03 +02:00
977 changed files with 18381 additions and 11986 deletions
@@ -1,7 +1,7 @@
 defaults: &defaults
  working_directory: /go/src/github.com/gohugoio
  docker:
-      - image: bepsays/ci-goreleaser:0.34.2-7
+      - image: bepsays/ci-goreleaser:0.34.2-11
    
 version: 2
 jobs:
@@ -0,0 +1,3 @@
+### Asking Support Questions
+
+We have an active [discussion forum](https://discourse.gohugo.io) where users and developers can ask questions. Please don't use the GitHub issue tracker to ask questions.
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 90
+daysUntilStale: 120
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
+daysUntilClose: 30
 # Issues with these labels will never be considered stale
 exemptLabels:
  - Keep
@@ -20,4 +20,4 @@ markComment: >
  This issue will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
  
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false
@@ -12,6 +12,7 @@ cover.out
 *~
 vendor/*/
 *.bench
+*.debug
 coverage*.out

 GoBuilds
@@ -1,9 +1,11 @@
 language: go
-sudo: required
-dist: precise
+sudo: false
+dist: trusty
+git:
+  depth: false
 go:
-  - 1.8.6
-  - 1.9.3
+  - 1.9.5
+  - "1.10.1"
  - tip
 os:
  - linux
@@ -14,12 +16,12 @@ matrix:
  fast_finish: true
 install:
  - go get github.com/magefile/mage
-  - mage vendor
+  - mage -v vendor
 script:
-  - mage hugoRace
+  - mage -v hugoRace
  - mage -v check
  - ./hugo -s docs/
  - ./hugo --renderToMemory -s docs/
 before_install:
-  # gem install must be run with sudo on OSX
-  - sudo gem install asciidoctor | gem install asciidoctor
+  - gem install asciidoctor
+  - type asciidoctor
@@ -9,7 +9,7 @@ The Hugo community and maintainers are [very active](https://github.com/gohugoio

 *Note that this repository only contains the actual source code of Hugo. For **only** documentation-related pull requests / issues please refer to the [hugoDocs](https://github.com/gohugoio/hugoDocs) repository.*

-*Pull requests that contain changes on the code base **and** related documentation, e.g. for a new feature, shall remain a single, atomic one.*
+*Changes to the codebase **and** related documentation, e.g. for a new feature, should still use a single pull request.*

 ## Table of Contents

@@ -32,21 +32,24 @@ Please don't use the GitHub issue tracker to ask questions.
 ## Reporting Issues

 If you believe you have found a defect in Hugo or its documentation, use
-the GitHub [issue tracker](https://github.com/gohugoio/hugo/issues) to report the problem to the Hugo maintainers.
-If you're not sure if it's a bug or not, start by asking in the [discussion forum](https://discourse.gohugo.io).
-When reporting the issue, please provide the version of Hugo in use (`hugo version`) and your operating system.
+the GitHub [issue tracker](https://github.com/gohugoio/hugo/issues) to report
+the problem to the Hugo maintainers. If you're not sure if it's a bug or not,
+start by asking in the [discussion forum](https://discourse.gohugo.io).
+When reporting the issue, please provide the version of Hugo in use (`hugo
+version`) and your operating system.

 ## Code Contribution

-Hugo has become a fully featured static site generator, so any new functionality must meet these criterias:
+Hugo has become a fully featured static site generator, so any new functionality must:

-* It must be useful to many.
-* It must fit natural into _what Hugo does best._
-* It must strive not to break existing sites.
-* It must close ur update an open [Hugo issue](https://github.com/gohugoio/hugo/issues)
-* If it is of some complexity, the contributor is expected to maintain and support the new future (answer questions on the forum, fix any bugs etc.).
+* be useful to many.
+* fit naturally into _what Hugo does best._
+* strive not to break existing sites.
+* close or update an open [Hugo issue](https://github.com/gohugoio/hugo/issues)

-So, to avoid doing unneeded work, it is recommended to open up a discussion on the [Hugo Forum](https://discourse.gohugo.io/) to get some acceptance that this is a good idea. Also, if this is a complex feature, create a small design proposal on the [Hugo issue tracker](https://github.com/gohugoio/hugo/issues) before you start coding.
+If it is of some complexity, the contributor is expected to maintain and support the new future (answer questions on the forum, fix any bugs etc.).
+
+It is recommended to open up a discussion on the [Hugo Forum](https://discourse.gohugo.io/) to get feedback on your idea before you begin. If you are submitting a complex feature, create a small design proposal on the [Hugo issue tracker](https://github.com/gohugoio/hugo/issues) before you start.


 **Bug fixes are, of course, always welcome.**
@@ -55,16 +58,12 @@ So, to avoid doing unneeded work, it is recommended to open up a discussion on t

 ## Submitting Patches

-The Hugo project welcomes all contributors and contributions regardless of skill or experience level.
-If you are interested in helping with the project, we will help you with your contribution.
-Hugo is a very active project with many contributions happening daily.
-Because we want to create the best possible product for our users and the best contribution experience for our developers,
-we have a set of guidelines which ensure that all contributions are acceptable.
-The guidelines are not intended as a filter or barrier to participation.
-If you are unfamiliar with the contribution process, the Hugo team will help you and teach you how to bring your contribution in accordance with the guidelines.
+The Hugo project welcomes all contributors and contributions regardless of skill or experience level. If you are interested in helping with the project, we will help you with your contribution.

 ### Code Contribution Guidelines

+Because we want to create the best possible product for our users and the best contribution experience for our developers, we have a set of guidelines which ensure that all contributions are acceptable. The guidelines are not intended as a filter or barrier to participation. If you are unfamiliar with the contribution process, the Hugo team will help you and teach you how to bring your contribution in accordance with the guidelines.
+
 To make the contribution process as seamless as possible, we ask for the following:

 * Go ahead and fork the project and make your changes.  We encourage pull requests to allow for review and discussion of code changes.
@@ -86,11 +85,11 @@ the most important part being that each commit message should have a title/subje
 Also, if your commit references one or more GitHub issues, always end your commit message body with *See #1234* or *Fixes #1234*.
 Replace *1234* with the GitHub issue ID. The last example will close the issue when the commit is merged into *master*.

-Sometimes it makes sense to prefix the commit message with the packagename (or docs folder) all lowercased ending with a colon.
+Sometimes it makes sense to prefix the commit message with the package name (or docs folder) all lowercased ending with a colon.
 That is fine, but the rest of the rules above apply.
 So it is "tpl: Add emojify template func", not "tpl: add emojify template func.", and "docs: Document emoji", not "doc: document emoji."

-Please consider to use a short and descriptive branch name, e.g. **NOT** "patch-1". It's very common but creates a naming conflict each time when a submission is pulled for a review.
+Please use a short and descriptive branch name, e.g. **NOT** "patch-1". It's very common but creates a naming conflict each time when a submission is pulled for a review.

 An example:

@@ -130,7 +129,7 @@ started:
    mage vendor
    ```

-    Note that Hugo uses [Go Dep](https://github.com/golang/dep) to vendor dependencies, rather than a a simple `go get`. We don't commit the vendored packages themselves to the Hugo git repository. The call to `mage vendor` takes care of all this for you.
+    Note that Hugo uses [Go Dep](https://github.com/golang/dep) to vendor dependencies, rather than a simple `go get`. We don't commit the vendored packages themselves to the Hugo git repository. The call to `mage vendor` takes care of all this for you.

 1. Create a new branch for your changes (the branch name is arbitrary):

@@ -20,22 +20,54 @@
  revision = "de5bf2ad457846296e2031421a34e2568e304e35"

 [[projects]]
+  branch = "master"
  name = "github.com/alecthomas/chroma"
  packages = [
    ".",
    "formatters",
    "formatters/html",
    "lexers",
+    "lexers/a",
+    "lexers/b",
+    "lexers/c",
+    "lexers/circular",
+    "lexers/d",
+    "lexers/e",
+    "lexers/f",
+    "lexers/g",
+    "lexers/h",
+    "lexers/i",
+    "lexers/internal",
+    "lexers/j",
+    "lexers/k",
+    "lexers/l",
+    "lexers/m",
+    "lexers/n",
+    "lexers/o",
+    "lexers/p",
+    "lexers/q",
+    "lexers/r",
+    "lexers/s",
+    "lexers/t",
+    "lexers/v",
+    "lexers/w",
+    "lexers/x",
+    "lexers/y",
    "styles"
  ]
-  revision = "e0f32fbcb59bc99c521910291b7ba8ecdb17ca34"
-  version = "v0.2.1"
+  revision = "6b1131c0069211a7729895c26f8c51765a4baf25"
+
+[[projects]]
+  name = "github.com/bep/debounce"
+  packages = ["."]
+  revision = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"
+  version = "v1.1.0"

 [[projects]]
  branch = "master"
  name = "github.com/bep/gitmap"
  packages = ["."]
-  revision = "de8030ebafb76c6e84d50ee6d143382637c00598"
+  revision = "012701e8669671499fc43e9792335a1dcbfe2afb"

 [[projects]]
  name = "github.com/chaseadamsio/goorgeous"
@@ -46,8 +78,8 @@
 [[projects]]
  name = "github.com/cpuguy83/go-md2man"
  packages = ["md2man"]
-  revision = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1"
-  version = "v1.0.7"
+  revision = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"
+  version = "v1.0.8"

 [[projects]]
  branch = "master"
@@ -88,8 +120,8 @@
 [[projects]]
  name = "github.com/fortytw2/leaktest"
  packages = ["."]
-  revision = "7dad53304f9614c1c365755c1176a8e876fee3e8"
-  version = "v1.1.0"
+  revision = "a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
+  version = "v1.2.0"

 [[projects]]
  name = "github.com/fsnotify/fsnotify"
@@ -109,8 +141,8 @@
    "util/runes",
    "util/strings"
  ]
-  revision = "bea32b9cd2d6f55753d94a28e959b13f0244797a"
-  version = "v0.2.2"
+  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
+  version = "v0.2.3"

 [[projects]]
  name = "github.com/gorilla/websocket"
@@ -122,13 +154,13 @@
  branch = "master"
  name = "github.com/hashicorp/go-immutable-radix"
  packages = ["."]
-  revision = "8aac2701530899b64bdea735a1de8da899815220"
+  revision = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"

 [[projects]]
  branch = "master"
  name = "github.com/hashicorp/golang-lru"
  packages = ["simplelru"]
-  revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"
+  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"

 [[projects]]
  branch = "master"
@@ -137,6 +169,7 @@
    ".",
    "hcl/ast",
    "hcl/parser",
+    "hcl/printer",
    "hcl/scanner",
    "hcl/strconv",
    "hcl/token",
@@ -144,7 +177,7 @@
    "json/scanner",
    "json/token"
  ]
-  revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"

 [[projects]]
  name = "github.com/inconshreveable/mousetrap"
@@ -179,11 +212,10 @@
 [[projects]]
  name = "github.com/magiconair/properties"
  packages = ["."]
-  revision = "d419a98cdbed11a922bf76f257b7c4be79b50e73"
-  version = "v1.7.4"
+  revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
+  version = "v1.7.6"

 [[projects]]
-  branch = "master"
  name = "github.com/markbates/inflect"
  packages = ["."]
  revision = "a12c3aec81a6a938bf584a4bac567afed9256586"
@@ -204,7 +236,16 @@
  branch = "master"
  name = "github.com/mitchellh/mapstructure"
  packages = ["."]
-  revision = "b4575eea38cca1123ec2dc90c26529b5c5acfcff"
+  revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/muesli/smartcrop"
+  packages = [
+    ".",
+    "options"
+  ]
+  revision = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"

 [[projects]]
  name = "github.com/nicksnyder/go-i18n"
@@ -220,13 +261,13 @@
  branch = "master"
  name = "github.com/olekukonko/tablewriter"
  packages = ["."]
-  revision = "96aac992fc8b1a4c83841a6c3e7178d20d989625"
+  revision = "b8a9be070da40449e501c3c4730a889e42d87a9e"

 [[projects]]
  name = "github.com/pelletier/go-toml"
  packages = ["."]
-  revision = "16398bac157da96aa88f98a2df640c7f32af1da2"
-  version = "v1.0.1"
+  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
+  version = "v1.1.0"

 [[projects]]
  name = "github.com/pmezard/go-difflib"
@@ -237,8 +278,14 @@
 [[projects]]
  name = "github.com/russross/blackfriday"
  packages = ["."]
-  revision = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"
-  version = "v1.5"
+  revision = "55d61fa8aa702f59229e6cff85793c22e580eaf5"
+  version = "v1.5.1"
+
+[[projects]]
+  name = "github.com/sanity-io/litter"
+  packages = ["."]
+  revision = "ae543b7ba8fd6af63e4976198f146e1348ae53c1"
+  version = "v1.1.0"

 [[projects]]
  branch = "master"
@@ -252,23 +299,23 @@
    ".",
    "mem"
  ]
-  revision = "bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
-  version = "v1.0.2"
+  revision = "63644898a8da0bc22138abf860edaf5277b6102e"
+  version = "v1.1.0"

 [[projects]]
  name = "github.com/spf13/cast"
  packages = ["."]
-  revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-  version = "v1.1.0"
+  revision = "8965335b8c7107321228e3e3702cab9832751bac"
+  version = "v1.2.0"

 [[projects]]
-  branch = "master"
  name = "github.com/spf13/cobra"
  packages = [
    ".",
    "doc"
  ]
-  revision = "b95ab734e27d33e0d8fbabf71ca990568d4e2020"
+  revision = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+  version = "v0.0.2"

 [[projects]]
  branch = "master"
@@ -297,8 +344,8 @@
 [[projects]]
  name = "github.com/spf13/viper"
  packages = ["."]
-  revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
-  version = "v1.0.0"
+  revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
+  version = "v1.0.2"

 [[projects]]
  name = "github.com/stretchr/testify"
@@ -306,8 +353,8 @@
    "assert",
    "require"
  ]
-  revision = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"
-  version = "v1.2.0"
+  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
+  version = "v1.2.1"

 [[projects]]
  name = "github.com/yosssi/ace"
@@ -320,6 +367,8 @@
  name = "golang.org/x/image"
  packages = [
    "bmp",
+    "draw",
+    "math/f64",
    "riff",
    "tiff",
    "tiff/lzw",
@@ -327,7 +376,7 @@
    "vp8l",
    "webp"
  ]
-  revision = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"
+  revision = "f315e440302883054d0c2bd85486878cb4f8572c"

 [[projects]]
  branch = "master"
@@ -336,19 +385,19 @@
    "context",
    "idna"
  ]
-  revision = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec"
+  revision = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"

 [[projects]]
  branch = "master"
  name = "golang.org/x/sync"
  packages = ["errgroup"]
-  revision = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"
+  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"

 [[projects]]
  branch = "master"
  name = "golang.org/x/sys"
  packages = ["unix"]
-  revision = "810d7000345868fc619eb81f46307107118f4ae1"
+  revision = "3b87a42e500a6dc65dae1a55d0b641295971163e"

 [[projects]]
  branch = "master"
@@ -358,6 +407,8 @@
    "collate/build",
    "internal/colltab",
    "internal/gen",
+    "internal/language",
+    "internal/language/compact",
    "internal/tag",
    "internal/triegen",
    "internal/ucd",
@@ -370,17 +421,17 @@
    "unicode/rangetable",
    "width"
  ]
-  revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3"
+  revision = "2cb43934f0eece38629746959acc633cba083fe4"

 [[projects]]
-  branch = "v2"
  name = "gopkg.in/yaml.v2"
  packages = ["."]
-  revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"

 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  inputs-digest = "c80ffe69d34005d8d72a87cc491ce1d9c91272e4b7f8fbd22d4fda8973fa8556"
+  inputs-digest = "b9b38ece73fd6c0d0b20eb2ff85dfcc15a82841223b4403566712fd7b7ae7d59"
  solver-name = "gps-cdcl"
  solver-version = 1
@@ -10,12 +10,12 @@

 [[constraint]]
  name = "github.com/alecthomas/chroma"
-  version = "^0.2.0"
+  branch = "master"

 [[constraint]]
  branch = "master"
  name = "github.com/bep/gitmap"
-
+  
 [[constraint]]
 name = "github.com/chaseadamsio/goorgeous"
 version = "^1.1.0"
@@ -57,8 +57,8 @@
  version = "1.5.0"

 [[constraint]]
-  branch = "master"
  name = "github.com/markbates/inflect"
+  revision = "a12c3aec81a6a938bf584a4bac567afed9256586"

 [[constraint]]
  name = "github.com/miekg/mmark"
@@ -74,18 +74,18 @@

 [[constraint]]
  name = "github.com/russross/blackfriday"
-  version = "^1.5.0"
+  branch = "master"

 [[constraint]]
  name = "github.com/spf13/afero"
-  version = "^1.0.1"
+  version = "^1.1.0"

 [[constraint]]
  name = "github.com/spf13/cast"
  version = "^1.1.0"

 [[constraint]]
-  branch = "master"
+  version = "^0.0.1"
  name = "github.com/spf13/cobra"

 [[constraint]]
@@ -135,3 +135,17 @@
 [[constraint]]
  name = "github.com/gobwas/glob"
  version = "0.2.2"
+
+
+[[constraint]]
+  name = "github.com/muesli/smartcrop"
+  branch = "master"
+
+
+[[constraint]]
+  name = "github.com/sanity-io/litter"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/bep/debounce"
+  version = "^1.1.0"
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -1,194 +0,0 @@
-Apache License
-==============
-
-_Version 2.0, January 2004_
-_&lt;<http://www.apache.org/licenses/>&gt;_
-
-### Terms and Conditions for use, reproduction, and distribution
-
-#### 1. Definitions
-
-“License” shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-“Licensor” shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-“Legal Entity” shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, “control” means **(i)** the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
-outstanding shares, or **(iii)** beneficial ownership of such entity.
-
-“You” (or “Your”) shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-“Source” form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-“Object” form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-“Work” shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-“Derivative Works” shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-“Contribution” shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-“submitted” means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as “Not a Contribution.”
-
-“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-#### 2. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-#### 3. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-#### 4. Redistribution
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-* **(b)** You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-#### 5. Submission of Contributions
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-#### 6. Trademarks
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-#### 7. Disclaimer of Warranty
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-#### 8. Limitation of Liability
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-#### 9. Accepting Warranty or Additional Liability
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-_END OF TERMS AND CONDITIONS_
-
-### APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets `[]` replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same “printed page” as the copyright notice for easier identification within
-third-party archives.
-
-    Copyright [yyyy] [name of copyright owner]
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
@@ -54,15 +54,28 @@ Use the [installation instructions in the Hugo documentation](https://gohugo.io/

 ### Build and Install the Binaries from Source (Advanced Install)

-Add Hugo and its package dependencies to your go `src` directory.
+#### Prerequisite Tools

-    go get -v github.com/gohugoio/hugo
+* [Git](http://git-scm.com/)
+* [Go (latest or previous version)](https://golang.org/dl/)

-Once the `get` completes, you should find your new `hugo` (or `hugo.exe`) executable sitting inside `$GOPATH/bin/`.
+#### Vendored Dependencies

-To update Hugo’s dependencies, use `go get` with the `-u` option.
+Hugo uses [dep](https://github.com/golang/dep) to vendor dependencies, but we don't commit the vendored packages themselves to the Hugo git repository. Therefore, a simple `go get` is _not_ supported because the command is not vendor aware.

-    go get -u -v github.com/gohugoio/hugo
+The simplest way is to use [mage](https://github.com/magefile/mage) (a Make alternative for Go projects.)
+
+#### Fetch from GitHub
+
+```bash
+go get github.com/magefile/mage
+go get -d github.com/gohugoio/hugo
+cd ${GOPATH:-$HOME/go}/src/github.com/gohugoio/hugo
+mage vendor
+mage install
+```
+
+**If you are a Windows user, substitute the `$HOME` environment variable above with `%USERPROFILE%`.**
 	
 ## The Hugo Documentation

@@ -23,51 +23,55 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-var (
+type benchmarkCmd struct {
 	benchmarkTimes int
 	cpuProfileFile string
 	memProfileFile string
-)

-var benchmarkCmd = &cobra.Command{
-	Use:   "benchmark",
-	Short: "Benchmark Hugo by building a site a number of times.",
-	Long: `Hugo can build a site many times over and analyze the running process
+	*baseBuilderCmd
+}
+
+func (b *commandsBuilder) newBenchmarkCmd() *benchmarkCmd {
+	cmd := &cobra.Command{
+		Use:   "benchmark",
+		Short: "Benchmark Hugo by building a site a number of times.",
+		Long: `Hugo can build a site many times over and analyze the running process
 creating a benchmark.`,
+	}
+
+	c := &benchmarkCmd{baseBuilderCmd: b.newBuilderCmd(cmd)}
+
+	cmd.Flags().StringVar(&c.cpuProfileFile, "cpuprofile", "", "path/filename for the CPU profile file")
+	cmd.Flags().StringVar(&c.memProfileFile, "memprofile", "", "path/filename for the memory profile file")
+	cmd.Flags().IntVarP(&c.benchmarkTimes, "count", "n", 13, "number of times to build the site")
+	cmd.Flags().Bool("renderToMemory", false, "render to memory (only useful for benchmark testing)")
+
+	cmd.RunE = c.benchmark
+
+	return c
 }

-func init() {
-	initHugoBuilderFlags(benchmarkCmd)
-	initBenchmarkBuildingFlags(benchmarkCmd)
-
-	benchmarkCmd.Flags().StringVar(&cpuProfileFile, "cpuprofile", "", "path/filename for the CPU profile file")
-	benchmarkCmd.Flags().StringVar(&memProfileFile, "memprofile", "", "path/filename for the memory profile file")
-	benchmarkCmd.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
-
-	benchmarkCmd.RunE = benchmark
-}
-
-func benchmark(cmd *cobra.Command, args []string) error {
+func (c *benchmarkCmd) benchmark(cmd *cobra.Command, args []string) error {
 	cfgInit := func(c *commandeer) error {
-		c.Set("renderToMemory", renderToMemory)
 		return nil
 	}
-	c, err := InitializeConfig(false, cfgInit, benchmarkCmd)
+
+	comm, err := initializeConfig(false, &c.hugoBuilderCommon, c, cfgInit)
 	if err != nil {
 		return err
 	}

 	var memProf *os.File
-	if memProfileFile != "" {
-		memProf, err = os.Create(memProfileFile)
+	if c.memProfileFile != "" {
+		memProf, err = os.Create(c.memProfileFile)
 		if err != nil {
 			return err
 		}
 	}

 	var cpuProf *os.File
-	if cpuProfileFile != "" {
-		cpuProf, err = os.Create(cpuProfileFile)
+	if c.cpuProfileFile != "" {
+		cpuProf, err = os.Create(c.cpuProfileFile)
 		if err != nil {
 			return err
 		}
@@ -82,8 +86,8 @@ func benchmark(cmd *cobra.Command, args []string) error {
 	}

 	t := time.Now()
-	for i := 0; i < benchmarkTimes; i++ {
-		if err = c.resetAndBuildSites(); err != nil {
+	for i := 0; i < c.benchmarkTimes; i++ {
+		if err = comm.resetAndBuildSites(); err != nil {
 			return err
 		}
 	}
@@ -103,9 +107,9 @@ func benchmark(cmd *cobra.Command, args []string) error {
 	totalMallocs := memStats.Mallocs - mallocs

 	jww.FEEDBACK.Println()
-	jww.FEEDBACK.Printf("Average time per operation: %vms\n", int(1000*totalTime.Seconds()/float64(benchmarkTimes)))
-	jww.FEEDBACK.Printf("Average memory allocated per operation: %vkB\n", totalMemAllocated/uint64(benchmarkTimes)/1024)
-	jww.FEEDBACK.Printf("Average allocations per operation: %v\n", totalMallocs/uint64(benchmarkTimes))
+	jww.FEEDBACK.Printf("Average time per operation: %vms\n", int(1000*totalTime.Seconds()/float64(c.benchmarkTimes)))
+	jww.FEEDBACK.Printf("Average memory allocated per operation: %vkB\n", totalMemAllocated/uint64(c.benchmarkTimes)/1024)
+	jww.FEEDBACK.Printf("Average allocations per operation: %v\n", totalMallocs/uint64(c.benchmarkTimes))

 	return nil
 }
@@ -1,4 +1,4 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,13 +11,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+// +build !darwin
+
 package commands

 import (
 	"github.com/spf13/cobra"
 )

-var checkCmd = &cobra.Command{
-	Use:   "check",
-	Short: "Contains some verification checks",
+var _ cmder = (*checkCmd)(nil)
+
+type checkCmd struct {
+	*baseCmd
+}
+
+func newCheckCmd() *checkCmd {
+	return &checkCmd{baseCmd: &baseCmd{cmd: &cobra.Command{
+		Use:   "check",
+		Short: "Contains some verification checks",
+	},
+	}}
 }
@@ -0,0 +1,36 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var _ cmder = (*checkCmd)(nil)
+
+type checkCmd struct {
+	*baseCmd
+}
+
+func newCheckCmd() *checkCmd {
+	cc := &checkCmd{baseCmd: &baseCmd{cmd: &cobra.Command{
+		Use:   "check",
+		Short: "Contains some verification checks",
+	},
+	}}
+
+	cc.cmd.AddCommand(newLimitCmd().getCommand())
+
+	return cc
+}
@@ -1,4 +1,4 @@
-// Copyright 2017 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,22 @@
 package commands

 import (
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	"github.com/gohugoio/hugo/config"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gohugoio/hugo/utils"
+
+	"github.com/spf13/afero"
+
+	"github.com/gohugoio/hugo/hugolib"
+
+	"github.com/bep/debounce"
 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/deps"
 	"github.com/gohugoio/hugo/helpers"
@@ -23,13 +39,31 @@ import (

 type commandeer struct {
 	*deps.DepsCfg
+
+	hugo *hugolib.HugoSites
+
+	h    *hugoBuilderCommon
+	ftch flagsToConfigHandler
+
 	pathSpec    *helpers.PathSpec
 	visitedURLs *types.EvictingStringQueue

 	staticDirsConfig []*src.Dirs

-	serverPorts []int
-	languages   helpers.Languages
+	// We watch these for changes.
+	configFiles []string
+
+	doWithCommandeer func(c *commandeer) error
+
+	// We can do this only once.
+	fsCreate sync.Once
+
+	// Used in cases where we get flooded with events in server mode.
+	debounce func(f func())
+
+	serverPorts         []int
+	languagesConfigured bool
+	languages           helpers.Languages

 	configured bool
 }
@@ -65,16 +99,153 @@ func (c *commandeer) initFs(fs *hugofs.Fs) error {
 	return nil
 }

-func newCommandeer(cfg *deps.DepsCfg, running bool) (*commandeer, error) {
-	cfg.Running = running
+func newCommandeer(running bool, h *hugoBuilderCommon, f flagsToConfigHandler, doWithCommandeer func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {

-	var languages helpers.Languages
-
-	if l, ok := cfg.Cfg.Get("languagesSorted").(helpers.Languages); ok {
-		languages = l
+	var rebuildDebouncer func(f func())
+	if running {
+		// The time value used is tested with mass content replacements in a fairly big Hugo site.
+		// It is better to wait for some seconds in those cases rather than get flooded
+		// with rebuilds.
+		rebuildDebouncer, _, _ = debounce.New(4 * time.Second)
 	}

-	c := &commandeer{DepsCfg: cfg, languages: languages, visitedURLs: types.NewEvictingStringQueue(10)}
+	c := &commandeer{
+		h:                h,
+		ftch:             f,
+		doWithCommandeer: doWithCommandeer,
+		visitedURLs:      types.NewEvictingStringQueue(10),
+		debounce:         rebuildDebouncer,
+	}
+
+	return c, c.loadConfig(running)
+}
+
+func (c *commandeer) loadConfig(running bool) error {
+
+	if c.DepsCfg == nil {
+		c.DepsCfg = &deps.DepsCfg{}
+	}
+
+	cfg := c.DepsCfg
+	c.configured = false
+	cfg.Running = running
+
+	var dir string
+	if c.h.source != "" {
+		dir, _ = filepath.Abs(c.h.source)
+	} else {
+		dir, _ = os.Getwd()
+	}
+
+	var sourceFs afero.Fs = hugofs.Os
+	if c.DepsCfg.Fs != nil {
+		sourceFs = c.DepsCfg.Fs.Source
+	}
+
+	doWithConfig := func(cfg config.Provider) error {
+
+		if c.ftch != nil {
+			c.ftch.flagsToConfig(cfg)
+		}
+
+		cfg.Set("workingDir", dir)
+
+		return nil
+	}
+
+	doWithCommandeer := func(cfg config.Provider) error {
+		c.Cfg = cfg
+		if c.doWithCommandeer == nil {
+			return nil
+		}
+		err := c.doWithCommandeer(c)
+		return err
+	}
+
+	config, configFiles, err := hugolib.LoadConfig(
+		hugolib.ConfigSourceDescriptor{Fs: sourceFs, Path: c.h.source, WorkingDir: dir, Filename: c.h.cfgFile},
+		doWithCommandeer,
+		doWithConfig)
+
+	if err != nil {
+		return err
+	}
+
+	c.configFiles = configFiles
+
+	if l, ok := c.Cfg.Get("languagesSorted").(helpers.Languages); ok {
+		c.languagesConfigured = true
+		c.languages = l
+	}
+
+	// This is potentially double work, but we need to do this one more time now
+	// that all the languages have been configured.
+	if c.doWithCommandeer != nil {
+		if err := c.doWithCommandeer(c); err != nil {
+			return err
+		}
+	}
+
+	logger, err := c.createLogger(config)
+	if err != nil {
+		return err
+	}
+
+	cfg.Logger = logger
+
+	createMemFs := config.GetBool("renderToMemory")
+
+	if createMemFs {
+		// Rendering to memoryFS, publish to Root regardless of publishDir.
+		config.Set("publishDir", "/")
+	}
+
+	c.fsCreate.Do(func() {
+		fs := hugofs.NewFrom(sourceFs, config)
+
+		// Hugo writes the output to memory instead of the disk.
+		if createMemFs {
+			fs.Destination = new(afero.MemMapFs)
+		}
+
+		err = c.initFs(fs)
+	})
+
+	if err != nil {
+		return err
+	}
+
+	cacheDir := config.GetString("cacheDir")
+	if cacheDir != "" {
+		if helpers.FilePathSeparator != cacheDir[len(cacheDir)-1:] {
+			cacheDir = cacheDir + helpers.FilePathSeparator
+		}
+		isDir, err := helpers.DirExists(cacheDir, sourceFs)
+		utils.CheckErr(cfg.Logger, err)
+		if !isDir {
+			mkdir(cacheDir)
+		}
+		config.Set("cacheDir", cacheDir)
+	} else {
+		config.Set("cacheDir", helpers.GetTempDir("hugo_cache", sourceFs))
+	}
+
+	cfg.Logger.INFO.Println("Using config file:", config.ConfigFileUsed())
+
+	themeDir := c.PathSpec().GetThemeDir()
+	if themeDir != "" {
+		if _, err := sourceFs.Stat(themeDir); os.IsNotExist(err) {
+			return newSystemError("Unable to find theme Directory:", themeDir)
+		}
+	}
+
+	themeVersionMismatch, minVersion := c.isThemeVsHugoVersionMismatch(sourceFs)
+
+	if themeVersionMismatch {
+		cfg.Logger.ERROR.Printf("Current theme does not support Hugo version %s. Minimum version required is %s\n",
+			helpers.CurrentHugoVersion.ReleaseVersion(), minVersion)
+	}
+
+	return nil

-	return c, nil
 }
@@ -0,0 +1,243 @@
+// Copyright 2017 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/spf13/cobra"
+
+	"github.com/spf13/nitro"
+)
+
+type commandsBuilder struct {
+	hugoBuilderCommon
+
+	commands []cmder
+}
+
+func newCommandsBuilder() *commandsBuilder {
+	return &commandsBuilder{}
+}
+
+func (b *commandsBuilder) addCommands(commands ...cmder) *commandsBuilder {
+	b.commands = append(b.commands, commands...)
+	return b
+}
+
+func (b *commandsBuilder) addAll() *commandsBuilder {
+	b.addCommands(
+		b.newServerCmd(),
+		newVersionCmd(),
+		newEnvCmd(),
+		newConfigCmd(),
+		newCheckCmd(),
+		b.newBenchmarkCmd(),
+		newConvertCmd(),
+		newNewCmd(),
+		newListCmd(),
+		newImportCmd(),
+		newGenCmd(),
+		createReleaser(),
+	)
+
+	return b
+}
+
+func (b *commandsBuilder) build() *hugoCmd {
+	h := b.newHugoCmd()
+	addCommands(h.getCommand(), b.commands...)
+	return h
+}
+
+func addCommands(root *cobra.Command, commands ...cmder) {
+	for _, command := range commands {
+		cmd := command.getCommand()
+		if cmd == nil {
+			continue
+		}
+		root.AddCommand(cmd)
+	}
+}
+
+type baseCmd struct {
+	cmd *cobra.Command
+}
+
+var _ commandsBuilderGetter = (*baseBuilderCmd)(nil)
+
+// Used in tests.
+type commandsBuilderGetter interface {
+	getCmmandsBuilder() *commandsBuilder
+}
+type baseBuilderCmd struct {
+	*baseCmd
+	*commandsBuilder
+}
+
+func (b *baseBuilderCmd) getCmmandsBuilder() *commandsBuilder {
+	return b.commandsBuilder
+}
+
+func (c *baseCmd) getCommand() *cobra.Command {
+	return c.cmd
+}
+
+func newBaseCmd(cmd *cobra.Command) *baseCmd {
+	return &baseCmd{cmd: cmd}
+}
+
+func (b *commandsBuilder) newBuilderCmd(cmd *cobra.Command) *baseBuilderCmd {
+	bcmd := &baseBuilderCmd{commandsBuilder: b, baseCmd: &baseCmd{cmd: cmd}}
+	bcmd.hugoBuilderCommon.handleFlags(cmd)
+	return bcmd
+}
+
+func (c *baseCmd) flagsToConfig(cfg config.Provider) {
+	initializeFlags(c.cmd, cfg)
+}
+
+type hugoCmd struct {
+	*baseBuilderCmd
+
+	// Need to get the sites once built.
+	c *commandeer
+}
+
+var _ cmder = (*nilCommand)(nil)
+
+type nilCommand struct {
+}
+
+func (c *nilCommand) getCommand() *cobra.Command {
+	return nil
+}
+
+func (c *nilCommand) flagsToConfig(cfg config.Provider) {
+
+}
+
+func (b *commandsBuilder) newHugoCmd() *hugoCmd {
+	cc := &hugoCmd{}
+
+	cc.baseBuilderCmd = b.newBuilderCmd(&cobra.Command{
+		Use:   "hugo",
+		Short: "hugo builds your site",
+		Long: `hugo is the main command, used to build your Hugo site.
+
+Hugo is a Fast and Flexible Static Site Generator
+built with love by spf13 and friends in Go.
+
+Complete documentation is available at http://gohugo.io/.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cfgInit := func(c *commandeer) error {
+				if cc.buildWatch {
+					c.Set("disableLiveReload", true)
+				}
+				return nil
+			}
+
+			c, err := initializeConfig(cc.buildWatch, &cc.hugoBuilderCommon, cc, cfgInit)
+			if err != nil {
+				return err
+			}
+			cc.c = c
+
+			return c.build()
+		},
+	})
+
+	cc.cmd.PersistentFlags().StringVar(&cc.cfgFile, "config", "", "config file (default is path/config.yaml|json|toml)")
+	cc.cmd.PersistentFlags().BoolVar(&cc.quiet, "quiet", false, "build in quiet mode")
+
+	// Set bash-completion
+	validConfigFilenames := []string{"json", "js", "yaml", "yml", "toml", "tml"}
+	_ = cc.cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, validConfigFilenames)
+
+	cc.cmd.PersistentFlags().BoolVarP(&cc.verbose, "verbose", "v", false, "verbose output")
+	cc.cmd.PersistentFlags().BoolVarP(&cc.debug, "debug", "", false, "debug output")
+	cc.cmd.PersistentFlags().BoolVar(&cc.logging, "log", false, "enable Logging")
+	cc.cmd.PersistentFlags().StringVar(&cc.logFile, "logFile", "", "log File path (if set, logging enabled automatically)")
+	cc.cmd.PersistentFlags().BoolVar(&cc.verboseLog, "verboseLog", false, "verbose logging")
+
+	cc.cmd.Flags().BoolVarP(&cc.buildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")
+
+	cc.cmd.Flags().Bool("renderToMemory", false, "render to memory (only useful for benchmark testing)")
+
+	// Set bash-completion
+	_ = cc.cmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{})
+
+	cc.cmd.SetGlobalNormalizationFunc(helpers.NormalizeHugoFlags)
+	cc.cmd.SilenceUsage = true
+
+	return cc
+}
+
+type hugoBuilderCommon struct {
+	source  string
+	baseURL string
+
+	buildWatch bool
+
+	gc bool
+
+	// TODO(bep) var vs string
+	logging    bool
+	verbose    bool
+	verboseLog bool
+	debug      bool
+	quiet      bool
+
+	cfgFile string
+	logFile string
+}
+
+func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) {
+	cmd.Flags().Bool("cleanDestinationDir", false, "remove files from destination not found in static directories")
+	cmd.Flags().BoolP("buildDrafts", "D", false, "include content marked as draft")
+	cmd.Flags().BoolP("buildFuture", "F", false, "include content with publishdate in the future")
+	cmd.Flags().BoolP("buildExpired", "E", false, "include expired content")
+	cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+	cmd.Flags().StringP("contentDir", "c", "", "filesystem path to content directory")
+	cmd.Flags().StringP("layoutDir", "l", "", "filesystem path to layout directory")
+	cmd.Flags().StringP("cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/")
+	cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory")
+	cmd.Flags().StringP("destination", "d", "", "filesystem path to write files to")
+	cmd.Flags().StringP("theme", "t", "", "theme to use (located in /themes/THEMENAME/)")
+	cmd.Flags().StringP("themesDir", "", "", "filesystem path to themes directory")
+	cmd.Flags().Bool("uglyURLs", false, "(deprecated) if true, use /filename.html instead of /filename/")
+	cmd.Flags().Bool("canonifyURLs", false, "(deprecated) if true, all relative URLs will be canonicalized using baseURL")
+	cmd.Flags().StringVarP(&cc.baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. http://spf13.com/")
+	cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date and author info to the pages")
+	cmd.Flags().BoolVar(&cc.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
+
+	cmd.Flags().BoolVar(&nitro.AnalysisOn, "stepAnalysis", false, "display memory and timing of different steps of the program")
+	cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions")
+	cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics")
+	cmd.Flags().Bool("pluralizeListTitles", true, "(deprecated) pluralize titles in lists using inflect")
+	cmd.Flags().Bool("preserveTaxonomyNames", false, `(deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")`)
+	cmd.Flags().BoolP("forceSyncStatic", "", false, "copy all files when static is changed.")
+	cmd.Flags().BoolP("noTimes", "", false, "don't sync modification time of files")
+	cmd.Flags().BoolP("noChmod", "", false, "don't sync permission mode of files")
+	cmd.Flags().BoolP("i18n-warnings", "", false, "print missing translations")
+
+	cmd.Flags().StringSlice("disableKinds", []string{}, "disable different kind of pages (home, RSS etc.)")
+
+	// Set bash-completion.
+	// Each flag must first be defined before using the SetAnnotation() call.
+	_ = cmd.Flags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+	_ = cmd.Flags().SetAnnotation("cacheDir", cobra.BashCompSubdirsInDir, []string{})
+	_ = cmd.Flags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})
+	_ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
+}
@@ -0,0 +1,253 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestExecute(t *testing.T) {
+
+	assert := require.New(t)
+
+	dir, err := createSimpleTestSite(t)
+	assert.NoError(err)
+
+	defer func() {
+		os.RemoveAll(dir)
+	}()
+
+	resp := Execute([]string{"-s=" + dir})
+	assert.NoError(resp.Err)
+	result := resp.Result
+	assert.True(len(result.Sites) == 1)
+	assert.True(len(result.Sites[0].RegularPages) == 1)
+}
+
+func TestCommandsPersistentFlags(t *testing.T) {
+	assert := require.New(t)
+
+	noOpRunE := func(cmd *cobra.Command, args []string) error {
+		return nil
+	}
+
+	tests := []struct {
+		args  []string
+		check func(command []cmder)
+	}{{[]string{"server",
+		"--config=myconfig.toml",
+		"--contentDir=mycontent",
+		"--disableKinds=page,home",
+		"--layoutDir=mylayouts",
+		"--theme=mytheme",
+		"--gc",
+		"--themesDir=mythemes",
+		"--cleanDestinationDir",
+		"--navigateToChanged",
+		"--disableLiveReload",
+		"--noHTTPCache",
+		"--i18n-warnings",
+		"--destination=/tmp/mydestination",
+		"-b=https://example.com/b/",
+		"--port=1366",
+		"--renderToDisk",
+		"--source=mysource",
+		"--uglyURLs"}, func(commands []cmder) {
+		var sc *serverCmd
+		for _, command := range commands {
+			if b, ok := command.(commandsBuilderGetter); ok {
+				v := b.getCmmandsBuilder().hugoBuilderCommon
+				assert.Equal("myconfig.toml", v.cfgFile)
+				assert.Equal("mysource", v.source)
+				assert.Equal("https://example.com/b/", v.baseURL)
+			}
+
+			if srvCmd, ok := command.(*serverCmd); ok {
+				sc = srvCmd
+			}
+		}
+
+		assert.NotNil(sc)
+		assert.True(sc.navigateToChanged)
+		assert.True(sc.disableLiveReload)
+		assert.True(sc.noHTTPCache)
+		assert.True(sc.renderToDisk)
+		assert.Equal(1366, sc.serverPort)
+
+		cfg := viper.New()
+		sc.flagsToConfig(cfg)
+		assert.Equal("/tmp/mydestination", cfg.GetString("publishDir"))
+		assert.Equal("mycontent", cfg.GetString("contentDir"))
+		assert.Equal("mylayouts", cfg.GetString("layoutDir"))
+		assert.Equal("mytheme", cfg.GetString("theme"))
+		assert.Equal("mythemes", cfg.GetString("themesDir"))
+		assert.Equal("https://example.com/b/", cfg.GetString("baseURL"))
+
+		assert.Equal([]string{"page", "home"}, cfg.Get("disableKinds"))
+
+		assert.True(cfg.GetBool("uglyURLs"))
+		assert.True(cfg.GetBool("gc"))
+
+		// The flag is named i18n-warnings
+		assert.True(cfg.GetBool("logI18nWarnings"))
+
+	}}}
+
+	for _, test := range tests {
+		b := newCommandsBuilder()
+		root := b.addAll().build()
+
+		for _, c := range b.commands {
+			if c.getCommand() == nil {
+				continue
+			}
+			// We are only intereseted in the flag handling here.
+			c.getCommand().RunE = noOpRunE
+		}
+		rootCmd := root.getCommand()
+		rootCmd.SetArgs(test.args)
+		assert.NoError(rootCmd.Execute())
+		test.check(b.commands)
+	}
+
+}
+
+func TestCommandsExecute(t *testing.T) {
+
+	assert := require.New(t)
+
+	dir, err := createSimpleTestSite(t)
+	assert.NoError(err)
+
+	dirOut, err := ioutil.TempDir("", "hugo-cli-out")
+	assert.NoError(err)
+
+	defer func() {
+		os.RemoveAll(dir)
+		os.RemoveAll(dirOut)
+	}()
+
+	sourceFlag := fmt.Sprintf("-s=%s", dir)
+
+	tests := []struct {
+		commands           []string
+		flags              []string
+		expectErrToContain string
+	}{
+		// TODO(bep) permission issue on my OSX? "operation not permitted" {[]string{"check", "ulimit"}, nil, false},
+		{[]string{"env"}, nil, ""},
+		{[]string{"version"}, nil, ""},
+		// no args = hugo build
+		{nil, []string{sourceFlag}, ""},
+		{nil, []string{sourceFlag, "--renderToMemory"}, ""},
+		{[]string{"config"}, []string{sourceFlag}, ""},
+		{[]string{"benchmark"}, []string{sourceFlag, "-n=1"}, ""},
+		{[]string{"convert", "toTOML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "toml")}, ""},
+		{[]string{"convert", "toYAML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "yaml")}, ""},
+		{[]string{"convert", "toJSON"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "json")}, ""},
+		{[]string{"gen", "autocomplete"}, []string{"--completionfile=" + filepath.Join(dirOut, "autocomplete.txt")}, ""},
+		{[]string{"gen", "chromastyles"}, []string{"--style=manni"}, ""},
+		{[]string{"gen", "doc"}, []string{"--dir=" + filepath.Join(dirOut, "doc")}, ""},
+		{[]string{"gen", "man"}, []string{"--dir=" + filepath.Join(dirOut, "man")}, ""},
+		{[]string{"list", "drafts"}, []string{sourceFlag}, ""},
+		{[]string{"list", "expired"}, []string{sourceFlag}, ""},
+		{[]string{"list", "future"}, []string{sourceFlag}, ""},
+		{[]string{"new", "new-page.md"}, []string{sourceFlag}, ""},
+		{[]string{"new", "site", filepath.Join(dirOut, "new-site")}, nil, ""},
+		{[]string{"unknowncommand"}, nil, "unknown command"},
+		// TODO(bep) cli refactor fix https://github.com/gohugoio/hugo/issues/4450
+		//{[]string{"new", "theme", filepath.Join(dirOut, "new-theme")}, nil,false},
+	}
+
+	for _, test := range tests {
+
+		hugoCmd := newCommandsBuilder().addAll().build().getCommand()
+		test.flags = append(test.flags, "--quiet")
+		hugoCmd.SetArgs(append(test.commands, test.flags...))
+
+		// TODO(bep) capture output and add some simple asserts
+		// TODO(bep) misspelled subcommands does not return an error. We should investigate this
+		// but before that, check for "Error: unknown command".
+
+		_, err := hugoCmd.ExecuteC()
+		if test.expectErrToContain != "" {
+			assert.Error(err, fmt.Sprintf("%v", test.commands))
+			assert.Contains(err.Error(), test.expectErrToContain)
+		} else {
+			assert.NoError(err, fmt.Sprintf("%v", test.commands))
+		}
+
+	}
+
+}
+
+func createSimpleTestSite(t *testing.T) (string, error) {
+	d, e := ioutil.TempDir("", "hugo-cli")
+	if e != nil {
+		return "", e
+	}
+
+	// Just the basic. These are for CLI tests, not site testing.
+	writeFile(t, filepath.Join(d, "config.toml"), `
+
+baseURL = "https://example.org"
+title = "Hugo Commands"
+
+`)
+
+	writeFile(t, filepath.Join(d, "content", "p1.md"), `
+---
+title: "P1"
+weight: 1
+---
+
+Content
+
+`)
+
+	writeFile(t, filepath.Join(d, "layouts", "_default", "single.html"), `
+
+Single: {{ .Title }}
+
+`)
+
+	writeFile(t, filepath.Join(d, "layouts", "_default", "list.html"), `
+
+List: {{ .Title }}
+
+`)
+
+	return d, nil
+
+}
+
+func writeFile(t *testing.T, filename, content string) {
+	must(t, os.MkdirAll(filepath.Dir(filename), os.FileMode(0755)))
+	must(t, ioutil.WriteFile(filename, []byte(content), os.FileMode(0755)))
+}
+
+func must(t *testing.T, err error) {
+	if err != nil {
+		t.Fatal(err)
+	}
+}
@@ -22,18 +22,29 @@ import (
 	"github.com/spf13/viper"
 )

-var configCmd = &cobra.Command{
-	Use:   "config",
-	Short: "Print the site configuration",
-	Long:  `Print the site configuration, both default and custom settings.`,
+var _ cmder = (*configCmd)(nil)
+
+type configCmd struct {
+	hugoBuilderCommon
+	*baseCmd
 }

-func init() {
-	configCmd.RunE = printConfig
+func newConfigCmd() *configCmd {
+	cc := &configCmd{}
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "config",
+		Short: "Print the site configuration",
+		Long:  `Print the site configuration, both default and custom settings.`,
+		RunE:  cc.printConfig,
+	})
+
+	cc.cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+
+	return cc
 }

-func printConfig(cmd *cobra.Command, args []string) error {
-	cfg, err := InitializeConfig(false, nil, configCmd)
+func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
+	cfg, err := initializeConfig(false, &c.hugoBuilderCommon, c, nil)

 	if err != nil {
 		return err
@@ -28,64 +28,75 @@ import (
 	"github.com/spf13/cobra"
 )

-var outputDir string
-var unsafe bool
+var (
+	_ cmder = (*convertCmd)(nil)
+)

-var convertCmd = &cobra.Command{
-	Use:   "convert",
-	Short: "Convert your content to different formats",
-	Long: `Convert your content (e.g. front matter) to different formats.
+type convertCmd struct {
+	hugoBuilderCommon
+
+	outputDir string
+	unsafe    bool
+
+	*baseCmd
+}
+
+func newConvertCmd() *convertCmd {
+	cc := &convertCmd{}
+
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "convert",
+		Short: "Convert your content to different formats",
+		Long: `Convert your content (e.g. front matter) to different formats.

 See convert's subcommands toJSON, toTOML and toYAML for more information.`,
-	RunE: nil,
-}
+		RunE: nil,
+	})

-var toJSONCmd = &cobra.Command{
-	Use:   "toJSON",
-	Short: "Convert front matter to JSON",
-	Long: `toJSON converts all front matter in the content directory
+	cc.cmd.AddCommand(
+		&cobra.Command{
+			Use:   "toJSON",
+			Short: "Convert front matter to JSON",
+			Long: `toJSON converts all front matter in the content directory
 to use JSON for the front matter.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return convertContents(rune([]byte(parser.JSONLead)[0]))
-	},
-}
-
-var toTOMLCmd = &cobra.Command{
-	Use:   "toTOML",
-	Short: "Convert front matter to TOML",
-	Long: `toTOML converts all front matter in the content directory
+			RunE: func(cmd *cobra.Command, args []string) error {
+				return cc.convertContents(rune([]byte(parser.JSONLead)[0]))
+			},
+		},
+		&cobra.Command{
+			Use:   "toTOML",
+			Short: "Convert front matter to TOML",
+			Long: `toTOML converts all front matter in the content directory
 to use TOML for the front matter.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return convertContents(rune([]byte(parser.TOMLLead)[0]))
-	},
-}
-
-var toYAMLCmd = &cobra.Command{
-	Use:   "toYAML",
-	Short: "Convert front matter to YAML",
-	Long: `toYAML converts all front matter in the content directory
+			RunE: func(cmd *cobra.Command, args []string) error {
+				return cc.convertContents(rune([]byte(parser.TOMLLead)[0]))
+			},
+		},
+		&cobra.Command{
+			Use:   "toYAML",
+			Short: "Convert front matter to YAML",
+			Long: `toYAML converts all front matter in the content directory
 to use YAML for the front matter.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return convertContents(rune([]byte(parser.YAMLLead)[0]))
-	},
+			RunE: func(cmd *cobra.Command, args []string) error {
+				return cc.convertContents(rune([]byte(parser.YAMLLead)[0]))
+			},
+		},
+	)
+
+	cc.cmd.PersistentFlags().StringVarP(&cc.outputDir, "output", "o", "", "filesystem path to write files to")
+	cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+	cc.cmd.PersistentFlags().BoolVar(&cc.unsafe, "unsafe", false, "enable less safe operations, please backup first")
+	cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+
+	return cc
 }

-func init() {
-	convertCmd.AddCommand(toJSONCmd)
-	convertCmd.AddCommand(toTOMLCmd)
-	convertCmd.AddCommand(toYAMLCmd)
-	convertCmd.PersistentFlags().StringVarP(&outputDir, "output", "o", "", "filesystem path to write files to")
-	convertCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
-	convertCmd.PersistentFlags().BoolVar(&unsafe, "unsafe", false, "enable less safe operations, please backup first")
-	convertCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-}
-
-func convertContents(mark rune) error {
-	if outputDir == "" && !unsafe {
+func (cc *convertCmd) convertContents(mark rune) error {
+	if cc.outputDir == "" && !cc.unsafe {
 		return newUserError("Unsafe operation not allowed, use --unsafe or set a different output path")
 	}

-	c, err := InitializeConfig(false, nil)
+	c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, nil)
 	if err != nil {
 		return err
 	}
@@ -103,17 +114,17 @@ func convertContents(mark rune) error {

 	site.Log.FEEDBACK.Println("processing", len(site.AllPages), "content files")
 	for _, p := range site.AllPages {
-		if err := convertAndSavePage(p, site, mark); err != nil {
+		if err := cc.convertAndSavePage(p, site, mark); err != nil {
 			return err
 		}
 	}
 	return nil
 }

-func convertAndSavePage(p *hugolib.Page, site *hugolib.Site, mark rune) error {
+func (cc *convertCmd) convertAndSavePage(p *hugolib.Page, site *hugolib.Site, mark rune) error {
 	// The resources are not in .Site.AllPages.
 	for _, r := range p.Resources.ByType("page") {
-		if err := convertAndSavePage(r.(*hugolib.Page), site, mark); err != nil {
+		if err := cc.convertAndSavePage(r.(*hugolib.Page), site, mark); err != nil {
 			return err
 		}
 	}
@@ -171,8 +182,8 @@ func convertAndSavePage(p *hugolib.Page, site *hugolib.Site, mark rune) error {
 	}

 	newFilename := p.Filename()
-	if outputDir != "" {
-		newFilename = filepath.Join(outputDir, p.Dir(), newPage.LogicalName())
+	if cc.outputDir != "" {
+		newFilename = filepath.Join(cc.outputDir, p.Dir(), newPage.LogicalName())
 	}

 	if err = newPage.SaveSourceAs(newFilename); err != nil {
@@ -20,16 +20,25 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-var envCmd = &cobra.Command{
-	Use:   "env",
-	Short: "Print Hugo version and environment info",
-	Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		printHugoVersion()
-		jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
-		jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
-		jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
+var _ cmder = (*envCmd)(nil)

-		return nil
-	},
+type envCmd struct {
+	*baseCmd
+}
+
+func newEnvCmd() *envCmd {
+	return &envCmd{baseCmd: newBaseCmd(&cobra.Command{
+		Use:   "env",
+		Short: "Print Hugo version and environment info",
+		Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			printHugoVersion()
+			jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
+			jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
+			jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
+
+			return nil
+		},
+	}),
+	}
 }
@@ -17,7 +17,25 @@ import (
 	"github.com/spf13/cobra"
 )

-var genCmd = &cobra.Command{
-	Use:   "gen",
-	Short: "A collection of several useful generators.",
+var _ cmder = (*genCmd)(nil)
+
+type genCmd struct {
+	*baseCmd
+}
+
+func newGenCmd() *genCmd {
+	cc := &genCmd{}
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "gen",
+		Short: "A collection of several useful generators.",
+	})
+
+	cc.cmd.AddCommand(
+		newGenautocompleteCmd().getCommand(),
+		newGenDocCmd().getCommand(),
+		newGenManCmd().getCommand(),
+		createGenDocsHelper().getCommand(),
+		createGenChromaStyles().getCommand())
+
+	return cc
 }
@@ -18,15 +18,24 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-var autocompleteTarget string
+var _ cmder = (*genautocompleteCmd)(nil)

-// bash for now (zsh and others will come)
-var autocompleteType string
+type genautocompleteCmd struct {
+	autocompleteTarget string

-var genautocompleteCmd = &cobra.Command{
-	Use:   "autocomplete",
-	Short: "Generate shell autocompletion script for Hugo",
-	Long: `Generates a shell autocompletion script for Hugo.
+	// bash for now (zsh and others will come)
+	autocompleteType string
+
+	*baseCmd
+}
+
+func newGenautocompleteCmd() *genautocompleteCmd {
+	cc := &genautocompleteCmd{}
+
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "autocomplete",
+		Short: "Generate shell autocompletion script for Hugo",
+		Long: `Generates a shell autocompletion script for Hugo.

 NOTE: The current version supports Bash only.
      This should work for *nix systems with Bash installed.
@@ -44,27 +53,28 @@ or just source them in directly:

 	$ . /etc/bash_completion`,

-	RunE: func(cmd *cobra.Command, args []string) error {
-		if autocompleteType != "bash" {
-			return newUserError("Only Bash is supported for now")
-		}
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if cc.autocompleteType != "bash" {
+				return newUserError("Only Bash is supported for now")
+			}

-		err := cmd.Root().GenBashCompletionFile(autocompleteTarget)
+			err := cmd.Root().GenBashCompletionFile(cc.autocompleteTarget)

-		if err != nil {
-			return err
-		}
+			if err != nil {
+				return err
+			}

-		jww.FEEDBACK.Println("Bash completion file for Hugo saved to", autocompleteTarget)
+			jww.FEEDBACK.Println("Bash completion file for Hugo saved to", cc.autocompleteTarget)

-		return nil
-	},
-}
+			return nil
+		},
+	})

-func init() {
-	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/hugo.sh", "autocompletion file")
-	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteType, "type", "", "bash", "autocompletion type (currently only bash supported)")
+	cc.cmd.PersistentFlags().StringVarP(&cc.autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/hugo.sh", "autocompletion file")
+	cc.cmd.PersistentFlags().StringVarP(&cc.autocompleteType, "type", "", "bash", "autocompletion type (currently only bash supported)")

 	// For bash-completion
-	genautocompleteCmd.PersistentFlags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
+	cc.cmd.PersistentFlags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
+
+	return cc
 }
@@ -22,23 +22,27 @@ import (
 	"github.com/spf13/cobra"
 )

+var (
+	_ cmder = (*genChromaStyles)(nil)
+)
+
 type genChromaStyles struct {
 	style          string
 	highlightStyle string
 	linesStyle     string
-	cmd            *cobra.Command
+	*baseCmd
 }

 // TODO(bep) highlight
 func createGenChromaStyles() *genChromaStyles {
 	g := &genChromaStyles{
-		cmd: &cobra.Command{
+		baseCmd: newBaseCmd(&cobra.Command{
 			Use:   "chromastyles",
 			Short: "Generate CSS stylesheet for the Chroma code highlighter",
 			Long: `Generate CSS stylesheet for the Chroma code highlighter for a given style. This stylesheet is needed if pygmentsUseClasses is enabled in config.

 See https://help.farbox.com/pygments.html for preview of available styles`,
-		},
+		}),
 	}

 	g.cmd.RunE = func(cmd *cobra.Command, args []string) error {
@@ -27,7 +27,15 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-const gendocFrontmatterTemplate = `---
+var _ cmder = (*genDocCmd)(nil)
+
+type genDocCmd struct {
+	gendocdir string
+	*baseCmd
+}
+
+func newGenDocCmd() *genDocCmd {
+	const gendocFrontmatterTemplate = `---
 date: %s
 title: "%s"
 slug: %s
@@ -35,11 +43,12 @@ url: %s
 ---
 `

-var gendocdir string
-var gendocCmd = &cobra.Command{
-	Use:   "doc",
-	Short: "Generate Markdown documentation for the Hugo CLI.",
-	Long: `Generate Markdown documentation for the Hugo CLI.
+	cc := &genDocCmd{}
+
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "doc",
+		Short: "Generate Markdown documentation for the Hugo CLI.",
+		Long: `Generate Markdown documentation for the Hugo CLI.

 This command is, mostly, used to create up-to-date documentation
 of Hugo's command-line interface for http://gohugo.io/.
@@ -47,40 +56,41 @@ of Hugo's command-line interface for http://gohugo.io/.
 It creates one Markdown file per command with front matter suitable
 for rendering in Hugo.`,

-	RunE: func(cmd *cobra.Command, args []string) error {
-		if !strings.HasSuffix(gendocdir, helpers.FilePathSeparator) {
-			gendocdir += helpers.FilePathSeparator
-		}
-		if found, _ := helpers.Exists(gendocdir, hugofs.Os); !found {
-			jww.FEEDBACK.Println("Directory", gendocdir, "does not exist, creating...")
-			if err := hugofs.Os.MkdirAll(gendocdir, 0777); err != nil {
-				return err
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if !strings.HasSuffix(cc.gendocdir, helpers.FilePathSeparator) {
+				cc.gendocdir += helpers.FilePathSeparator
+			}
+			if found, _ := helpers.Exists(cc.gendocdir, hugofs.Os); !found {
+				jww.FEEDBACK.Println("Directory", cc.gendocdir, "does not exist, creating...")
+				if err := hugofs.Os.MkdirAll(cc.gendocdir, 0777); err != nil {
+					return err
+				}
+			}
+			now := time.Now().Format("2006-01-02")
+			prepender := func(filename string) string {
+				name := filepath.Base(filename)
+				base := strings.TrimSuffix(name, path.Ext(name))
+				url := "/commands/" + strings.ToLower(base) + "/"
+				return fmt.Sprintf(gendocFrontmatterTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
 			}
-		}
-		now := time.Now().Format(time.RFC3339)
-		prepender := func(filename string) string {
-			name := filepath.Base(filename)
-			base := strings.TrimSuffix(name, path.Ext(name))
-			url := "/commands/" + strings.ToLower(base) + "/"
-			return fmt.Sprintf(gendocFrontmatterTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
-		}

-		linkHandler := func(name string) string {
-			base := strings.TrimSuffix(name, path.Ext(name))
-			return "/commands/" + strings.ToLower(base) + "/"
-		}
+			linkHandler := func(name string) string {
+				base := strings.TrimSuffix(name, path.Ext(name))
+				return "/commands/" + strings.ToLower(base) + "/"
+			}

-		jww.FEEDBACK.Println("Generating Hugo command-line documentation in", gendocdir, "...")
-		doc.GenMarkdownTreeCustom(cmd.Root(), gendocdir, prepender, linkHandler)
-		jww.FEEDBACK.Println("Done.")
+			jww.FEEDBACK.Println("Generating Hugo command-line documentation in", cc.gendocdir, "...")
+			doc.GenMarkdownTreeCustom(cmd.Root(), cc.gendocdir, prepender, linkHandler)
+			jww.FEEDBACK.Println("Done.")

-		return nil
-	},
-}
+			return nil
+		},
+	})

-func init() {
-	gendocCmd.PersistentFlags().StringVar(&gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
+	cc.cmd.PersistentFlags().StringVar(&cc.gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")

 	// For bash-completion
-	gendocCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+	cc.cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+
+	return cc
 }
@@ -23,18 +23,22 @@ import (
 	"github.com/spf13/cobra"
 )

+var (
+	_ cmder = (*genDocsHelper)(nil)
+)
+
 type genDocsHelper struct {
 	target string
-	cmd    *cobra.Command
+	*baseCmd
 }

 func createGenDocsHelper() *genDocsHelper {
 	g := &genDocsHelper{
-		cmd: &cobra.Command{
+		baseCmd: newBaseCmd(&cobra.Command{
 			Use:    "docshelper",
 			Short:  "Generate some data files for the Hugo docs.",
 			Hidden: true,
-		},
+		}),
 	}

 	g.cmd.RunE = func(cmd *cobra.Command, args []string) error {
@@ -24,43 +24,53 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-var genmandir string
-var genmanCmd = &cobra.Command{
-	Use:   "man",
-	Short: "Generate man pages for the Hugo CLI",
-	Long: `This command automatically generates up-to-date man pages of Hugo's
+var _ cmder = (*genManCmd)(nil)
+
+type genManCmd struct {
+	genmandir string
+	*baseCmd
+}
+
+func newGenManCmd() *genManCmd {
+	cc := &genManCmd{}
+
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "man",
+		Short: "Generate man pages for the Hugo CLI",
+		Long: `This command automatically generates up-to-date man pages of Hugo's
 command-line interface.  By default, it creates the man page files
 in the "man" directory under the current directory.`,

-	RunE: func(cmd *cobra.Command, args []string) error {
-		header := &doc.GenManHeader{
-			Section: "1",
-			Manual:  "Hugo Manual",
-			Source:  fmt.Sprintf("Hugo %s", helpers.CurrentHugoVersion),
-		}
-		if !strings.HasSuffix(genmandir, helpers.FilePathSeparator) {
-			genmandir += helpers.FilePathSeparator
-		}
-		if found, _ := helpers.Exists(genmandir, hugofs.Os); !found {
-			jww.FEEDBACK.Println("Directory", genmandir, "does not exist, creating...")
-			if err := hugofs.Os.MkdirAll(genmandir, 0777); err != nil {
-				return err
+		RunE: func(cmd *cobra.Command, args []string) error {
+			header := &doc.GenManHeader{
+				Section: "1",
+				Manual:  "Hugo Manual",
+				Source:  fmt.Sprintf("Hugo %s", helpers.CurrentHugoVersion),
 			}
-		}
-		cmd.Root().DisableAutoGenTag = true
+			if !strings.HasSuffix(cc.genmandir, helpers.FilePathSeparator) {
+				cc.genmandir += helpers.FilePathSeparator
+			}
+			if found, _ := helpers.Exists(cc.genmandir, hugofs.Os); !found {
+				jww.FEEDBACK.Println("Directory", cc.genmandir, "does not exist, creating...")
+				if err := hugofs.Os.MkdirAll(cc.genmandir, 0777); err != nil {
+					return err
+				}
+			}
+			cmd.Root().DisableAutoGenTag = true

-		jww.FEEDBACK.Println("Generating Hugo man pages in", genmandir, "...")
-		doc.GenManTree(cmd.Root(), header, genmandir)
+			jww.FEEDBACK.Println("Generating Hugo man pages in", cc.genmandir, "...")
+			doc.GenManTree(cmd.Root(), header, cc.genmandir)

-		jww.FEEDBACK.Println("Done.")
+			jww.FEEDBACK.Println("Done.")

-		return nil
-	},
-}
+			return nil
+		},
+	})

-func init() {
-	genmanCmd.PersistentFlags().StringVar(&genmandir, "dir", "man/", "the directory to write the man pages.")
+	cc.cmd.PersistentFlags().StringVar(&cc.genmandir, "dir", "man/", "the directory to write the man pages.")

 	// For bash-completion
-	genmanCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+	cc.cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+
+	return cc
 }
@@ -0,0 +1,72 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package commands defines and implements command-line commands and flags
+// used by Hugo. Commands and flags are implemented using Cobra.
+package commands
+
+import (
+	"fmt"
+	"regexp"
+
+	"github.com/gohugoio/hugo/config"
+	"github.com/spf13/cobra"
+)
+
+type flagsToConfigHandler interface {
+	flagsToConfig(cfg config.Provider)
+}
+
+type cmder interface {
+	flagsToConfigHandler
+	getCommand() *cobra.Command
+}
+
+// commandError is an error used to signal different error situations in command handling.
+type commandError struct {
+	s         string
+	userError bool
+}
+
+func (c commandError) Error() string {
+	return c.s
+}
+
+func (c commandError) isUserError() bool {
+	return c.userError
+}
+
+func newUserError(a ...interface{}) commandError {
+	return commandError{s: fmt.Sprintln(a...), userError: true}
+}
+
+func newSystemError(a ...interface{}) commandError {
+	return commandError{s: fmt.Sprintln(a...), userError: false}
+}
+
+func newSystemErrorF(format string, a ...interface{}) commandError {
+	return commandError{s: fmt.Sprintf(format, a...), userError: false}
+}
+
+// Catch some of the obvious user errors from Cobra.
+// We don't want to show the usage message for every error.
+// The below may be to generic. Time will show.
+var userErrorRegexp = regexp.MustCompile("argument|flag|shorthand")
+
+func isUserError(err error) bool {
+	if cErr, ok := err.(commandError); ok && cErr.isUserError() {
+		return true
+	}
+
+	return userErrorRegexp.MatchString(err.Error())
+}
@@ -0,0 +1,23 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !windows
+
+package commands
+
+const (
+	ansiEsc    = "\u001B"
+	clearLine  = "\r\033[K"
+	hideCursor = ansiEsc + "[?25l"
+	showCursor = ansiEsc + "[?25h"
+)
@@ -0,0 +1,23 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build windows
+
+package commands
+
+const (
+	ansiEsc    = ""
+	clearLine  = ""
+	hideCursor = ""
+	showCursor = ""
+)
@@ -1,4 +1,4 @@
-// Copyright 2016 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@ import (

 	"golang.org/x/sync/errgroup"

-	"github.com/gohugoio/hugo/hugofs"
-
 	"log"
 	"os"
 	"path/filepath"
@@ -41,10 +39,7 @@ import (
 	"github.com/gohugoio/hugo/parser"
 	flag "github.com/spf13/pflag"

-	"regexp"
-
 	"github.com/fsnotify/fsnotify"
-	"github.com/gohugoio/hugo/deps"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/livereload"
@@ -54,385 +49,75 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/fsync"
 	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/nitro"
-	"github.com/spf13/viper"
 )

-// Hugo represents the Hugo sites to build. This variable is exported as it
-// is used by at least one external library (the Hugo caddy plugin). We should
-// provide a cleaner external API, but until then, this is it.
-var Hugo *hugolib.HugoSites
+// The Response value from Execute.
+type Response struct {
+	// The build Result will only be set in the hugo build command.
+	Result *hugolib.HugoSites

-const (
-	ansiEsc    = "\u001B"
-	clearLine  = "\r\033[K"
-	hideCursor = ansiEsc + "[?25l"
-	showCursor = ansiEsc + "[?25h"
-)
+	// Err is set when the command failed to execute.
+	Err error

-// Reset resets Hugo ready for a new full build. This is mainly only useful
-// for benchmark testing etc. via the CLI commands.
-func Reset() error {
-	Hugo = nil
-	return nil
+	// The command that was executed.
+	Cmd *cobra.Command
 }

-// commandError is an error used to signal different error situations in command handling.
-type commandError struct {
-	s         string
-	userError bool
+func (r Response) IsUserError() bool {
+	return r.Err != nil && isUserError(r.Err)
 }

-func (c commandError) Error() string {
-	return c.s
-}
-
-func (c commandError) isUserError() bool {
-	return c.userError
-}
-
-func newUserError(a ...interface{}) commandError {
-	return commandError{s: fmt.Sprintln(a...), userError: true}
-}
-
-func newSystemError(a ...interface{}) commandError {
-	return commandError{s: fmt.Sprintln(a...), userError: false}
-}
-
-func newSystemErrorF(format string, a ...interface{}) commandError {
-	return commandError{s: fmt.Sprintf(format, a...), userError: false}
-}
-
-// Catch some of the obvious user errors from Cobra.
-// We don't want to show the usage message for every error.
-// The below may be to generic. Time will show.
-var userErrorRegexp = regexp.MustCompile("argument|flag|shorthand")
-
-func isUserError(err error) bool {
-	if cErr, ok := err.(commandError); ok && cErr.isUserError() {
-		return true
-	}
-
-	return userErrorRegexp.MatchString(err.Error())
-}
-
-// HugoCmd is Hugo's root command.
-// Every other command attached to HugoCmd is a child command to it.
-var HugoCmd = &cobra.Command{
-	Use:   "hugo",
-	Short: "hugo builds your site",
-	Long: `hugo is the main command, used to build your Hugo site.
-
-Hugo is a Fast and Flexible Static Site Generator
-built with love by spf13 and friends in Go.
-
-Complete documentation is available at http://gohugo.io/.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-
-		cfgInit := func(c *commandeer) error {
-			if buildWatch {
-				c.Set("disableLiveReload", true)
-			}
-			c.Set("renderToMemory", renderToMemory)
-			return nil
-		}
-
-		c, err := InitializeConfig(buildWatch, cfgInit)
-		if err != nil {
-			return err
-		}
-
-		if buildWatch {
-			c.watchConfig()
-		}
-
-		return c.build()
-	},
-}
-
-var hugoCmdV *cobra.Command
-
-// Flags that are to be added to commands.
-var (
-	buildWatch     bool
-	logging        bool
-	renderToMemory bool // for benchmark testing
-	verbose        bool
-	verboseLog     bool
-	debug          bool
-	quiet          bool
-)
-
-var (
-	gc              bool
-	baseURL         string
-	cacheDir        string
-	contentDir      string
-	layoutDir       string
-	cfgFile         string
-	destination     string
-	logFile         string
-	theme           string
-	themesDir       string
-	source          string
-	logI18nWarnings bool
-	disableKinds    []string
-)
-
 // Execute adds all child commands to the root command HugoCmd and sets flags appropriately.
-func Execute() {
-	HugoCmd.SetGlobalNormalizationFunc(helpers.NormalizeHugoFlags)
+// The args are usually filled with os.Args[1:].
+func Execute(args []string) Response {
+	hugoCmd := newCommandsBuilder().addAll().build()
+	cmd := hugoCmd.getCommand()
+	cmd.SetArgs(args)

-	HugoCmd.SilenceUsage = true
+	c, err := cmd.ExecuteC()

-	AddCommands()
+	var resp Response

-	if c, err := HugoCmd.ExecuteC(); err != nil {
-		if isUserError(err) {
-			c.Println("")
-			c.Println(c.UsageString())
+	if c == cmd && hugoCmd.c != nil {
+		// Root command executed
+		resp.Result = hugoCmd.c.hugo
+	}
+
+	if err == nil {
+		errCount := int(jww.LogCountForLevelsGreaterThanorEqualTo(jww.LevelError))
+		if errCount > 0 {
+			err = fmt.Errorf("logged %d errors", errCount)
+		} else if resp.Result != nil {
+			errCount = resp.Result.NumLogErrors()
+			if errCount > 0 {
+				err = fmt.Errorf("logged %d errors", errCount)
+			}
 		}

-		os.Exit(-1)
 	}
-}

-// AddCommands adds child commands to the root command HugoCmd.
-func AddCommands() {
-	HugoCmd.AddCommand(serverCmd)
-	HugoCmd.AddCommand(versionCmd)
-	HugoCmd.AddCommand(envCmd)
-	HugoCmd.AddCommand(configCmd)
-	HugoCmd.AddCommand(checkCmd)
-	HugoCmd.AddCommand(benchmarkCmd)
-	HugoCmd.AddCommand(convertCmd)
-	HugoCmd.AddCommand(newCmd)
-	HugoCmd.AddCommand(listCmd)
-	HugoCmd.AddCommand(importCmd)
+	resp.Err = err
+	resp.Cmd = c

-	HugoCmd.AddCommand(genCmd)
-	genCmd.AddCommand(genautocompleteCmd)
-	genCmd.AddCommand(gendocCmd)
-	genCmd.AddCommand(genmanCmd)
-	genCmd.AddCommand(createGenDocsHelper().cmd)
-	genCmd.AddCommand(createGenChromaStyles().cmd)
-
-}
-
-// initHugoBuilderFlags initializes all common flags, typically used by the
-// core build commands, namely hugo itself, server, check and benchmark.
-func initHugoBuilderFlags(cmd *cobra.Command) {
-	initHugoBuildCommonFlags(cmd)
-}
-
-func initRootPersistentFlags() {
-	HugoCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is path/config.yaml|json|toml)")
-	HugoCmd.PersistentFlags().BoolVar(&quiet, "quiet", false, "build in quiet mode")
-
-	// Set bash-completion
-	validConfigFilenames := []string{"json", "js", "yaml", "yml", "toml", "tml"}
-	_ = HugoCmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, validConfigFilenames)
-}
-
-// initHugoBuildCommonFlags initialize common flags related to the Hugo build.
-// Called by initHugoBuilderFlags.
-func initHugoBuildCommonFlags(cmd *cobra.Command) {
-	cmd.Flags().Bool("cleanDestinationDir", false, "remove files from destination not found in static directories")
-	cmd.Flags().BoolP("buildDrafts", "D", false, "include content marked as draft")
-	cmd.Flags().BoolP("buildFuture", "F", false, "include content with publishdate in the future")
-	cmd.Flags().BoolP("buildExpired", "E", false, "include expired content")
-	cmd.Flags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
-	cmd.Flags().StringVarP(&contentDir, "contentDir", "c", "", "filesystem path to content directory")
-	cmd.Flags().StringVarP(&layoutDir, "layoutDir", "l", "", "filesystem path to layout directory")
-	cmd.Flags().StringVarP(&cacheDir, "cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/")
-	cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory")
-	cmd.Flags().StringVarP(&destination, "destination", "d", "", "filesystem path to write files to")
-	cmd.Flags().StringVarP(&theme, "theme", "t", "", "theme to use (located in /themes/THEMENAME/)")
-	cmd.Flags().StringVarP(&themesDir, "themesDir", "", "", "filesystem path to themes directory")
-	cmd.Flags().Bool("uglyURLs", false, "(deprecated) if true, use /filename.html instead of /filename/")
-	cmd.Flags().Bool("canonifyURLs", false, "(deprecated) if true, all relative URLs will be canonicalized using baseURL")
-	cmd.Flags().StringVarP(&baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. http://spf13.com/")
-	cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date and author info to the pages")
-	cmd.Flags().BoolVar(&gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
-
-	cmd.Flags().BoolVar(&nitro.AnalysisOn, "stepAnalysis", false, "display memory and timing of different steps of the program")
-	cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions")
-	cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics")
-	cmd.Flags().Bool("pluralizeListTitles", true, "(deprecated) pluralize titles in lists using inflect")
-	cmd.Flags().Bool("preserveTaxonomyNames", false, `(deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")`)
-	cmd.Flags().BoolP("forceSyncStatic", "", false, "copy all files when static is changed.")
-	cmd.Flags().BoolP("noTimes", "", false, "don't sync modification time of files")
-	cmd.Flags().BoolP("noChmod", "", false, "don't sync permission mode of files")
-	cmd.Flags().BoolVarP(&logI18nWarnings, "i18n-warnings", "", false, "print missing translations")
-
-	cmd.Flags().StringSliceVar(&disableKinds, "disableKinds", []string{}, "disable different kind of pages (home, RSS etc.)")
-
-	// Set bash-completion.
-	// Each flag must first be defined before using the SetAnnotation() call.
-	_ = cmd.Flags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-	_ = cmd.Flags().SetAnnotation("cacheDir", cobra.BashCompSubdirsInDir, []string{})
-	_ = cmd.Flags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})
-	_ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
-}
-
-func initBenchmarkBuildingFlags(cmd *cobra.Command) {
-	cmd.Flags().BoolVar(&renderToMemory, "renderToMemory", false, "render to memory (only useful for benchmark testing)")
-}
-
-// init initializes flags.
-func init() {
-	HugoCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
-	HugoCmd.PersistentFlags().BoolVarP(&debug, "debug", "", false, "debug output")
-	HugoCmd.PersistentFlags().BoolVar(&logging, "log", false, "enable Logging")
-	HugoCmd.PersistentFlags().StringVar(&logFile, "logFile", "", "log File path (if set, logging enabled automatically)")
-	HugoCmd.PersistentFlags().BoolVar(&verboseLog, "verboseLog", false, "verbose logging")
-
-	initRootPersistentFlags()
-	initHugoBuilderFlags(HugoCmd)
-	initBenchmarkBuildingFlags(HugoCmd)
-
-	HugoCmd.Flags().BoolVarP(&buildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")
-	hugoCmdV = HugoCmd
-
-	// Set bash-completion
-	_ = HugoCmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{})
+	return resp
 }

 // InitializeConfig initializes a config file with sensible default configuration flags.
-func InitializeConfig(running bool, doWithCommandeer func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {
+func initializeConfig(running bool,
+	h *hugoBuilderCommon,
+	f flagsToConfigHandler,
+	doWithCommandeer func(c *commandeer) error) (*commandeer, error) {

-	var cfg *deps.DepsCfg = &deps.DepsCfg{}
-
-	// Init file systems. This may be changed at a later point.
-	osFs := hugofs.Os
-
-	config, err := hugolib.LoadConfig(osFs, source, cfgFile)
+	c, err := newCommandeer(running, h, f, doWithCommandeer)
 	if err != nil {
 		return nil, err
 	}

-	// Init file systems. This may be changed at a later point.
-	cfg.Cfg = config
-
-	c, err := newCommandeer(cfg, running)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, cmdV := range append([]*cobra.Command{hugoCmdV}, subCmdVs...) {
-		c.initializeFlags(cmdV)
-	}
-
-	if baseURL != "" {
-		config.Set("baseURL", baseURL)
-	}
-
-	if doWithCommandeer != nil {
-		if err := doWithCommandeer(c); err != nil {
-			return nil, err
-		}
-	}
-
-	if len(disableKinds) > 0 {
-		c.Set("disableKinds", disableKinds)
-	}
-
-	logger, err := createLogger(cfg.Cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	cfg.Logger = logger
-
-	config.Set("logI18nWarnings", logI18nWarnings)
-
-	if !config.GetBool("relativeURLs") && config.GetString("baseURL") == "" {
-		cfg.Logger.ERROR.Println("No 'baseURL' set in configuration or as a flag. Features like page menus will not work without one.")
-	}
-
-	if theme != "" {
-		config.Set("theme", theme)
-	}
-
-	if themesDir != "" {
-		config.Set("themesDir", themesDir)
-	}
-
-	if destination != "" {
-		config.Set("publishDir", destination)
-	}
-
-	var dir string
-	if source != "" {
-		dir, _ = filepath.Abs(source)
-	} else {
-		dir, _ = os.Getwd()
-	}
-	config.Set("workingDir", dir)
-
-	if contentDir != "" {
-		config.Set("contentDir", contentDir)
-	}
-
-	if layoutDir != "" {
-		config.Set("layoutDir", layoutDir)
-	}
-
-	if cacheDir != "" {
-		config.Set("cacheDir", cacheDir)
-	}
-
-	fs := hugofs.NewFrom(osFs, config)
-
-	// Hugo writes the output to memory instead of the disk.
-	// This is only used for benchmark testing. Cause the content is only visible
-	// in memory.
-	if config.GetBool("renderToMemory") {
-		fs.Destination = new(afero.MemMapFs)
-		// Rendering to memoryFS, publish to Root regardless of publishDir.
-		config.Set("publishDir", "/")
-	}
-
-	cacheDir = config.GetString("cacheDir")
-	if cacheDir != "" {
-		if helpers.FilePathSeparator != cacheDir[len(cacheDir)-1:] {
-			cacheDir = cacheDir + helpers.FilePathSeparator
-		}
-		isDir, err := helpers.DirExists(cacheDir, fs.Source)
-		utils.CheckErr(cfg.Logger, err)
-		if !isDir {
-			mkdir(cacheDir)
-		}
-		config.Set("cacheDir", cacheDir)
-	} else {
-		config.Set("cacheDir", helpers.GetTempDir("hugo_cache", fs.Source))
-	}
-
-	if err := c.initFs(fs); err != nil {
-		return nil, err
-	}
-
-	cfg.Logger.INFO.Println("Using config file:", config.ConfigFileUsed())
-
-	themeDir := c.PathSpec().GetThemeDir()
-	if themeDir != "" {
-		if _, err := cfg.Fs.Source.Stat(themeDir); os.IsNotExist(err) {
-			return nil, newSystemError("Unable to find theme Directory:", themeDir)
-		}
-	}
-
-	themeVersionMismatch, minVersion := c.isThemeVsHugoVersionMismatch()
-
-	if themeVersionMismatch {
-		cfg.Logger.ERROR.Printf("Current theme does not support Hugo version %s. Minimum version required is %s\n",
-			helpers.CurrentHugoVersion.ReleaseVersion(), minVersion)
-	}
-
 	return c, nil

 }

-func createLogger(cfg config.Provider) (*jww.Notepad, error) {
+func (c *commandeer) createLogger(cfg config.Provider) (*jww.Notepad, error) {
 	var (
 		logHandle       = ioutil.Discard
 		logThreshold    = jww.LevelWarn
@@ -441,7 +126,7 @@ func createLogger(cfg config.Provider) (*jww.Notepad, error) {
 		stdoutThreshold = jww.LevelError
 	)

-	if verboseLog || logging || (logFile != "") {
+	if c.h.verboseLog || c.h.logging || (c.h.logFile != "") {
 		var err error
 		if logFile != "" {
 			logHandle, err = os.OpenFile(logFile, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0666)
@@ -454,7 +139,7 @@ func createLogger(cfg config.Provider) (*jww.Notepad, error) {
 				return nil, newSystemError(err)
 			}
 		}
-	} else if !quiet && cfg.GetBool("verbose") {
+	} else if !c.h.quiet && cfg.GetBool("verbose") {
 		stdoutThreshold = jww.LevelInfo
 	}

@@ -462,7 +147,7 @@ func createLogger(cfg config.Provider) (*jww.Notepad, error) {
 		stdoutThreshold = jww.LevelDebug
 	}

-	if verboseLog {
+	if c.h.verboseLog {
 		logThreshold = jww.LevelInfo
 		if cfg.GetBool("debug") {
 			logThreshold = jww.LevelDebug
@@ -478,8 +163,13 @@ func createLogger(cfg config.Provider) (*jww.Notepad, error) {
 	return jww.NewNotepad(stdoutThreshold, logThreshold, outHandle, logHandle, "", log.Ldate|log.Ltime), nil
 }

-func (c *commandeer) initializeFlags(cmd *cobra.Command) {
-	persFlagKeys := []string{"debug", "verbose", "logFile"}
+func initializeFlags(cmd *cobra.Command, cfg config.Provider) {
+	persFlagKeys := []string{
+		"debug",
+		"verbose",
+		"logFile",
+		// Moved from vars
+	}
 	flagKeys := []string{
 		"cleanDestinationDir",
 		"buildDrafts",
@@ -497,15 +187,40 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) {
 		"noChmod",
 		"templateMetrics",
 		"templateMetricsHints",
+
+		// Moved from vars.
+		"baseURL",
+		"buildWatch",
+		"cacheDir",
+		"cfgFile",
+		"contentDir",
+		"debug",
+		"destination",
+		"disableKinds",
+		"gc",
+		"layoutDir",
+		"logFile",
+		"i18n-warnings",
+		"quiet",
+		"renderToMemory",
+		"source",
+		"theme",
+		"themesDir",
+		"verbose",
+		"verboseLog",
 	}

 	for _, key := range persFlagKeys {
-		c.setValueFromFlag(cmd.PersistentFlags(), key)
+		setValueFromFlag(cmd.PersistentFlags(), key, cfg, "")
 	}
 	for _, key := range flagKeys {
-		c.setValueFromFlag(cmd.Flags(), key)
+		setValueFromFlag(cmd.Flags(), key, cfg, "")
 	}

+	// Set some "config aliases"
+	setValueFromFlag(cmd.Flags(), "destination", cfg, "publishDir")
+	setValueFromFlag(cmd.Flags(), "i18n-warnings", cfg, "logI18nWarnings")
+
 }

 var deprecatedFlags = map[string]bool{
@@ -515,31 +230,35 @@ var deprecatedFlags = map[string]bool{
 	strings.ToLower("canonifyURLs"):          true,
 }

-func (c *commandeer) setValueFromFlag(flags *flag.FlagSet, key string) {
+func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targetKey string) {
+	key = strings.TrimSpace(key)
 	if flags.Changed(key) {
 		if _, deprecated := deprecatedFlags[strings.ToLower(key)]; deprecated {
 			msg := fmt.Sprintf(`Set "%s = true" in your config.toml.
 If you need to set this configuration value from the command line, set it via an OS environment variable: "HUGO_%s=true hugo"`, key, strings.ToUpper(key))
-			// Remove in Hugo 0.37
-			helpers.Deprecated("hugo", "--"+key+" flag", msg, false)
+			// Remove in Hugo 0.38
+			helpers.Deprecated("hugo", "--"+key+" flag", msg, true)
 		}
 		f := flags.Lookup(key)
-		c.Set(key, f.Value.String())
-	}
-}
-
-func (c *commandeer) watchConfig() {
-	v := c.Cfg.(*viper.Viper)
-	v.WatchConfig()
-	v.OnConfigChange(func(e fsnotify.Event) {
-		c.Logger.FEEDBACK.Println("Config file changed:", e.Name)
-		// Force a full rebuild
-		utils.CheckErr(c.Logger, c.recreateAndBuildSites(true))
-		if !c.Cfg.GetBool("disableLiveReload") {
-			// Will block forever trying to write to a channel that nobody is reading if livereload isn't initialized
-			livereload.ForceRefresh()
+		configKey := key
+		if targetKey != "" {
+			configKey = targetKey
 		}
-	})
+		// Gotta love this API.
+		switch f.Value.Type() {
+		case "bool":
+			bv, _ := flags.GetBool(key)
+			cfg.Set(configKey, bv)
+		case "string":
+			cfg.Set(configKey, f.Value.String())
+		case "stringSlice":
+			bv, _ := flags.GetStringSlice(key)
+			cfg.Set(configKey, bv)
+		default:
+			panic(fmt.Sprintf("update switch with %s", f.Value.Type()))
+		}
+
+	}
 }

 func (c *commandeer) fullBuild() error {
@@ -548,7 +267,7 @@ func (c *commandeer) fullBuild() error {
 		langCount map[string]uint64
 	)

-	if !quiet {
+	if !c.h.quiet {
 		fmt.Print(hideCursor + "Building sites … ")
 		defer func() {
 			fmt.Print(showCursor + clearLine)
@@ -587,16 +306,16 @@ func (c *commandeer) fullBuild() error {
 		}
 	}

-	for _, s := range Hugo.Sites {
+	for _, s := range c.hugo.Sites {
 		s.ProcessingStats.Static = langCount[s.Language.Lang]
 	}

-	if gc {
-		count, err := Hugo.GC()
+	if c.h.gc {
+		count, err := c.hugo.GC()
 		if err != nil {
 			return err
 		}
-		for _, s := range Hugo.Sites {
+		for _, s := range c.hugo.Sites {
 			// We have no way of knowing what site the garbage belonged to.
 			s.ProcessingStats.Cleaned = uint64(count)
 		}
@@ -614,13 +333,13 @@ func (c *commandeer) build() error {
 	}

 	// TODO(bep) Feedback?
-	if !quiet {
+	if !c.h.quiet {
 		fmt.Println()
-		Hugo.PrintProcessingStats(os.Stdout)
+		c.hugo.PrintProcessingStats(os.Stdout)
 		fmt.Println()
 	}

-	if buildWatch {
+	if c.h.buildWatch {
 		watchDirs, err := c.getDirList()
 		if err != nil {
 			return err
@@ -648,9 +367,9 @@ func (c *commandeer) serverBuild() error {
 	}

 	// TODO(bep) Feedback?
-	if !quiet {
+	if !c.h.quiet {
 		fmt.Println()
-		Hugo.PrintProcessingStats(os.Stdout)
+		c.hugo.PrintProcessingStats(os.Stdout)
 		fmt.Println()
 	}

@@ -780,6 +499,9 @@ func (c *commandeer) copyStaticTo(dirs *src.Dirs, publishDir string) (uint64, er
 }

 func (c *commandeer) timeTrack(start time.Time, name string) {
+	if c.h.quiet {
+		return
+	}
 	elapsed := time.Since(start)
 	c.Logger.FEEDBACK.Printf("%s in %v ms", name, int(1000*elapsed.Seconds()))
 }
@@ -846,7 +568,7 @@ func (c *commandeer) getDirList() ([]string, error) {
 					c.Logger.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", path, err)
 					return nil
 				}
-				linkfi, err := helpers.LstatIfOs(c.Fs.Source, link)
+				linkfi, err := helpers.LstatIfPossible(c.Fs.Source, link)
 				if err != nil {
 					c.Logger.ERROR.Printf("Cannot stat %q: %s", link, err)
 					return nil
@@ -884,9 +606,13 @@ func (c *commandeer) getDirList() ([]string, error) {

 	// SymbolicWalk will log anny ERRORs
 	_ = helpers.SymbolicWalk(c.Fs.Source, dataDir, regularWalker)
-	_ = helpers.SymbolicWalk(c.Fs.Source, c.PathSpec().AbsPathify(c.Cfg.GetString("contentDir")), symLinkWalker)
 	_ = helpers.SymbolicWalk(c.Fs.Source, i18nDir, regularWalker)
 	_ = helpers.SymbolicWalk(c.Fs.Source, layoutDir, regularWalker)
+
+	for _, contentDir := range c.PathSpec().ContentDirs() {
+		_ = helpers.SymbolicWalk(c.Fs.Source, contentDir.Value, symLinkWalker)
+	}
+
 	for _, staticDir := range staticDirs {
 		_ = helpers.SymbolicWalk(c.Fs.Source, staticDir, regularWalker)
 	}
@@ -925,32 +651,36 @@ func (c *commandeer) recreateAndBuildSites(watching bool) (err error) {
 	if err := c.initSites(); err != nil {
 		return err
 	}
-	if !quiet {
+	if !c.h.quiet {
 		c.Logger.FEEDBACK.Println("Started building sites ...")
 	}
-	return Hugo.Build(hugolib.BuildCfg{CreateSitesFromConfig: true})
+	return c.hugo.Build(hugolib.BuildCfg{CreateSitesFromConfig: true})
 }

 func (c *commandeer) resetAndBuildSites() (err error) {
 	if err = c.initSites(); err != nil {
 		return
 	}
-	if !quiet {
+	if !c.h.quiet {
 		c.Logger.FEEDBACK.Println("Started building sites ...")
 	}
-	return Hugo.Build(hugolib.BuildCfg{ResetState: true})
+	return c.hugo.Build(hugolib.BuildCfg{ResetState: true})
 }

 func (c *commandeer) initSites() error {
-	if Hugo != nil {
+	if c.hugo != nil {
+		c.hugo.Cfg = c.Cfg
+		c.hugo.Log.ResetLogCounters()
 		return nil
 	}
+
 	h, err := hugolib.NewHugoSites(*c.DepsCfg)

 	if err != nil {
 		return err
 	}
-	Hugo = h
+
+	c.hugo = h

 	return nil
 }
@@ -959,7 +689,7 @@ func (c *commandeer) buildSites() (err error) {
 	if err := c.initSites(); err != nil {
 		return err
 	}
-	return Hugo.Build(hugolib.BuildCfg{})
+	return c.hugo.Build(hugolib.BuildCfg{})
 }

 func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
@@ -969,7 +699,7 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
 		return err
 	}
 	visited := c.visitedURLs.PeekAllSet()
-	doLiveReload := !buildWatch && !c.Cfg.GetBool("disableLiveReload")
+	doLiveReload := !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload")
 	if doLiveReload && !c.Cfg.GetBool("disableFastRender") {

 		// Make sure we always render the home pages
@@ -983,7 +713,17 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
 		}

 	}
-	return Hugo.Build(hugolib.BuildCfg{RecentlyVisited: visited}, events...)
+	return c.hugo.Build(hugolib.BuildCfg{RecentlyVisited: visited}, events...)
+}
+
+func (c *commandeer) fullRebuild() {
+	if err := c.loadConfig(true); err != nil {
+		jww.ERROR.Println("Failed to reload config:", err)
+	} else if err := c.recreateAndBuildSites(true); err != nil {
+		jww.ERROR.Println(err)
+	} else if !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload") {
+		livereload.ForceRefresh()
+	}
 }

 // newWatcher creates a new watcher to watch filesystem events.
@@ -1009,10 +749,26 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 		}
 	}

+	// Identifies changes to config (config.toml) files.
+	configSet := make(map[string]bool)
+
+	for _, configFile := range c.configFiles {
+		c.Logger.FEEDBACK.Println("Watching for config changes in", configFile)
+		watcher.Add(configFile)
+		configSet[configFile] = true
+	}
+
 	go func() {
 		for {
 			select {
 			case evs := <-watcher.Events:
+				if len(evs) > 50 {
+					// This is probably a mass edit of the content dir.
+					// Schedule a full rebuild for when it slows down.
+					c.debounce(c.fullRebuild)
+					continue
+				}
+
 				c.Logger.INFO.Println("Received System Events:", evs)

 				staticEvents := []fsnotify.Event{}
@@ -1021,8 +777,17 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 				// Special handling for symbolic links inside /content.
 				filtered := []fsnotify.Event{}
 				for _, ev := range evs {
+					if configSet[ev.Name] {
+						if ev.Op&fsnotify.Chmod == fsnotify.Chmod {
+							continue
+						}
+						// Config file changed. Need full rebuild.
+						c.fullRebuild()
+						break
+					}
+
 					// Check the most specific first, i.e. files.
-					contentMapped := Hugo.ContentChanges.GetSymbolicLinkMappings(ev.Name)
+					contentMapped := c.hugo.ContentChanges.GetSymbolicLinkMappings(ev.Name)
 					if len(contentMapped) > 0 {
 						for _, mapped := range contentMapped {
 							filtered = append(filtered, fsnotify.Event{Name: mapped, Op: ev.Op})
@@ -1034,7 +799,7 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {

 					dir, name := filepath.Split(ev.Name)

-					contentMapped = Hugo.ContentChanges.GetSymbolicLinkMappings(dir)
+					contentMapped = c.hugo.ContentChanges.GetSymbolicLinkMappings(dir)

 					if len(contentMapped) == 0 {
 						filtered = append(filtered, ev)
@@ -1136,7 +901,7 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 						}
 					}

-					if !buildWatch && !c.Cfg.GetBool("disableLiveReload") {
+					if !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload") {
 						// Will block forever trying to write to a channel that nobody is reading if livereload isn't initialized

 						// force refresh when more than one file
@@ -1153,7 +918,7 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 				}

 				if len(dynamicEvents) > 0 {
-					doLiveReload := !buildWatch && !c.Cfg.GetBool("disableLiveReload")
+					doLiveReload := !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload")
 					onePageName := pickOneWriteOrCreatePath(dynamicEvents)

 					c.Logger.FEEDBACK.Println("\nChange detected, rebuilding site")
@@ -1172,7 +937,7 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {

 						if navigate {
 							if onePageName != "" {
-								p = Hugo.GetContentPage(onePageName)
+								p = c.hugo.GetContentPage(onePageName)
 							}

 						}
@@ -1212,7 +977,7 @@ func pickOneWriteOrCreatePath(events []fsnotify.Event) string {

 // isThemeVsHugoVersionMismatch returns whether the current Hugo version is
 // less than the theme's min_version.
-func (c *commandeer) isThemeVsHugoVersionMismatch() (mismatch bool, requiredMinVersion string) {
+func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (mismatch bool, requiredMinVersion string) {
 	if !c.PathSpec().ThemeSet() {
 		return
 	}
@@ -1221,13 +986,13 @@ func (c *commandeer) isThemeVsHugoVersionMismatch() (mismatch bool, requiredMinV

 	path := filepath.Join(themeDir, "theme.toml")

-	exists, err := helpers.Exists(path, c.Fs.Source)
+	exists, err := helpers.Exists(path, fs)

 	if err != nil || !exists {
 		return
 	}

-	b, err := afero.ReadFile(c.Fs.Source, path)
+	b, err := afero.ReadFile(fs, path)

 	tomlMeta, err := parser.HandleTOMLMetaData(b)

@@ -35,33 +35,42 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-func init() {
-	importCmd.AddCommand(importJekyllCmd)
+var _ cmder = (*importCmd)(nil)
+
+type importCmd struct {
+	*baseCmd
 }

-var importCmd = &cobra.Command{
-	Use:   "import",
-	Short: "Import your site from others.",
-	Long: `Import your site from other web site generators like Jekyll.
+func newImportCmd() *importCmd {
+	cc := &importCmd{}
+
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "import",
+		Short: "Import your site from others.",
+		Long: `Import your site from other web site generators like Jekyll.

 Import requires a subcommand, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
-	RunE: nil,
-}
+		RunE: nil,
+	})

-var importJekyllCmd = &cobra.Command{
-	Use:   "jekyll",
-	Short: "hugo import from Jekyll",
-	Long: `hugo import from Jekyll.
+	importJekyllCmd := &cobra.Command{
+		Use:   "jekyll",
+		Short: "hugo import from Jekyll",
+		Long: `hugo import from Jekyll.

 Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
-	RunE: importFromJekyll,
-}
+		RunE: cc.importFromJekyll,
+	}

-func init() {
 	importJekyllCmd.Flags().Bool("force", false, "allow import into non-empty target directory")
+
+	cc.cmd.AddCommand(importJekyllCmd)
+
+	return cc
+
 }

-func importFromJekyll(cmd *cobra.Command, args []string) error {
+func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {

 	if len(args) < 2 {
 		return newUserError(`Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.")
@@ -86,12 +95,12 @@ func importFromJekyll(cmd *cobra.Command, args []string) error {
 	forceImport, _ := cmd.Flags().GetBool("force")

 	fs := afero.NewOsFs()
-	jekyllPostDirs, hasAnyPost := getJekyllDirInfo(fs, jekyllRoot)
+	jekyllPostDirs, hasAnyPost := i.getJekyllDirInfo(fs, jekyllRoot)
 	if !hasAnyPost {
 		return errors.New("Your Jekyll root contains neither posts nor drafts, aborting.")
 	}

-	site, err := createSiteFromJekyll(jekyllRoot, targetDir, jekyllPostDirs, forceImport)
+	site, err := i.createSiteFromJekyll(jekyllRoot, targetDir, jekyllPostDirs, forceImport)

 	if err != nil {
 		return newUserError(err)
@@ -147,14 +156,14 @@ func importFromJekyll(cmd *cobra.Command, args []string) error {
 	return nil
 }

-func getJekyllDirInfo(fs afero.Fs, jekyllRoot string) (map[string]bool, bool) {
+func (i *importCmd) getJekyllDirInfo(fs afero.Fs, jekyllRoot string) (map[string]bool, bool) {
 	postDirs := make(map[string]bool)
 	hasAnyPost := false
 	if entries, err := ioutil.ReadDir(jekyllRoot); err == nil {
 		for _, entry := range entries {
 			if entry.IsDir() {
 				subDir := filepath.Join(jekyllRoot, entry.Name())
-				if isPostDir, hasAnyPostInDir := retrieveJekyllPostDir(fs, subDir); isPostDir {
+				if isPostDir, hasAnyPostInDir := i.retrieveJekyllPostDir(fs, subDir); isPostDir {
 					postDirs[entry.Name()] = hasAnyPostInDir
 					if hasAnyPostInDir {
 						hasAnyPost = true
@@ -166,7 +175,7 @@ func getJekyllDirInfo(fs afero.Fs, jekyllRoot string) (map[string]bool, bool) {
 	return postDirs, hasAnyPost
 }

-func retrieveJekyllPostDir(fs afero.Fs, dir string) (bool, bool) {
+func (i *importCmd) retrieveJekyllPostDir(fs afero.Fs, dir string) (bool, bool) {
 	if strings.HasSuffix(dir, "_posts") || strings.HasSuffix(dir, "_drafts") {
 		isEmpty, _ := helpers.IsEmpty(dir, fs)
 		return true, !isEmpty
@@ -176,7 +185,7 @@ func retrieveJekyllPostDir(fs afero.Fs, dir string) (bool, bool) {
 		for _, entry := range entries {
 			if entry.IsDir() {
 				subDir := filepath.Join(dir, entry.Name())
-				if isPostDir, hasAnyPost := retrieveJekyllPostDir(fs, subDir); isPostDir {
+				if isPostDir, hasAnyPost := i.retrieveJekyllPostDir(fs, subDir); isPostDir {
 					return isPostDir, hasAnyPost
 				}
 			}
@@ -186,7 +195,7 @@ func retrieveJekyllPostDir(fs afero.Fs, dir string) (bool, bool) {
 	return false, true
 }

-func createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[string]bool, force bool) (*hugolib.Site, error) {
+func (i *importCmd) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[string]bool, force bool) (*hugolib.Site, error) {
 	s, err := hugolib.NewSiteDefaultLang()
 	if err != nil {
 		return nil, err
@@ -205,7 +214,7 @@ func createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[strin
 		}
 	}

-	jekyllConfig := loadJekyllConfig(fs, jekyllRoot)
+	jekyllConfig := i.loadJekyllConfig(fs, jekyllRoot)

 	mkdir(targetDir, "layouts")
 	mkdir(targetDir, "content")
@@ -214,14 +223,14 @@ func createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[strin
 	mkdir(targetDir, "data")
 	mkdir(targetDir, "themes")

-	createConfigFromJekyll(fs, targetDir, "yaml", jekyllConfig)
+	i.createConfigFromJekyll(fs, targetDir, "yaml", jekyllConfig)

-	copyJekyllFilesAndFolders(jekyllRoot, filepath.Join(targetDir, "static"), jekyllPostDirs)
+	i.copyJekyllFilesAndFolders(jekyllRoot, filepath.Join(targetDir, "static"), jekyllPostDirs)

 	return s, nil
 }

-func loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
+func (i *importCmd) loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
 	path := filepath.Join(jekyllRoot, "_config.yml")

 	exists, err := helpers.Exists(path, fs)
@@ -253,7 +262,7 @@ func loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
 	return c
 }

-func createConfigFromJekyll(fs afero.Fs, inpath string, kind string, jekyllConfig map[string]interface{}) (err error) {
+func (i *importCmd) createConfigFromJekyll(fs afero.Fs, inpath string, kind string, jekyllConfig map[string]interface{}) (err error) {
 	title := "My New Hugo Site"
 	baseURL := "http://example.org/"

@@ -348,7 +357,7 @@ func copyDir(source string, dest string) error {
 	return nil
 }

-func copyJekyllFilesAndFolders(jekyllRoot, dest string, jekyllPostDirs map[string]bool) (err error) {
+func (i *importCmd) copyJekyllFilesAndFolders(jekyllRoot, dest string, jekyllPostDirs map[string]bool) (err error) {
 	fi, err := os.Stat(jekyllRoot)
 	if err != nil {
 		return err
@@ -1,17 +1,4 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Copyright 2015 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,39 +20,45 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-func init() {
-	checkCmd.AddCommand(limit)
+var _ cmder = (*limitCmd)(nil)
+
+type limitCmd struct {
+	*baseCmd
 }

-var limit = &cobra.Command{
-	Use:   "ulimit",
-	Short: "Check system ulimit settings",
-	Long: `Hugo will inspect the current ulimit settings on the system.
+func newLimitCmd() *limitCmd {
+	ccmd := &cobra.Command{
+		Use:   "ulimit",
+		Short: "Check system ulimit settings",
+		Long: `Hugo will inspect the current ulimit settings on the system.
 This is primarily to ensure that Hugo can watch enough files on some OSs`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		var rLimit syscall.Rlimit
-		err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-		if err != nil {
-			return newSystemError("Error Getting Rlimit ", err)
-		}
+		RunE: func(cmd *cobra.Command, args []string) error {
+			var rLimit syscall.Rlimit
+			err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+			if err != nil {
+				return newSystemError("Error Getting Rlimit ", err)
+			}

-		jww.FEEDBACK.Println("Current rLimit:", rLimit)
+			jww.FEEDBACK.Println("Current rLimit:", rLimit)

-		jww.FEEDBACK.Println("Attempting to increase limit")
-		rLimit.Max = 999999
-		rLimit.Cur = 999999
-		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-		if err != nil {
-			return newSystemError("Error Setting rLimit ", err)
-		}
-		err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-		if err != nil {
-			return newSystemError("Error Getting rLimit ", err)
-		}
-		jww.FEEDBACK.Println("rLimit after change:", rLimit)
+			jww.FEEDBACK.Println("Attempting to increase limit")
+			rLimit.Max = 999999
+			rLimit.Cur = 999999
+			err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+			if err != nil {
+				return newSystemError("Error Setting rLimit ", err)
+			}
+			err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+			if err != nil {
+				return newSystemError("Error Getting rLimit ", err)
+			}
+			jww.FEEDBACK.Println("rLimit after change:", rLimit)

-		return nil
-	},
+			return nil
+		},
+	}
+
+	return &limitCmd{baseCmd: newBaseCmd(ccmd)}
 }

 func tweakLimit() {
@@ -1,4 +1,4 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,18 +12,6 @@
 // limitations under the License.

 // +build !darwin
-// Copyright 2015 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.

 package commands

@@ -21,129 +21,137 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-func init() {
-	listCmd.AddCommand(listDraftsCmd)
-	listCmd.AddCommand(listFutureCmd)
-	listCmd.AddCommand(listExpiredCmd)
-	listCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
-	listCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+var _ cmder = (*listCmd)(nil)
+
+type listCmd struct {
+	hugoBuilderCommon
+	*baseCmd
 }

-var listCmd = &cobra.Command{
-	Use:   "list",
-	Short: "Listing out various types of content",
-	Long: `Listing out various types of content.
+func newListCmd() *listCmd {
+	cc := &listCmd{}
+
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "list",
+		Short: "Listing out various types of content",
+		Long: `Listing out various types of content.

 List requires a subcommand, e.g. ` + "`hugo list drafts`.",
-	RunE: nil,
-}
+		RunE: nil,
+	})

-var listDraftsCmd = &cobra.Command{
-	Use:   "drafts",
-	Short: "List all drafts",
-	Long:  `List all of the drafts in your content directory.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfgInit := func(c *commandeer) error {
-			c.Set("buildDrafts", true)
-			return nil
-		}
-		c, err := InitializeConfig(false, cfgInit)
-		if err != nil {
-			return err
-		}
+	cc.cmd.AddCommand(
+		&cobra.Command{
+			Use:   "drafts",
+			Short: "List all drafts",
+			Long:  `List all of the drafts in your content directory.`,
+			RunE: func(cmd *cobra.Command, args []string) error {
+				cfgInit := func(c *commandeer) error {
+					c.Set("buildDrafts", true)
+					return nil
+				}
+				c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, cfgInit)
+				if err != nil {
+					return err
+				}

-		sites, err := hugolib.NewHugoSites(*c.DepsCfg)
+				sites, err := hugolib.NewHugoSites(*c.DepsCfg)

-		if err != nil {
-			return newSystemError("Error creating sites", err)
-		}
+				if err != nil {
+					return newSystemError("Error creating sites", err)
+				}

-		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-			return newSystemError("Error Processing Source Content", err)
-		}
+				if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+					return newSystemError("Error Processing Source Content", err)
+				}

-		for _, p := range sites.Pages() {
-			if p.IsDraft() {
-				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-			}
+				for _, p := range sites.Pages() {
+					if p.IsDraft() {
+						jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+					}

-		}
+				}

-		return nil
+				return nil

-	},
-}
-
-var listFutureCmd = &cobra.Command{
-	Use:   "future",
-	Short: "List all posts dated in the future",
-	Long: `List all of the posts in your content directory which will be
+			},
+		},
+		&cobra.Command{
+			Use:   "future",
+			Short: "List all posts dated in the future",
+			Long: `List all of the posts in your content directory which will be
 posted in the future.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfgInit := func(c *commandeer) error {
-			c.Set("buildFuture", true)
-			return nil
-		}
-		c, err := InitializeConfig(false, cfgInit)
-		if err != nil {
-			return err
-		}
+			RunE: func(cmd *cobra.Command, args []string) error {
+				cfgInit := func(c *commandeer) error {
+					c.Set("buildFuture", true)
+					return nil
+				}
+				c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, cfgInit)
+				if err != nil {
+					return err
+				}

-		sites, err := hugolib.NewHugoSites(*c.DepsCfg)
+				sites, err := hugolib.NewHugoSites(*c.DepsCfg)

-		if err != nil {
-			return newSystemError("Error creating sites", err)
-		}
+				if err != nil {
+					return newSystemError("Error creating sites", err)
+				}

-		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-			return newSystemError("Error Processing Source Content", err)
-		}
+				if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+					return newSystemError("Error Processing Source Content", err)
+				}

-		for _, p := range sites.Pages() {
-			if p.IsFuture() {
-				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-			}
+				for _, p := range sites.Pages() {
+					if p.IsFuture() {
+						jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+					}

-		}
+				}

-		return nil
+				return nil

-	},
-}
-
-var listExpiredCmd = &cobra.Command{
-	Use:   "expired",
-	Short: "List all posts already expired",
-	Long: `List all of the posts in your content directory which has already
+			},
+		},
+		&cobra.Command{
+			Use:   "expired",
+			Short: "List all posts already expired",
+			Long: `List all of the posts in your content directory which has already
 expired.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		cfgInit := func(c *commandeer) error {
-			c.Set("buildExpired", true)
-			return nil
-		}
-		c, err := InitializeConfig(false, cfgInit)
-		if err != nil {
-			return err
-		}
+			RunE: func(cmd *cobra.Command, args []string) error {
+				cfgInit := func(c *commandeer) error {
+					c.Set("buildExpired", true)
+					return nil
+				}
+				c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, cfgInit)
+				if err != nil {
+					return err
+				}

-		sites, err := hugolib.NewHugoSites(*c.DepsCfg)
+				sites, err := hugolib.NewHugoSites(*c.DepsCfg)

-		if err != nil {
-			return newSystemError("Error creating sites", err)
-		}
+				if err != nil {
+					return newSystemError("Error creating sites", err)
+				}

-		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-			return newSystemError("Error Processing Source Content", err)
-		}
+				if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+					return newSystemError("Error Processing Source Content", err)
+				}

-		for _, p := range sites.Pages() {
-			if p.IsExpired() {
-				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-			}
+				for _, p := range sites.Pages() {
+					if p.IsExpired() {
+						jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+					}

-		}
+				}

-		return nil
+				return nil

-	},
+			},
+		},
+	)
+
+	cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+	cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+
+	return cc
 }
@@ -1,4 +1,4 @@
-// Copyright 2016 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,85 +15,63 @@ package commands

 import (
 	"bytes"
-	"errors"
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
-	"time"

 	"github.com/gohugoio/hugo/create"
 	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/viper"
 )

-var (
-	configFormat  string
+var _ cmder = (*newCmd)(nil)
+
+type newCmd struct {
+	hugoBuilderCommon
 	contentEditor string
 	contentType   string
-)
-
-func init() {
-	newSiteCmd.Flags().StringVarP(&configFormat, "format", "f", "toml", "config & frontmatter format")
-	newSiteCmd.Flags().Bool("force", false, "init inside non-empty directory")
-	newCmd.Flags().StringVarP(&contentType, "kind", "k", "", "content type to create")
-	newCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
-	newCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-	newCmd.Flags().StringVar(&contentEditor, "editor", "", "edit new content with this editor, if provided")
-
-	newCmd.AddCommand(newSiteCmd)
-	newCmd.AddCommand(newThemeCmd)

+	*baseCmd
 }

-var newCmd = &cobra.Command{
-	Use:   "new [path]",
-	Short: "Create new content for your site",
-	Long: `Create a new content file and automatically set the date and title.
+func newNewCmd() *newCmd {
+	cc := &newCmd{}
+	cc.baseCmd = newBaseCmd(&cobra.Command{
+		Use:   "new [path]",
+		Short: "Create new content for your site",
+		Long: `Create a new content file and automatically set the date and title.
 It will guess which kind of file to create based on the path provided.

 You can also specify the kind with ` + "`-k KIND`" + `.

 If archetypes are provided in your theme or site, they will be used.`,

-	RunE: NewContent,
+		RunE: cc.newContent,
+	})
+
+	cc.cmd.Flags().StringVarP(&cc.contentType, "kind", "k", "", "content type to create")
+	cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+	cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+	cc.cmd.Flags().StringVar(&cc.contentEditor, "editor", "", "edit new content with this editor, if provided")
+
+	cc.cmd.AddCommand(newNewSiteCmd().getCommand())
+	cc.cmd.AddCommand(newNewThemeCmd().getCommand())
+
+	return cc
 }

-var newSiteCmd = &cobra.Command{
-	Use:   "site [path]",
-	Short: "Create a new site (skeleton)",
-	Long: `Create a new site in the provided directory.
-The new site will have the correct structure, but no content or theme yet.
-Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
-	RunE: NewSite,
-}
-
-var newThemeCmd = &cobra.Command{
-	Use:   "theme [name]",
-	Short: "Create a new theme",
-	Long: `Create a new theme (skeleton) called [name] in the current directory.
-New theme is a skeleton. Please add content to the touched files. Add your
-name to the copyright line in the license and adjust the theme.toml file
-as you see fit.`,
-	RunE: NewTheme,
-}
-
-// NewContent adds new content to a Hugo site.
-func NewContent(cmd *cobra.Command, args []string) error {
+func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {
 	cfgInit := func(c *commandeer) error {
 		if cmd.Flags().Changed("editor") {
-			c.Set("newContentEditor", contentEditor)
+			c.Set("newContentEditor", n.contentEditor)
 		}
 		return nil
 	}

-	c, err := InitializeConfig(false, cfgInit)
+	c, err := initializeConfig(false, &n.hugoBuilderCommon, n, cfgInit)

 	if err != nil {
 		return err
@@ -109,8 +87,8 @@ func NewContent(cmd *cobra.Command, args []string) error {

 	createPath, kind = newContentPathSection(createPath)

-	if contentType != "" {
-		kind = contentType
+	if n.contentType != "" {
+		kind = n.contentType
 	}

 	cfg := c.DepsCfg
@@ -130,15 +108,15 @@ func NewContent(cmd *cobra.Command, args []string) error {
 			return nil, err
 		}

-		if err := Hugo.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+		if err := c.hugo.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
 			return nil, err
 		}

-		s = Hugo.Sites[0]
+		s = c.hugo.Sites[0]

-		if len(Hugo.Sites) > 1 {
+		if len(c.hugo.Sites) > 1 {
 			// Find the best match.
-			for _, ss := range Hugo.Sites {
+			for _, ss := range c.hugo.Sites {
 				if strings.Contains(createPath, "."+ss.Language.Lang) {
 					s = ss
 					break
@@ -151,56 +129,6 @@ func NewContent(cmd *cobra.Command, args []string) error {
 	return create.NewContent(ps, siteFactory, kind, createPath)
 }

-func doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
-	archeTypePath := filepath.Join(basepath, "archetypes")
-	dirs := []string{
-		filepath.Join(basepath, "layouts"),
-		filepath.Join(basepath, "content"),
-		archeTypePath,
-		filepath.Join(basepath, "static"),
-		filepath.Join(basepath, "data"),
-		filepath.Join(basepath, "themes"),
-	}
-
-	if exists, _ := helpers.Exists(basepath, fs.Source); exists {
-		if isDir, _ := helpers.IsDir(basepath, fs.Source); !isDir {
-			return errors.New(basepath + " already exists but not a directory")
-		}
-
-		isEmpty, _ := helpers.IsEmpty(basepath, fs.Source)
-
-		switch {
-		case !isEmpty && !force:
-			return errors.New(basepath + " already exists and is not empty")
-
-		case !isEmpty && force:
-			all := append(dirs, filepath.Join(basepath, "config."+configFormat))
-			for _, path := range all {
-				if exists, _ := helpers.Exists(path, fs.Source); exists {
-					return errors.New(path + " already exists")
-				}
-			}
-		}
-	}
-
-	for _, dir := range dirs {
-		if err := fs.Source.MkdirAll(dir, 0777); err != nil {
-			return fmt.Errorf("Failed to create dir: %s", err)
-		}
-	}
-
-	createConfig(fs, basepath, configFormat)
-
-	// Create a defaul archetype file.
-	helpers.SafeWriteToDisk(filepath.Join(archeTypePath, "default.md"),
-		strings.NewReader(create.ArchetypeTemplateTemplate), fs.Source)
-
-	jww.FEEDBACK.Printf("Congratulations! Your new Hugo site is created in %s.\n\n", basepath)
-	jww.FEEDBACK.Println(nextStepsText())
-
-	return nil
-}
-
 func nextStepsText() string {
 	var nextStepsText bytes.Buffer

@@ -222,98 +150,6 @@ Visit https://gohugo.io/ for quickstart guide and full documentation.`)
 	return nextStepsText.String()
 }

-// NewSite creates a new Hugo site and initializes a structured Hugo directory.
-func NewSite(cmd *cobra.Command, args []string) error {
-	if len(args) < 1 {
-		return newUserError("path needs to be provided")
-	}
-
-	createpath, err := filepath.Abs(filepath.Clean(args[0]))
-	if err != nil {
-		return newUserError(err)
-	}
-
-	forceNew, _ := cmd.Flags().GetBool("force")
-
-	return doNewSite(hugofs.NewDefault(viper.New()), createpath, forceNew)
-}
-
-// NewTheme creates a new Hugo theme.
-func NewTheme(cmd *cobra.Command, args []string) error {
-	c, err := InitializeConfig(false, nil)
-
-	if err != nil {
-		return err
-	}
-
-	if len(args) < 1 {
-		return newUserError("theme name needs to be provided")
-	}
-
-	createpath := c.PathSpec().AbsPathify(filepath.Join(c.Cfg.GetString("themesDir"), args[0]))
-	jww.INFO.Println("creating theme at", createpath)
-
-	cfg := c.DepsCfg
-
-	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
-		return newUserError(createpath, "already exists")
-	}
-
-	mkdir(createpath, "layouts", "_default")
-	mkdir(createpath, "layouts", "partials")
-
-	touchFile(cfg.Fs.Source, createpath, "layouts", "index.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "404.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "list.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "single.html")
-
-	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")
-
-	mkdir(createpath, "archetypes")
-
-	archDefault := []byte("+++\n+++\n")
-
-	err = helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), cfg.Fs.Source)
-	if err != nil {
-		return err
-	}
-
-	mkdir(createpath, "static", "js")
-	mkdir(createpath, "static", "css")
-
-	by := []byte(`The MIT License (MIT)
-
-Copyright (c) ` + time.Now().Format("2006") + ` YOUR_NAME_HERE
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-`)
-
-	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), cfg.Fs.Source)
-	if err != nil {
-		return err
-	}
-
-	createThemeMD(cfg.Fs, createpath)
-
-	return nil
-}
-
 func mkdir(x ...string) {
 	p := filepath.Join(x...)

@@ -332,39 +168,6 @@ func touchFile(fs afero.Fs, x ...string) {
 	}
 }

-func createThemeMD(fs *hugofs.Fs, inpath string) (err error) {
-
-	by := []byte(`# theme.toml template for a Hugo theme
-# See https://github.com/gohugoio/hugoThemes#themetoml for an example
-
-name = "` + strings.Title(helpers.MakeTitle(filepath.Base(inpath))) + `"
-license = "MIT"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
-description = ""
-homepage = "http://example.com/"
-tags = []
-features = []
-min_version = "0.35"
-
-[author]
-  name = ""
-  homepage = ""
-
-# If porting an existing theme
-[original]
-  name = ""
-  homepage = ""
-  repo = ""
-`)
-
-	err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), fs.Source)
-	if err != nil {
-		return
-	}
-
-	return nil
-}
-
 func newContentPathSection(path string) (string, string) {
 	// Forward slashes is used in all examples. Convert if needed.
 	// Issue #1133
@@ -381,20 +184,3 @@ func newContentPathSection(path string) (string, string) {

 	return createpath, section
 }
-
-func createConfig(fs *hugofs.Fs, inpath string, kind string) (err error) {
-	in := map[string]string{
-		"baseURL":      "http://example.org/",
-		"title":        "My New Hugo Site",
-		"languageCode": "en-us",
-	}
-	kind = parser.FormatSanitize(kind)
-
-	var buf bytes.Buffer
-	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
-	if err != nil {
-		return err
-	}
-
-	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
-}
@@ -1,4 +1,4 @@
-// Copyright 2016 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -48,10 +48,11 @@ func checkNewSiteInited(fs *hugofs.Fs, basepath string, t *testing.T) {
 }

 func TestDoNewSite(t *testing.T) {
+	n := newNewSiteCmd()
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()

-	require.NoError(t, doNewSite(fs, basepath, false))
+	require.NoError(t, n.doNewSite(fs, basepath, false))

 	checkNewSiteInited(fs, basepath, t)
 }
@@ -59,31 +60,34 @@ func TestDoNewSite(t *testing.T) {
 func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()
+	n := newNewSiteCmd()

 	require.NoError(t, fs.Source.MkdirAll(basepath, 777))

-	require.NoError(t, doNewSite(fs, basepath, false))
+	require.NoError(t, n.doNewSite(fs, basepath, false))
 }

 func TestDoNewSite_error_base_exists(t *testing.T) {
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()
+	n := newNewSiteCmd()

 	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
 	_, err := fs.Source.Create(filepath.Join(basepath, "foo"))
 	require.NoError(t, err)
 	// Since the directory already exists and isn't empty, expect an error
-	require.Error(t, doNewSite(fs, basepath, false))
+	require.Error(t, n.doNewSite(fs, basepath, false))

 }

 func TestDoNewSite_force_empty_dir(t *testing.T) {
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()
+	n := newNewSiteCmd()

 	require.NoError(t, fs.Source.MkdirAll(basepath, 777))

-	require.NoError(t, doNewSite(fs, basepath, true))
+	require.NoError(t, n.doNewSite(fs, basepath, true))

 	checkNewSiteInited(fs, basepath, t)
 }
@@ -91,23 +95,25 @@ func TestDoNewSite_force_empty_dir(t *testing.T) {
 func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()
+	n := newNewSiteCmd()

 	contentPath := filepath.Join(basepath, "content")

 	require.NoError(t, fs.Source.MkdirAll(contentPath, 777))
-	require.Error(t, doNewSite(fs, basepath, true))
+	require.Error(t, n.doNewSite(fs, basepath, true))
 }

 func TestDoNewSite_error_force_config_inside_exists(t *testing.T) {
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()
+	n := newNewSiteCmd()

 	configPath := filepath.Join(basepath, "config.toml")
 	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
 	_, err := fs.Source.Create(configPath)
 	require.NoError(t, err)

-	require.Error(t, doNewSite(fs, basepath, true))
+	require.Error(t, n.doNewSite(fs, basepath, true))
 }

 func newTestCfg() (*viper.Viper, *hugofs.Fs) {
@@ -0,0 +1,148 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"bytes"
+	"path/filepath"
+
+	"github.com/spf13/viper"
+
+	"errors"
+
+	"github.com/gohugoio/hugo/create"
+
+	"fmt"
+
+	"strings"
+
+	"github.com/gohugoio/hugo/parser"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+var _ cmder = (*newSiteCmd)(nil)
+
+type newSiteCmd struct {
+	configFormat string
+
+	*baseCmd
+}
+
+func newNewSiteCmd() *newSiteCmd {
+	ccmd := &newSiteCmd{}
+
+	cmd := &cobra.Command{
+		Use:   "site [path]",
+		Short: "Create a new site (skeleton)",
+		Long: `Create a new site in the provided directory.
+The new site will have the correct structure, but no content or theme yet.
+Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
+		RunE: ccmd.newSite,
+	}
+
+	cmd.Flags().StringVarP(&ccmd.configFormat, "format", "f", "toml", "config & frontmatter format")
+	cmd.Flags().Bool("force", false, "init inside non-empty directory")
+
+	ccmd.baseCmd = newBaseCmd(cmd)
+
+	return ccmd
+
+}
+
+func (n *newSiteCmd) doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
+	archeTypePath := filepath.Join(basepath, "archetypes")
+	dirs := []string{
+		filepath.Join(basepath, "layouts"),
+		filepath.Join(basepath, "content"),
+		archeTypePath,
+		filepath.Join(basepath, "static"),
+		filepath.Join(basepath, "data"),
+		filepath.Join(basepath, "themes"),
+	}
+
+	if exists, _ := helpers.Exists(basepath, fs.Source); exists {
+		if isDir, _ := helpers.IsDir(basepath, fs.Source); !isDir {
+			return errors.New(basepath + " already exists but not a directory")
+		}
+
+		isEmpty, _ := helpers.IsEmpty(basepath, fs.Source)
+
+		switch {
+		case !isEmpty && !force:
+			return errors.New(basepath + " already exists and is not empty")
+
+		case !isEmpty && force:
+			all := append(dirs, filepath.Join(basepath, "config."+n.configFormat))
+			for _, path := range all {
+				if exists, _ := helpers.Exists(path, fs.Source); exists {
+					return errors.New(path + " already exists")
+				}
+			}
+		}
+	}
+
+	for _, dir := range dirs {
+		if err := fs.Source.MkdirAll(dir, 0777); err != nil {
+			return fmt.Errorf("Failed to create dir: %s", err)
+		}
+	}
+
+	createConfig(fs, basepath, n.configFormat)
+
+	// Create a defaul archetype file.
+	helpers.SafeWriteToDisk(filepath.Join(archeTypePath, "default.md"),
+		strings.NewReader(create.ArchetypeTemplateTemplate), fs.Source)
+
+	jww.FEEDBACK.Printf("Congratulations! Your new Hugo site is created in %s.\n\n", basepath)
+	jww.FEEDBACK.Println(nextStepsText())
+
+	return nil
+}
+
+// newSite creates a new Hugo site and initializes a structured Hugo directory.
+func (n *newSiteCmd) newSite(cmd *cobra.Command, args []string) error {
+	if len(args) < 1 {
+		return newUserError("path needs to be provided")
+	}
+
+	createpath, err := filepath.Abs(filepath.Clean(args[0]))
+	if err != nil {
+		return newUserError(err)
+	}
+
+	forceNew, _ := cmd.Flags().GetBool("force")
+
+	return n.doNewSite(hugofs.NewDefault(viper.New()), createpath, forceNew)
+}
+
+func createConfig(fs *hugofs.Fs, inpath string, kind string) (err error) {
+	in := map[string]string{
+		"baseURL":      "http://example.org/",
+		"title":        "My New Hugo Site",
+		"languageCode": "en-us",
+	}
+	kind = parser.FormatSanitize(kind)
+
+	var buf bytes.Buffer
+	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
+	if err != nil {
+		return err
+	}
+
+	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
+}
@@ -0,0 +1,162 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"path/filepath"
+
+	"bytes"
+
+	"strings"
+	"time"
+
+	"github.com/gohugoio/hugo/hugofs"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+var _ cmder = (*newThemeCmd)(nil)
+
+type newThemeCmd struct {
+	*baseCmd
+	hugoBuilderCommon
+}
+
+func newNewThemeCmd() *newThemeCmd {
+	ccmd := &newThemeCmd{baseCmd: newBaseCmd(nil)}
+
+	cmd := &cobra.Command{
+		Use:   "theme [name]",
+		Short: "Create a new theme",
+		Long: `Create a new theme (skeleton) called [name] in the current directory.
+New theme is a skeleton. Please add content to the touched files. Add your
+name to the copyright line in the license and adjust the theme.toml file
+as you see fit.`,
+		RunE: ccmd.newTheme,
+	}
+
+	ccmd.cmd = cmd
+
+	return ccmd
+}
+
+func (n *newThemeCmd) newTheme(cmd *cobra.Command, args []string) error {
+	c, err := initializeConfig(false, &n.hugoBuilderCommon, n, nil)
+
+	if err != nil {
+		return err
+	}
+
+	if len(args) < 1 {
+		return newUserError("theme name needs to be provided")
+	}
+
+	createpath := c.PathSpec().AbsPathify(filepath.Join(c.Cfg.GetString("themesDir"), args[0]))
+	jww.INFO.Println("creating theme at", createpath)
+
+	cfg := c.DepsCfg
+
+	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
+		return newUserError(createpath, "already exists")
+	}
+
+	mkdir(createpath, "layouts", "_default")
+	mkdir(createpath, "layouts", "partials")
+
+	touchFile(cfg.Fs.Source, createpath, "layouts", "index.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "404.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "list.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "single.html")
+
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")
+
+	mkdir(createpath, "archetypes")
+
+	archDefault := []byte("+++\n+++\n")
+
+	err = helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), cfg.Fs.Source)
+	if err != nil {
+		return err
+	}
+
+	mkdir(createpath, "static", "js")
+	mkdir(createpath, "static", "css")
+
+	by := []byte(`The MIT License (MIT)
+
+Copyright (c) ` + time.Now().Format("2006") + ` YOUR_NAME_HERE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+`)
+
+	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), cfg.Fs.Source)
+	if err != nil {
+		return err
+	}
+
+	n.createThemeMD(cfg.Fs, createpath)
+
+	return nil
+}
+
+func (n *newThemeCmd) createThemeMD(fs *hugofs.Fs, inpath string) (err error) {
+
+	by := []byte(`# theme.toml template for a Hugo theme
+# See https://github.com/gohugoio/hugoThemes#themetoml for an example
+
+name = "` + strings.Title(helpers.MakeTitle(filepath.Base(inpath))) + `"
+license = "MIT"
+licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
+description = ""
+homepage = "http://example.com/"
+tags = []
+features = []
+min_version = "0.38"
+
+[author]
+  name = ""
+  homepage = ""
+
+# If porting an existing theme
+[original]
+  name = ""
+  homepage = ""
+  repo = ""
+`)
+
+	err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), fs.Source)
+	if err != nil {
+		return
+	}
+
+	return nil
+}
@@ -18,13 +18,12 @@ package commands
 import (
 	"errors"

+	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/releaser"
 	"github.com/spf13/cobra"
 )

-func init() {
-	HugoCmd.AddCommand(createReleaser().cmd)
-}
+var _ cmder = (*releaseCommandeer)(nil)

 type releaseCommandeer struct {
 	cmd *cobra.Command
@@ -35,7 +34,7 @@ type releaseCommandeer struct {
 	try         bool
 }

-func createReleaser() *releaseCommandeer {
+func createReleaser() cmder {
 	// Note: This is a command only meant for internal use and must be run
 	// via "go run -tags release main.go release" on the actual code base that is in the release.
 	r := &releaseCommandeer{
@@ -57,6 +56,14 @@ func createReleaser() *releaseCommandeer {
 	return r
 }

+func (c *releaseCommandeer) getCommand() *cobra.Command {
+	return c.cmd
+}
+
+func (c *releaseCommandeer) flagsToConfig(cfg config.Provider) {
+
+}
+
 func (r *releaseCommandeer) release() error {
 	if r.version == "" {
 		return errors.New("must set the --rel flag to the relevant version number")
@@ -0,0 +1,20 @@
+// +build !release
+
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+func createReleaser() cmder {
+	return &nilCommand{}
+}
@@ -1,4 +1,4 @@
-// Copyright 2016 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"syscall"
 	"time"

@@ -37,7 +38,10 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-var (
+type serverCmd struct {
+	// Can be used to stop the server. Useful in tests
+	stop <-chan bool
+
 	disableLiveReload bool
 	navigateToChanged bool
 	renderToDisk      bool
@@ -49,13 +53,22 @@ var (
 	noHTTPCache       bool

 	disableFastRender bool
-)

-var serverCmd = &cobra.Command{
-	Use:     "server",
-	Aliases: []string{"serve"},
-	Short:   "A high performance webserver",
-	Long: `Hugo provides its own webserver which builds and serves the site.
+	*baseBuilderCmd
+}
+
+func (b *commandsBuilder) newServerCmd() *serverCmd {
+	return b.newServerCmdSignaled(nil)
+}
+
+func (b *commandsBuilder) newServerCmdSignaled(stop <-chan bool) *serverCmd {
+	cc := &serverCmd{stop: stop}
+
+	cc.baseBuilderCmd = b.newBuilderCmd(&cobra.Command{
+		Use:     "server",
+		Aliases: []string{"serve"},
+		Short:   "A high performance webserver",
+		Long: `Hugo provides its own webserver which builds and serves the site.
 While hugo server is high performance, it is a webserver with limited options.
 Many run it in production, but the standard behavior is for people to use it
 in development and use a more full featured server such as Nginx or Caddy.
@@ -67,7 +80,24 @@ By default hugo will also watch your files for any changes you make and
 automatically rebuild the site. It will then live reload any open browser pages
 and push the latest content to them. As most Hugo sites are built in a fraction
 of a second, you will be able to save and see your changes nearly instantly.`,
-	//RunE: server,
+		RunE: cc.server,
+	})
+
+	cc.cmd.Flags().IntVarP(&cc.serverPort, "port", "p", 1313, "port on which the server will listen")
+	cc.cmd.Flags().IntVar(&cc.liveReloadPort, "liveReloadPort", -1, "port for live reloading (i.e. 443 in HTTPS proxy situations)")
+	cc.cmd.Flags().StringVarP(&cc.serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
+	cc.cmd.Flags().BoolVarP(&cc.serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
+	cc.cmd.Flags().BoolVar(&cc.noHTTPCache, "noHTTPCache", false, "prevent HTTP caching")
+	cc.cmd.Flags().BoolVarP(&cc.serverAppend, "appendPort", "", true, "append port to baseURL")
+	cc.cmd.Flags().BoolVar(&cc.disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
+	cc.cmd.Flags().BoolVar(&cc.navigateToChanged, "navigateToChanged", false, "navigate to changed content file on live browser reload")
+	cc.cmd.Flags().BoolVar(&cc.renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)")
+	cc.cmd.Flags().BoolVar(&cc.disableFastRender, "disableFastRender", false, "enables full re-renders on changes")
+
+	cc.cmd.Flags().String("memstats", "", "log memory usage to this file")
+	cc.cmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".")
+
+	return cc
 }

 type filesOnlyFs struct {
@@ -90,85 +120,79 @@ func (f noDirFile) Readdir(count int) ([]os.FileInfo, error) {
 	return nil, nil
 }

-func init() {
-	initHugoBuilderFlags(serverCmd)
+var serverPorts []int

-	serverCmd.Flags().IntVarP(&serverPort, "port", "p", 1313, "port on which the server will listen")
-	serverCmd.Flags().IntVar(&liveReloadPort, "liveReloadPort", -1, "port for live reloading (i.e. 443 in HTTPS proxy situations)")
-	serverCmd.Flags().StringVarP(&serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
-	serverCmd.Flags().BoolVarP(&serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
-	serverCmd.Flags().BoolVar(&noHTTPCache, "noHTTPCache", false, "prevent HTTP caching")
-	serverCmd.Flags().BoolVarP(&serverAppend, "appendPort", "", true, "append port to baseURL")
-	serverCmd.Flags().BoolVar(&disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
-	serverCmd.Flags().BoolVar(&navigateToChanged, "navigateToChanged", false, "navigate to changed content file on live browser reload")
-	serverCmd.Flags().BoolVar(&renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)")
-	serverCmd.Flags().BoolVar(&disableFastRender, "disableFastRender", false, "enables full re-renders on changes")
-
-	serverCmd.Flags().String("memstats", "", "log memory usage to this file")
-	serverCmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".")
-
-	serverCmd.RunE = server
-
-}
-
-func server(cmd *cobra.Command, args []string) error {
+func (s *serverCmd) server(cmd *cobra.Command, args []string) error {
 	// If a Destination is provided via flag write to disk
+	destination, _ := cmd.Flags().GetString("destination")
 	if destination != "" {
-		renderToDisk = true
+		s.renderToDisk = true
 	}

+	var serverCfgInit sync.Once
+
 	cfgInit := func(c *commandeer) error {
-		c.Set("renderToMemory", !renderToDisk)
+		c.Set("renderToMemory", !s.renderToDisk)
 		if cmd.Flags().Changed("navigateToChanged") {
-			c.Set("navigateToChanged", navigateToChanged)
+			c.Set("navigateToChanged", s.navigateToChanged)
 		}
 		if cmd.Flags().Changed("disableLiveReload") {
-			c.Set("disableLiveReload", disableLiveReload)
+			c.Set("disableLiveReload", s.disableLiveReload)
 		}
 		if cmd.Flags().Changed("disableFastRender") {
-			c.Set("disableFastRender", disableFastRender)
+			c.Set("disableFastRender", s.disableFastRender)
 		}
-		if serverWatch {
+		if s.serverWatch {
 			c.Set("watch", true)
 		}

-		serverPorts := make([]int, 1)
-
-		if c.languages.IsMultihost() {
-			if !serverAppend {
-				return newSystemError("--appendPort=false not supported when in multihost mode")
-			}
-			serverPorts = make([]int, len(c.languages))
+		// TODO(bep) yes, we should fix.
+		if !c.languagesConfigured {
+			return nil
 		}

-		currentServerPort := serverPort
+		var err error

-		for i := 0; i < len(serverPorts); i++ {
-			l, err := net.Listen("tcp", net.JoinHostPort(serverInterface, strconv.Itoa(currentServerPort)))
-			if err == nil {
-				l.Close()
-				serverPorts[i] = currentServerPort
-			} else {
-				if i == 0 && serverCmd.Flags().Changed("port") {
-					// port set explicitly by user -- he/she probably meant it!
-					return newSystemErrorF("Server startup failed: %s", err)
+		// We can only do this once.
+		serverCfgInit.Do(func() {
+			serverPorts = make([]int, 1)
+
+			if c.languages.IsMultihost() {
+				if !s.serverAppend {
+					err = newSystemError("--appendPort=false not supported when in multihost mode")
 				}
-				jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port")
-				sp, err := helpers.FindAvailablePort()
-				if err != nil {
-					return newSystemError("Unable to find alternative port to use:", err)
-				}
-				serverPorts[i] = sp.Port
+				serverPorts = make([]int, len(c.languages))
 			}

-			currentServerPort = serverPorts[i] + 1
-		}
+			currentServerPort := s.serverPort
+
+			for i := 0; i < len(serverPorts); i++ {
+				l, err := net.Listen("tcp", net.JoinHostPort(s.serverInterface, strconv.Itoa(currentServerPort)))
+				if err == nil {
+					l.Close()
+					serverPorts[i] = currentServerPort
+				} else {
+					if i == 0 && s.cmd.Flags().Changed("port") {
+						// port set explicitly by user -- he/she probably meant it!
+						err = newSystemErrorF("Server startup failed: %s", err)
+					}
+					jww.ERROR.Println("port", s.serverPort, "already in use, attempting to use an available port")
+					sp, err := helpers.FindAvailablePort()
+					if err != nil {
+						err = newSystemError("Unable to find alternative port to use:", err)
+					}
+					serverPorts[i] = sp.Port
+				}
+
+				currentServerPort = serverPorts[i] + 1
+			}
+		})

 		c.serverPorts = serverPorts

-		c.Set("port", serverPort)
-		if liveReloadPort != -1 {
-			c.Set("liveReloadPort", liveReloadPort)
+		c.Set("port", s.serverPort)
+		if s.liveReloadPort != -1 {
+			c.Set("liveReloadPort", s.liveReloadPort)
 		} else {
 			c.Set("liveReloadPort", serverPorts[0])
 		}
@@ -182,9 +206,9 @@ func server(cmd *cobra.Command, args []string) error {
 				serverPort = serverPorts[0]
 			}

-			baseURL, err := fixURL(language, baseURL, serverPort)
+			baseURL, err := s.fixURL(language, s.baseURL, serverPort)
 			if err != nil {
-				return err
+				return nil
 			}
 			if isMultiHost {
 				language.Set("baseURL", baseURL)
@@ -194,7 +218,7 @@ func server(cmd *cobra.Command, args []string) error {
 			}
 		}

-		return nil
+		return err

 	}

@@ -202,7 +226,7 @@ func server(cmd *cobra.Command, args []string) error {
 		jww.ERROR.Println("memstats error:", err)
 	}

-	c, err := InitializeConfig(true, cfgInit, serverCmd)
+	c, err := initializeConfig(true, &s.hugoBuilderCommon, s, cfgInit)
 	if err != nil {
 		return err
 	}
@@ -211,16 +235,12 @@ func server(cmd *cobra.Command, args []string) error {
 		return err
 	}

-	for _, s := range Hugo.Sites {
+	for _, s := range c.hugo.Sites {
 		s.RegisterMediaTypes()
 	}

-	if serverWatch {
-		c.watchConfig()
-	}
-
 	// Watch runs its own server as part of the routine
-	if serverWatch {
+	if s.serverWatch {

 		watchDirs, err := c.getDirList()
 		if err != nil {
@@ -246,7 +266,7 @@ func server(cmd *cobra.Command, args []string) error {

 	}

-	return c.serve()
+	return c.serve(s)

 }

@@ -254,6 +274,7 @@ type fileServer struct {
 	baseURLs []string
 	roots    []string
 	c        *commandeer
+	s        *serverCmd
 }

 func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, error) {
@@ -270,7 +291,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
 	absPublishDir := f.c.PathSpec().AbsPathify(publishDir)

 	if i == 0 {
-		if renderToDisk {
+		if f.s.renderToDisk {
 			jww.FEEDBACK.Println("Serving pages from " + absPublishDir)
 		} else {
 			jww.FEEDBACK.Println("Serving pages from memory")
@@ -280,7 +301,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
 	httpFs := afero.NewHttpFs(f.c.Fs.Destination)
 	fs := filesOnlyFs{httpFs.Dir(absPublishDir)}

-	doLiveReload := !buildWatch && !f.c.Cfg.GetBool("disableLiveReload")
+	doLiveReload := !f.s.buildWatch && !f.c.Cfg.GetBool("disableLiveReload")
 	fastRenderMode := doLiveReload && !f.c.Cfg.GetBool("disableFastRender")

 	if i == 0 && fastRenderMode {
@@ -295,7 +316,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro

 	decorate := func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if noHTTPCache {
+			if f.s.noHTTPCache {
 				w.Header().Set("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0")
 				w.Header().Set("Pragma", "no-cache")
 			}
@@ -319,14 +340,14 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
 		mu.Handle(u.Path, http.StripPrefix(u.Path, fileserver))
 	}

-	endpoint := net.JoinHostPort(serverInterface, strconv.Itoa(port))
+	endpoint := net.JoinHostPort(f.s.serverInterface, strconv.Itoa(port))

 	return mu, u.String(), endpoint, nil
 }

-func (c *commandeer) serve() error {
+func (c *commandeer) serve(s *serverCmd) error {

-	isMultiHost := Hugo.IsMultihost()
+	isMultiHost := c.hugo.IsMultihost()

 	var (
 		baseURLs []string
@@ -334,12 +355,12 @@ func (c *commandeer) serve() error {
 	)

 	if isMultiHost {
-		for _, s := range Hugo.Sites {
+		for _, s := range c.hugo.Sites {
 			baseURLs = append(baseURLs, s.BaseURL.String())
 			roots = append(roots, s.Language.Lang)
 		}
 	} else {
-		s := Hugo.Sites[0]
+		s := c.hugo.Sites[0]
 		baseURLs = []string{s.BaseURL.String()}
 		roots = []string{""}
 	}
@@ -348,6 +369,7 @@ func (c *commandeer) serve() error {
 		baseURLs: baseURLs,
 		roots:    roots,
 		c:        c,
+		s:        s,
 	}

 	doLiveReload := !c.Cfg.GetBool("disableLiveReload")
@@ -359,14 +381,14 @@ func (c *commandeer) serve() error {
 	var sigs = make(chan os.Signal)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)

-	for i, _ := range baseURLs {
+	for i := range baseURLs {
 		mu, serverURL, endpoint, err := srv.createEndpoint(i)

 		if doLiveReload {
 			mu.HandleFunc("/livereload.js", livereload.ServeJS)
 			mu.HandleFunc("/livereload", livereload.Handler)
 		}
-		jww.FEEDBACK.Printf("Web Server is available at %s (bind address %s)\n", serverURL, serverInterface)
+		jww.FEEDBACK.Printf("Web Server is available at %s (bind address %s)\n", serverURL, s.serverInterface)
 		go func() {
 			err = http.ListenAndServe(endpoint, mu)
 			if err != nil {
@@ -378,14 +400,21 @@ func (c *commandeer) serve() error {

 	jww.FEEDBACK.Println("Press Ctrl+C to stop")

-	<-sigs
+	if s.stop != nil {
+		select {
+		case <-sigs:
+		case <-s.stop:
+		}
+	} else {
+		<-sigs
+	}

 	return nil
 }

 // fixURL massages the baseURL into a form needed for serving
 // all pages correctly.
-func fixURL(cfg config.Provider, s string, port int) (string, error) {
+func (sc *serverCmd) fixURL(cfg config.Provider, s string, port int) (string, error) {
 	useLocalhost := false
 	if s == "" {
 		s = cfg.GetString("baseURL")
@@ -420,7 +449,7 @@ func fixURL(cfg config.Provider, s string, port int) (string, error) {
 		u.Host = "localhost"
 	}

-	if serverAppend {
+	if sc.serverAppend {
 		if strings.Contains(u.Host, ":") {
 			u.Host, _, err = net.SplitHostPort(u.Host)
 			if err != nil {
@@ -434,9 +463,11 @@ func fixURL(cfg config.Provider, s string, port int) (string, error) {
 }

 func memStats() error {
-	memstats := serverCmd.Flags().Lookup("memstats").Value.String()
+	b := newCommandsBuilder()
+	sc := b.newServerCmd().getCommand()
+	memstats := sc.Flags().Lookup("memstats").Value.String()
 	if memstats != "" {
-		interval, err := time.ParseDuration(serverCmd.Flags().Lookup("meminterval").Value.String())
+		interval, err := time.ParseDuration(sc.Flags().Lookup("meminterval").Value.String())
 		if err != nil {
 			interval, _ = time.ParseDuration("100ms")
 		}
@@ -14,11 +14,60 @@
 package commands

 import (
+	"fmt"
+	"net/http"
+	"os"
 	"testing"
+	"time"
+
+	"github.com/gohugoio/hugo/helpers"

 	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
 )

+func TestServer(t *testing.T) {
+	assert := require.New(t)
+	dir, err := createSimpleTestSite(t)
+	assert.NoError(err)
+
+	// Let us hope that this port is available on all systems ...
+	port := 1331
+
+	defer func() {
+		os.RemoveAll(dir)
+	}()
+
+	stop := make(chan bool)
+
+	b := newCommandsBuilder()
+	scmd := b.newServerCmdSignaled(stop)
+
+	cmd := scmd.getCommand()
+	cmd.SetArgs([]string{"-s=" + dir, fmt.Sprintf("-p=%d", port)})
+
+	go func() {
+		_, err = cmd.ExecuteC()
+		assert.NoError(err)
+	}()
+
+	// There is no way to know exactly when the server is ready for connections.
+	// We could improve by something like https://golang.org/pkg/net/http/httptest/#Server
+	// But for now, let us sleep and pray!
+	time.Sleep(2 * time.Second)
+
+	resp, err := http.Get("http://localhost:1331/")
+	assert.NoError(err)
+	defer resp.Body.Close()
+	homeContent := helpers.ReaderToString(resp.Body)
+
+	assert.Contains(homeContent, "List: Hugo Commands")
+
+	// Stop the server.
+	stop <- true
+
+}
+
 func TestFixURL(t *testing.T) {
 	type data struct {
 		TestName   string
@@ -42,12 +91,14 @@ func TestFixURL(t *testing.T) {
 	}

 	for i, test := range tests {
+		b := newCommandsBuilder()
+		s := b.newServerCmd()
 		v := viper.New()
-		baseURL = test.CLIBaseURL
+		baseURL := test.CLIBaseURL
 		v.Set("baseURL", test.CfgBaseURL)
-		serverAppend = test.AppendPort
-		serverPort = test.Port
-		result, err := fixURL(v, baseURL, serverPort)
+		s.serverAppend = test.AppendPort
+		s.serverPort = test.Port
+		result, err := s.fixURL(v, baseURL, s.serverPort)
 		if err != nil {
 			t.Errorf("Test #%d %s: unexpected error %s", i, test.TestName, err)
 		}
@@ -23,19 +23,33 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )

-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print the version number of Hugo",
-	Long:  `All software has versions. This is Hugo's.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		printHugoVersion()
-		return nil
-	},
+var _ cmder = (*versionCmd)(nil)
+
+type versionCmd struct {
+	*baseCmd
+}
+
+func newVersionCmd() *versionCmd {
+	return &versionCmd{
+		newBaseCmd(&cobra.Command{
+			Use:   "version",
+			Short: "Print the version number of Hugo",
+			Long:  `All software has versions. This is Hugo's.`,
+			RunE: func(cmd *cobra.Command, args []string) error {
+				printHugoVersion()
+				return nil
+			},
+		}),
+	}
 }

 func printHugoVersion() {
 	if hugolib.CommitHash == "" {
-		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
+		if hugolib.BuildDate == "" {
+			jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH)
+		} else {
+			jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
+		}
 	} else {
 		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s-%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, strings.ToUpper(hugolib.CommitHash), runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
 	}
@@ -20,6 +20,12 @@ import (
 	"github.com/spf13/cast"
 )

+// KeyValueStr is a string tuple.
+type KeyValueStr struct {
+	Key   string
+	Value string
+}
+
 // KeyValues holds an key and a slice of values.
 type KeyValues struct {
 	Key    interface{}
@@ -19,3 +19,11 @@ package compare
 type Eqer interface {
 	Eq(other interface{}) bool
 }
+
+// Comparer can be used to compare two values.
+// This will be used when using the le, ge etc. operators in the templates.
+// Compare returns -1 if the given version is less than, 0 if equal and 1 if greater than
+// the running version.
+type Comparer interface {
+	Compare(other interface{}) int
+}
@@ -13,6 +13,12 @@

 package config

+import (
+	"strings"
+
+	"github.com/spf13/viper"
+)
+
 // Provider provides the configuration settings for Hugo.
 type Provider interface {
 	GetString(key string) string
@@ -25,3 +31,14 @@ type Provider interface {
 	Set(key string, value interface{})
 	IsSet(key string) bool
 }
+
+// FromConfigString creates a config from the given YAML, JSON or TOML config. This is useful in tests.
+func FromConfigString(config, configType string) (Provider, error) {
+	v := viper.New()
+	v.SetConfigType(configType)
+	if err := v.ReadConfig(strings.NewReader(config)); err != nil {
+		return nil, err
+	}
+	return v, nil
+
+}
@@ -0,0 +1,107 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package privacy
+
+import (
+	"github.com/gohugoio/hugo/config"
+	"github.com/mitchellh/mapstructure"
+)
+
+const privacyConfigKey = "privacy"
+
+// Service is the common values for a service in a policy definition.
+type Service struct {
+	Disable bool
+}
+
+// Config is a privacy configuration for all the relevant services in Hugo.
+type Config struct {
+	Disqus          Disqus
+	GoogleAnalytics GoogleAnalytics
+	Instagram       Instagram
+	SpeakerDeck     SpeakerDeck
+	Twitter         Twitter
+	Vimeo           Vimeo
+	YouTube         YouTube
+}
+
+// Disqus holds the privacy configuration settings related to the Disqus template.
+type Disqus struct {
+	Service `mapstructure:",squash"`
+}
+
+// GoogleAnalytics holds the privacy configuration settings related to the Google Analytics template.
+type GoogleAnalytics struct {
+	Service `mapstructure:",squash"`
+
+	// Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
+	UseSessionStorage bool
+
+	// Enabling this will make the GA templates respect the
+	// "Do Not Track" HTTP header. See  https://www.paulfurley.com/google-analytics-dnt/.
+	RespectDoNotTrack bool
+
+	// Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
+	AnonymizeIP bool
+}
+
+// Instagram holds the privacy configuration settings related to the Instagram shortcode.
+type Instagram struct {
+	Service `mapstructure:",squash"`
+
+	// If simple mode is enabled, a static and no-JS version of the Instagram
+	// image card will be built.
+	Simple bool
+}
+
+// SpeakerDeck holds the privacy configuration settings related to the SpeakerDeck shortcode.
+type SpeakerDeck struct {
+	Service `mapstructure:",squash"`
+}
+
+// Twitter holds the privacy configuration settingsrelated to the Twitter shortcode.
+type Twitter struct {
+	Service `mapstructure:",squash"`
+
+	// When set to true, the Tweet and its embedded page on your site are not used
+	// for purposes that include personalized suggestions and personalized ads.
+	EnableDNT bool
+}
+
+// Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode.
+type Vimeo struct {
+	Service `mapstructure:",squash"`
+}
+
+// YouTube holds the privacy configuration settingsrelated to the YouTube shortcode.
+type YouTube struct {
+	Service `mapstructure:",squash"`
+
+	// When you turn on privacy-enhanced mode,
+	// YouTube won’t store information about visitors on your website
+	// unless the user plays the embedded video.
+	PrivacyEnhanced bool
+}
+
+func DecodeConfig(cfg config.Provider) (pc Config, err error) {
+	if !cfg.IsSet(privacyConfigKey) {
+		return
+	}
+
+	m := cfg.GetStringMap(privacyConfigKey)
+
+	err = mapstructure.WeakDecode(m, &pc)
+
+	return
+}
@@ -0,0 +1,104 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package privacy
+
+import (
+	"testing"
+
+	"github.com/gohugoio/hugo/config"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDecodeConfigFromTOML(t *testing.T) {
+	assert := require.New(t)
+
+	tomlConfig := `
+
+someOtherValue = "foo"
+
+[privacy]
+[privacy.disqus]
+disable = true
+[privacy.googleAnalytics]
+disable = true
+respectDoNotTrack = true
+anonymizeIP = true
+useSessionStorage = true
+[privacy.instagram]
+disable = true
+simple = true
+[privacy.speakerDeck]
+disable = true
+[privacy.twitter]
+disable = true
+enableDNT = true
+[privacy.vimeo]
+disable = true
+[privacy.youtube]
+disable = true
+privacyEnhanced = true
+simple = true
+`
+	cfg, err := config.FromConfigString(tomlConfig, "toml")
+	assert.NoError(err)
+
+	pc, err := DecodeConfig(cfg)
+	assert.NoError(err)
+	assert.NotNil(pc)
+
+	assert.True(pc.Disqus.Disable)
+	assert.True(pc.GoogleAnalytics.Disable)
+	assert.True(pc.GoogleAnalytics.RespectDoNotTrack)
+	assert.True(pc.GoogleAnalytics.AnonymizeIP)
+	assert.True(pc.GoogleAnalytics.UseSessionStorage)
+	assert.True(pc.Instagram.Disable)
+	assert.True(pc.Instagram.Simple)
+	assert.True(pc.SpeakerDeck.Disable)
+	assert.True(pc.Twitter.Disable)
+	assert.True(pc.Twitter.EnableDNT)
+	assert.True(pc.Vimeo.Disable)
+
+	assert.True(pc.YouTube.PrivacyEnhanced)
+	assert.True(pc.YouTube.Disable)
+}
+
+func TestDecodeConfigFromTOMLCaseInsensitive(t *testing.T) {
+	assert := require.New(t)
+
+	tomlConfig := `
+
+someOtherValue = "foo"
+
+[Privacy]
+[Privacy.YouTube]
+PrivacyENhanced = true
+`
+	cfg, err := config.FromConfigString(tomlConfig, "toml")
+	assert.NoError(err)
+
+	pc, err := DecodeConfig(cfg)
+	assert.NoError(err)
+	assert.NotNil(pc)
+	assert.True(pc.YouTube.PrivacyEnhanced)
+}
+
+func TestDecodeConfigDefault(t *testing.T) {
+	assert := require.New(t)
+
+	pc, err := DecodeConfig(viper.New())
+	assert.NoError(err)
+	assert.NotNil(pc)
+	assert.False(pc.YouTube.PrivacyEnhanced)
+}
@@ -0,0 +1,70 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package services
+
+import (
+	"github.com/gohugoio/hugo/config"
+	"github.com/mitchellh/mapstructure"
+)
+
+const (
+	servicesConfigKey = "services"
+
+	disqusShortnameKey = "disqusshortname"
+	googleAnalyticsKey = "googleanalytics"
+)
+
+// Config is a privacy configuration for all the relevant services in Hugo.
+type Config struct {
+	Disqus          Disqus
+	GoogleAnalytics GoogleAnalytics
+	Instagram       Instagram
+}
+
+// Disqus holds the functional configuration settings related to the Disqus template.
+type Disqus struct {
+	// A Shortname is the unique identifier assigned to a Disqus site.
+	Shortname string
+}
+
+// GoogleAnalytics holds the functional configuration settings related to the Google Analytics template.
+type GoogleAnalytics struct {
+	// The GA tracking ID.
+	ID string
+}
+
+// Instagram holds the functional configuration settings related to the Instagram shortcodes.
+type Instagram struct {
+	// The Simple variant of the Instagram is decorated with Bootstrap 4 card classes.
+	// This means that if you use Bootstrap 4 or want to provide your own CSS, you want
+	// to disable the inline CSS provided by Hugo.
+	DisableInlineCSS bool
+}
+
+func DecodeConfig(cfg config.Provider) (c Config, err error) {
+	m := cfg.GetStringMap(servicesConfigKey)
+
+	err = mapstructure.WeakDecode(m, &c)
+
+	// Keep backwards compability.
+	if c.GoogleAnalytics.ID == "" {
+		// Try the global config
+		c.GoogleAnalytics.ID = cfg.GetString(googleAnalyticsKey)
+	}
+	if c.Disqus.Shortname == "" {
+		c.Disqus.Shortname = cfg.GetString(disqusShortnameKey)
+	}
+
+	return
+}
@@ -0,0 +1,67 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package services
+
+import (
+	"testing"
+
+	"github.com/gohugoio/hugo/config"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDecodeConfigFromTOML(t *testing.T) {
+	assert := require.New(t)
+
+	tomlConfig := `
+
+someOtherValue = "foo"
+
+[services]
+[services.disqus]
+shortname = "DS"
+[services.googleAnalytics]
+id = "ga_id"
+[services.instagram]
+disableInlineCSS = true
+`
+	cfg, err := config.FromConfigString(tomlConfig, "toml")
+	assert.NoError(err)
+
+	config, err := DecodeConfig(cfg)
+	assert.NoError(err)
+	assert.NotNil(config)
+
+	assert.Equal("DS", config.Disqus.Shortname)
+	assert.Equal("ga_id", config.GoogleAnalytics.ID)
+
+	assert.True(config.Instagram.DisableInlineCSS)
+}
+
+// Support old root-level GA settings etc.
+func TestUseSettingsFromRootIfSet(t *testing.T) {
+	assert := require.New(t)
+
+	cfg := viper.New()
+	cfg.Set("disqusShortname", "root_short")
+	cfg.Set("googleAnalytics", "ga_root")
+
+	config, err := DecodeConfig(cfg)
+	assert.NoError(err)
+	assert.NotNil(config)
+
+	assert.Equal("root_short", config.Disqus.Shortname)
+	assert.Equal("ga_root", config.GoogleAnalytics.ID)
+
+}
@@ -63,7 +63,22 @@ func NewContent(
 		return err
 	}

-	contentPath := s.PathSpec.AbsPathify(filepath.Join(s.Cfg.GetString("contentDir"), targetPath))
+	// The site may have multiple content dirs, and we currently do not know which contentDir the
+	// user wants to create this content in. We should improve on this, but we start by testing if the
+	// provided path points to an existing dir. If so, use it as is.
+	var contentPath string
+	var exists bool
+	targetDir := filepath.Dir(targetPath)
+
+	if targetDir != "" && targetDir != "." {
+		exists, _ = helpers.Exists(targetDir, ps.Fs.Source)
+	}
+
+	if exists {
+		contentPath = targetPath
+	} else {
+		contentPath = s.PathSpec.AbsPathify(filepath.Join(s.Cfg.GetString("contentDir"), targetPath))
+	}

 	if err := helpers.SafeWriteToDisk(contentPath, bytes.NewReader(content), s.Fs.Source); err != nil {
 		return err
@@ -42,7 +42,7 @@ type ArchetypeFileData struct {
 	// used in the archetype template. Also, if this is a multilingual setup,
 	// this site is the site that best matches the target content file, based
 	// on the presence of language code in the filename.
-	Site *hugolib.Site
+	Site *hugolib.SiteInfo

 	// Name will in most cases be the same as TranslationBaseName, e.g. "my-post".
 	// But if that value is "index" (bundles), the Name is instead the owning folder.
@@ -88,10 +88,15 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 		err               error
 	)

-	sp := source.NewSourceSpec(s.Deps.Cfg, s.Deps.Fs)
+	ps, err := helpers.NewPathSpec(s.Deps.Fs, s.Deps.Cfg)
+	sp := source.NewSourceSpec(ps, ps.Fs.Source)
+	if err != nil {
+		return nil, err
+	}
 	f := sp.NewFileInfo("", targetPath, false, nil)

 	name := f.TranslationBaseName()
+
 	if name == "index" || name == "_index" {
 		// Page bundles; the directory name will hopefully have a better name.
 		dir := strings.TrimSuffix(f.Dir(), helpers.FilePathSeparator)
@@ -103,7 +108,7 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 		Date: time.Now().Format(time.RFC3339),
 		Name: name,
 		File: f,
-		Site: s,
+		Site: &s.Info,
 	}

 	if archetypeFilename == "" {
@@ -137,15 +142,6 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile

 	archetypeContent = []byte(archetypeShortcodeReplacementsPost.Replace(buff.String()))

-	if !bytes.Contains(archetypeContent, []byte("date")) || !bytes.Contains(archetypeContent, []byte("title")) {
-		// TODO(bep) remove some time in the future.
-		s.Log.FEEDBACK.Println(fmt.Sprintf(`WARNING: date and/or title missing from archetype file %q.
-From Hugo 0.24 this must be provided in the archetype file itself, if needed. Example:
-%s
-`, archetypeFilename, ArchetypeTemplateTemplate))
-
-	}
-
 	return archetypeContent, nil

 }
@@ -75,7 +75,7 @@ func TestNewContent(t *testing.T) {
 		for i, v := range c.expected {
 			found := strings.Contains(content, v)
 			if !found {
-				t.Errorf("[%d] %q missing from output:\n%q", i, v, content)
+				t.Fatalf("[%d] %q missing from output:\n%q", i, v, content)
 			}
 		}
 	}
@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"time"

 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/helpers"
@@ -22,6 +23,9 @@ type Deps struct {
 	// The logger to use.
 	Log *jww.Notepad `json:"-"`

+	// Used to log errors that may repeat itself many times.
+	DistinctErrorLog *helpers.DistinctLogger
+
 	// The templates to use. This will usually implement the full tpl.TemplateHandler.
 	Tmpl tpl.TemplateFinder `json:"-"`

@@ -54,6 +58,9 @@ type Deps struct {
 	translationProvider ResourceProvider

 	Metrics metrics.Provider
+
+	// Timeout is configurable in site config.
+	Timeout time.Duration
 }

 // ResourceProvider is used to create and refresh, and clone resources needed.
@@ -126,11 +133,19 @@ func New(cfg DepsCfg) (*Deps, error) {
 		return nil, err
 	}

-	sp := source.NewSourceSpec(cfg.Language, fs)
+	sp := source.NewSourceSpec(ps, fs.Source)
+
+	timeoutms := cfg.Language.GetInt("timeout")
+	if timeoutms <= 0 {
+		timeoutms = 3000
+	}
+
+	distinctErrorLogger := helpers.NewDistinctLogger(logger.ERROR)

 	d := &Deps{
 		Fs:                  fs,
 		Log:                 logger,
+		DistinctErrorLog:    distinctErrorLogger,
 		templateProvider:    cfg.TemplateProvider,
 		translationProvider: cfg.TranslationProvider,
 		WithTemplate:        cfg.WithTemplate,
@@ -139,6 +154,7 @@ func New(cfg DepsCfg) (*Deps, error) {
 		SourceSpec:          sp,
 		Cfg:                 cfg.Language,
 		Language:            cfg.Language,
+		Timeout:             time.Duration(timeoutms) * time.Millisecond,
 	}

 	if cfg.Cfg.GetBool("templateMetrics") {
@@ -1,3 +1,4 @@
 /.idea
 /public
 nohup.out
+.DS_Store
@@ -10,6 +10,12 @@ Note that this repository contains solely the documentation for Hugo. For contri

 *Pull requests shall **only** contain changes to the actual documentation. However, changes on the code base of Hugo **and** the documentation shall be a single, atomic pull request in the [hugo](https://github.com/gohugoio/hugo) repository.*

+Spelling fixes are most welcomed, and if you want to contribute longer sections to the documentation, it would be great if you had these in mind when writing:
+
+* Short is good. People go to the library to read novels. If there is more than one way to _do a thing_ in Hugo, describe the current _best practice_ (avoid "… but you can also do …" and "… in older versions of Hugo you had to …".
+* For examples, try to find short snippets that teaches people about the concept. If the example is also useful as-is (copy and paste), then great, but don't list long and similar examples just so people can use them on their sites.
+* Hugo has users from all over the world, so an easy to understand and [simple English](https://simple.wikipedia.org/wiki/Basic_English) is good.
+
 ## Branches

 * The `master` branch is where the site is automatically built from, and is the place to put changes relevant to the current Hugo version.
@@ -16,7 +16,6 @@ pluralizeListTitles = false
 # We do redirects via Netlify's _redirects file, generated by Hugo (see "outputs" below).
 disableAliases = true

-
 # Highlighting config (Pygments)
 # It is (currently) not in use, but you can do ```go in a content file if you want to.
 pygmentsCodeFences = true
@@ -27,7 +26,7 @@ pygmentsUseClasses = true
 pygmentsUseClassic = false

 # See https://help.farbox.com/pygments.html
-pygmentsStyle = "friendly"
+pygmentsStyle = "trac"

 [outputs]
 home = [ "HTML", "RSS", "REDIR", "HEADERS" ]
@@ -71,7 +70,7 @@ twitter = "GoHugoIO"
 [params]
  description = "The world’s fastest framework for building websites"
  ## Used for views in rendered HTML (i.e., rather than using the .Hugo variable)
-  release = "0.35"
+  release = "0.41"
  ## Setting this to true will add a "noindex" to *EVERY* page on the site
  removefromexternalsearch = false
  ## Gh repo for site footer (include trailing slash)
@@ -103,6 +102,18 @@ twitter = "GoHugoIO"
  angledQuotes = false
  latexDashes = true

+[imaging]
+# See https://github.com/disintegration/imaging
+# CatmullRom is a sharp bicubic filter which should fit the docs site well with its many screenshots.
+# Note that you can also set this per image processing.
+resampleFilter = "CatmullRom"
+
+# Defatult JPEG quality setting. Default is 75.
+quality = 75
+
+anchor = "smart"
+
+
 ## As of v0.20, all content files include a default "categories" value that's the same as the section. This was a cheap future-proofing method and should/could be changed accordingly.
 [taxonomies]
  category = "categories"
@@ -238,6 +249,12 @@ twitter = "GoHugoIO"
    identifier = "themes"
    url = "https://themes.gohugo.io/"

+    [[menu.global]]
+      name = "Showcase"
+      weight = 20
+      identifier = "showcase"
+      url = "/showcase/"
+
  # Anything with a weight > 100 gets an external icon
  [[menu.global]]
    name = "Community"
@@ -254,3 +271,139 @@ twitter = "GoHugoIO"
    identifier = "github"
    post = "external"
    url = "https://github.com/gohugoio/hugo"
+
+### LANGUAGES ###
+
+[languages]
+  [languages.en]
+    contentDir = "content/en"
+    languageName = "English"
+    weight = 1
+  [languages.zh]
+    contentDir = "content/zh"
+    languageName = "中文"
+    weight = 2
+
+
+### LANGUAGE-SPECIFIC MENUS ###
+
+# Chinese menus
+
+[[languages.zh.menu.docs]]
+  name = "关于 Hugo"
+  weight = 1
+  identifier = "about"
+  url = "/zh/about/"
+
+[[languages.zh.menu.docs]]
+  name = "入门"
+  weight = 5
+  identifier = "getting-started"
+  url = "/zh/getting-started/"
+
+[[languages.zh.menu.docs]]
+  name = "主题"
+  weight = 15
+  identifier = "themes"
+  post = "break"
+  url = "/zh/themes/"
+
+# Core languages.zh.menus
+
+[[languages.zh.menu.docs]]
+  name = "内容管理"
+  weight = 20
+  identifier = "content-management"
+  post = "expanded"
+  url = "/zh/content-management/"
+
+[[languages.zh.menu.docs]]
+  name = "模板"
+  weight = 25
+  identifier = "templates"
+  url = "/zh/templates/"
+
+[[languages.zh.menu.docs]]
+  name = "函数"
+  weight = 30
+  identifier = "functions"
+  url = "/zh/functions/"
+
+[[languages.zh.menu.docs]]
+  name = "变量"
+  weight = 35
+  identifier = "variables"
+  url = "/zh/variables/"
+
+[[languages.zh.menu.docs]]
+  name = "CLI"
+  weight = 40
+  post = "break"
+  identifier = "commands"
+  url = "/commands/"
+
+# LOW LEVEL ITEMS
+[[languages.zh.menu.docs]]
+  name = "故障排除"
+  weight = 60
+  identifier = "troubleshooting"
+  url = "/zh/troubleshooting/"
+
+[[languages.zh.menu.docs]]
+  name = "工具"
+  weight = 70
+  identifier = "tools"
+  url = "/zh/tools/"
+
+[[languages.zh.menu.docs]]
+  name = "托管与部署"
+  weight = 80
+  identifier = "hosting-and-deployment"
+  url = "/zh/hosting-and-deployment/"
+
+[[languages.zh.menu.docs]]
+  name = "贡献"
+  weight = 100
+  post = "break"
+  identifier = "contribute"
+  url = "/zh/contribute/"
+
+[[languages.zh.menu.global]]
+  name = "新闻"
+  weight = 1
+  identifier = "news"
+  url = "/zh/news/"
+
+[[languages.zh.menu.global]]
+  name = "文档"
+  weight = 5
+  identifier = "docs"
+  url = "/zh/documentation/"
+
+[[languages.zh.menu.global]]
+  name = "主题"
+  weight = 10
+  identifier = "themes"
+  url = "https://themes.gohugo.io/"
+
+[[languages.zh.menu.global]]
+  name = "作品展示"
+  weight = 20
+  identifier = "showcase"
+  url = "/zh/showcase/"
+
+# Anything with a weight > 100 gets an external icon
+[[languages.zh.menu.global]]
+  name = "社区"
+  weight = 150
+  icon = true
+  identifier = "community"
+  post = "external"
+  url = "https://discourse.gohugo.io/"
+
+[[languages.zh.menu.global]]
+  name = "GitHub"
+  weight = 200
+  identifier = "github"
+  post = "external"
+  url = "https://github.com/gohugoio/hugo"
@@ -1,192 +0,0 @@
---
-title: Archetypes
-linktitle: Archetypes
-description: Archetypes allow you to create new instances of content types and set default parameters from the command line.
-date: 2017-02-01
-publishdate: 2017-02-01
-lastmod: 2017-02-01
-keywords: [archetypes,generators,metadata,front matter]
-categories: ["content management"]
-menu:
-  docs:
-    parent: "content-management"
-    weight: 70
-  quicklinks:
-weight: 70	#rem
-draft: false
-aliases: [/content/archetypes/]
-toc: true
---
-
-{{% note %}}
-This section is outdated, see https://github.com/gohugoio/hugoDocs/issues/11
-{{% /note %}}
-{{% todo %}}
-See above
-{{% /todo %}}
-
-## What are Archetypes?
-
-**Archetypes** are content files in the [archetypes directory][] of your project that contain preconfigured [front matter][] for your website's [content types][]. Archetypes facilitate consistent metadata across your website content and allow content authors to quickly generate instances of a content type via the `hugo new` command.
-
-{{< youtube bcme8AzVh6o >}}
-
-The `hugo new` generator for archetypes assumes your working directory is the content folder at the root of your project. Hugo is able to infer the appropriate archetype by assuming the content type from the content section passed to the CLI command:
-
-```
-hugo new <content-section>/<file-name.md>
-```
-
-We can use this pattern to create a new `.md` file in the `posts` section:
-
-{{< code file="archetype-example.sh" >}}
-hugo new posts/my-first-post.md
-{{< /code >}}
-
-{{% note "Override Content Type in a New File" %}}
-To override the content type Hugo infers from `[content-section]`, add the `--kind` flag to the end of the `hugo new` command.
-{{% /note %}}
-
-Running this command in a new site that does not have default or custom archetypes will create the following file:
-
-{{< output file="content/posts/my-first-post.md" >}}
-+++
-date = "2017-02-01T19:20:04-07:00"
-title = "my first post"
-draft = true
-+++
-{{< /output >}}
-
-{{% note %}}
-In this example, if you do not already have a `content/posts` directory, Hugo will create both `content/posts/` and `content/posts/my-first-post.md` for you.
-{{% /note %}}
-
-The  auto-populated fields are worth examining:
-
-* `title` is generated from the new content's filename (i.e. in this case, `my-first-post` becomes `"my first post"`)
-* `date` and `title` are the variables that ship with Hugo and are therefore included in *all* content files created with the Hugo CLI. `date` is generated in [RFC 3339 format][] by way of Go's [`now()`][] function, which returns the current time.
-* The third variable, `draft = true`, is *not* inherited by your default or custom archetypes but is included in Hugo's automatically scaffolded `default.md` archetype for convenience.
-
-Three variables per content file are often not enough for effective content management of larger websites. Luckily, Hugo provides a simple mechanism for extending the number of variables through custom archetypes, as well as default archetypes to keep content creation DRY.
-
-## Lookup Order for Archetypes
-
-Similar to the [lookup order for templates][lookup] in your `layouts` directory, Hugo looks for a section- or type-specific archetype, then a default archetype, and finally an internal archetype that ships with Hugo. For example, Hugo will look for an archetype for `content/posts/my-first-post.md` in the following order:
-
-1. `archetypes/posts.md`
-2. `archetypes/default.md`
-3. `themes/<THEME>/archetypes/posts.md`
-4. `themes/<THEME>/archetypes/default.md` (Auto-generated with `hugo new site`)
-
-{{% note "Using a Theme Archetype" %}}
-If you wish to use archetypes that ship with a theme, the `theme` field must be specified in your [configuration file](/getting-started/configuration/).
-{{% /note %}}
-
-## Choose Your Archetype's Front Matter Format
-
-By default, `hugo new` content files include front matter in the TOML format regardless of the format used in `archetypes/*.md`.
-
-You can specify a different default format in your site [configuration file][] file using the `metaDataFormat` directive. Possible values are `toml`, `yaml`, and `json`.
-
-## Default Archetypes
-
-Default archetypes are convenient if your content's front matter stays consistent across multiple [content sections][sections].
-
-### Create the Default Archetype
-
-When you create a new Hugo project using `hugo new site`, you'll notice that Hugo has already scaffolded a file at `archetypes/default.md`.
-
-The following examples are from a site that's using `tags` and `categories` as [taxonomies][]. If we assume that all content files will require these two key-values, we can create a `default.md` archetype that *extends* Hugo's base archetype. In this example, we are including "golang" and "hugo" as tags and "web development" as a category.
-
-{{< code file="archetypes/default.md" >}}
-+++
-tags = ["golang", "hugo"]
-categories = ["web development"]
-+++
-{{< /code >}}
-
-{{% warning "EOL Characters in Text Editors"%}}
-If you get an `EOF error` when using `hugo new`, add a carriage return after the closing `+++` or `---` for your TOML or YAML front matter, respectively. (See the [troubleshooting article on EOF errors](/troubleshooting/eof-error/) for more information.)
-{{% /warning %}}
-
-### Use the Default Archetype
-
-With an `archetypes/default.md` in place, we can use the CLI to create a new post in the `posts` content section:
-
-{{< code file="new-post-from-default.sh" >}}
-$ hugo new posts/my-new-post.md
-{{< /code >}}
-
-Hugo then creates a new markdown file with the following front matter:
-
-{{< output file="content/posts/my-new-post.md" >}}
-+++
-categories = ["web development"]
-date = "2017-02-01T19:20:04-07:00"
-tags = ["golang", "hugo"]
-title = "my new post"
-+++
-{{< /output >}}
-
-We see that the `title` and `date` key-values have been added in addition to the `tags` and `categories` key-values from `archetypes/default.md`.
-
-{{% note "Ordering of Front Matter" %}}
-You may notice that content files created with `hugo new` do not respect the order of the key-values specified in your archetype files. This is a [known issue](https://github.com/gohugoio/hugo/issues/452).
-{{% /note %}}
-
-## Custom Archetypes
-
-Suppose your site's `posts` section requires more sophisticated front matter than what has been specified in `archetypes/default.md`. You can create a custom archetype for your posts at `archetypes/posts.md` that includes the full set of front matter to be added to the two default archetypes fields.
-
-### Create a Custom Archetype
-
-{{< code file="archetypes/posts.md">}}
-+++
-description = ""
-tags = ""
-categories = ""
-+++
-{{< /code >}}
-
-### Use a Custom Archetype
-
-With an `archetypes/posts.md` in place, you can use the Hugo CLI to create a new post with your preconfigured front matter in the `posts` content section:
-
-{{< code file="new-post-from-custom.sh" >}}
-$ hugo new posts/post-from-custom.md
-{{< /code >}}
-
-This time, Hugo recognizes our custom `archetypes/posts.md` archetype and uses it instead of `archetypes/default.md`. The generated file will now include the full list of front matter parameters, as well as the base archetype's `title` and `date`:
-
-{{< output file="content/posts/post-from-custom-archetype.md" >}}
-+++
-categories = ""
-date = 2017-02-13T17:24:43-08:00
-description = ""
-tags = ""
-title = "post from custom archetype"
-+++
-{{< /output >}}
-
-### Hugo Docs Custom Archetype
-
-As an example of archetypes in practice, the following is the `functions` archetype from the Hugo docs:
-
-{{< code file="archetypes/functions.md" >}}
-{{< readfile file="/archetypes/functions.md" >}}
-{{< /code >}}
-
-{{% note %}}
-The preceding archetype is kept up to date with every Hugo build by using Hugo's [`readFile` function](/functions/readfile/). For similar examples, see [Local File Templates](/templates/files/).
-{{% /note %}}
-
-[archetypes directory]: /getting-started/directory-structure/
-[`now()`]: http://golang.org/pkg/time/#Now
-[configuration file]: /getting-started/configuration/
-[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
-[taxonomies]: /content-management/taxonomies/
-[lookup]: /templates/lookup/
-[templates]: /templates/
@@ -1,182 +0,0 @@
---
-title : "Page Bundles"
-description : "Content organization using Page Bundles"
-date : 2018-01-24T13:09:00-05:00
-lastmod : 2018-01-28T22:26:40-05:00
-linktitle : "Page Bundles"
-keywords : ["page", "bundle", "leaf", "branch"]
-categories : ["content management"]
-draft : true
-toc : true
-menu :
-  docs:
-    identifier : "page-bundles"
-    parent : "content-management"
-    weight : 11
---
-
-Page Bundles are a way to organize the content files. It's useful for
-cases where a page or section's content needs to be split into
-multiple content pages for convenience or has associated attachments
-like documents or images.
-
-A Page Bundle can be one of two types:
-
-   Leaf Bundle
-   Branch Bundle
-
-|                 | Leaf Bundle                                            | Branch Bundle                                           |
-|-----------------|--------------------------------------------------------|---------------------------------------------------------|
-| Usage           | Collection of content and attachments for single pages | Collection of content and attachments for section pages |
-| Index file name | `index.md` [^fn:1]                                     | `_index.md` [^fn:1]                                     |
-| Layout type     | `single`                                               | `list`                                                  |
-| Nesting         | Doesn't allow nesting of more bundles under it         | Allows nesting of leaf/branch bundles under it          |
-| Example         | `content/posts/my-post/index.md`                       | `content/posts/_index.md`                               |
-
-
-## Leaf Bundles {#leaf-bundles}
-
-A _Leaf Bundle_ is a directory at any hierarchy within the `content/`
-directory, that contains at least an **`index.md`** file.
-
-{{% note %}}
-Here `md` (markdown) is used just as an example. You can use any file
-type as a content resource as long as it is a MIME type recognized by
-Hugo (`json` files will, as one example, work fine). If you want to
-get exotic, you can define your own media type.
-{{% /note %}}
-
-
-### Examples of Leaf Bundle organization {#examples-of-leaf-bundle-organization}
-
-```text
-content/
-├── about
-│   ├── index.md
-├── posts
-│   ├── my-post
-│   │   ├── content1.md
-│   │   ├── content2.md
-│   │   ├── image1.jpg
-│   │   ├── image2.png
-│   │   └── index.md
-│   └── my-another-post
-│       └── index.md
-│
-└── another-section
-    ├── ..
-    └── not-a-leaf-bundle
-        ├── ..
-        └── another-leaf-bundle
-            └── index.md
-```
-
-In the above example `content/` directory, there are four leaf
-bundles:
-
-about
-: This leaf bundle is at the root level (directly under
-    `content` directory) and has only the `index.md`.
-
-my-post
-: This leaf bundle has the `index.md`, two other content
-    Markdown files and two image files.
-
-my-another-post
-: This leaf bundle has only the `index.md`.
-
-another-leaf-bundle
-: This leaf bundle is nested under couple of
-    directories. This bundle also has only the `index.md`.
-
-{{% note %}}
-The hierarchy depth at which a leaf bundle is created does not matter,
-as long as it is not inside another **leaf** bundle.
-{{% /note %}}
-
-
-### Headless Bundle {#headless-bundle}
-
-A headless bundle is a bundle that is configured to not get published
-anywhere:
-
-   It will have no `Permalink` and no rendered HTML in `public/`.
-   It will not be part of `.Site.RegularPages`, etc.
-
-But you can get it by `.Site.GetPage`. Here is an example:
-
-```html
-{{ $headless := .Site.GetPage "page" "some-headless-bundle" }}
-{{ $reusablePages := $headless.Resources.Match "author*" }}
-<h2>Authors</h2>
-{{ range $reusablePages }}
-    <h3>{{ .Title }}</h3>
-    {{ .Content }}
-{{ end }}
-```
-
-A leaf bundle can be made headless by adding below in the Front Matter
-(in the `index.md`):
-
-```toml
-headless = true
-```
-
-{{% note %}}
-Only leaf bundles can be made headless.
-{{% /note %}}
-
-There are many use cases of such headless page bundles:
-
-   Shared media galleries
-   Reusable page content "snippets"
-
-
-## Branch Bundles {#branch-bundles}
-
-A _Branch Bundle_ is any directory at any hierarchy within the
-`content/` directory, that contains at least an **`_index.md`** file.
-
-This `_index.md` can also be directly under the `content/` directory.
-
-{{% note %}}
-Here `md` (markdown) is used just as an example. You can use any file
-type as a content resource as long as it is a MIME type recognized by
-Hugo (`json` files will, as one example, work fine). If you want to
-get exotic, you can define your own media type.
-{{% /note %}}
-
-
-### Examples of Branch Bundle organization {#examples-of-branch-bundle-organization}
-
-```text
-content/
-├── branch-bundle-1
-│   ├── branch-content1.md
-│   ├── branch-content2.md
-│   ├── image1.jpg
-│   ├── image2.png
-│   └── _index.md
-└── branch-bundle-2
-    ├── _index.md
-    └── a-leaf-bundle
-        └── index.md
-```
-
-In the above example `content/` directory, there are two branch
-bundles (and a leaf bundle):
-
-`branch-bundle-1`
-: This branch bundle has the `_index.md`, two
-    other content Markdown files and two image files.
-
-`branch-bundle-2`
-: This branch bundle has the `_index.md` and a
-    nested leaf bundle.
-
-{{% note %}}
-The hierarchy depth at which a branch bundle is created does not
-matter.
-{{% /note %}}
-
-[^fn:1]: The `.md` extension is just an example. The extension can be `.html`, `.json` or any of any valid MIME type.
@@ -0,0 +1,49 @@
+---
+title: "The world’s fastest framework for building websites"
+date: 2017-03-02T12:00:00-05:00
+features:
+  - heading: Blistering Speed
+    image_path: /images/icon-fast.svg
+    tagline: What's modern about waiting for your site to build?
+    copy: Hugo is the fastest tool of its kind. At <1 ms per page, the average site builds in less than a second.
+
+  - heading: Robust Content Management
+    image_path: /images/icon-content-management.svg
+    tagline: Flexibility rules. Hugo is a content strategist's dream.
+    copy: Hugo supports unlimited content types, taxonomies, menus, dynamic API-driven content, and more, all without plugins.
+
+  - heading: Shortcodes
+    image_path: /images/icon-shortcodes.svg
+    tagline: Hugo's shortcodes are Markdown's hidden superpower.
+    copy: We love the beautiful simplicity of markdown’s syntax, but there are times when we want more flexibility. Hugo shortcodes allow for both beauty and flexibility.
+
+  - heading: Built-in Templates
+    image_path: /images/icon-built-in-templates.svg
+    tagline: Hugo has common patterns to get your work done quickly.
+    copy: Hugo ships with pre-made templates to make quick work of SEO, commenting, analytics and other functions. One line of code, and you're done.
+
+  - heading: Multilingual and i18n
+    image_path: /images/icon-multilingual2.svg
+    tagline: Polyglot baked in.
+    copy: Hugo provides full i18n support for multi-language sites with the same straightforward development experience Hugo users love in single-language sites.
+
+  - heading: Custom Outputs
+    image_path: /images/icon-custom-outputs.svg
+    tagline: HTML not enough?
+    copy: Hugo allows you to output your content in multiple formats, including JSON or AMP, and makes it easy to create your own.
+sections:
+  - heading: "100s of Themes"
+    cta: Check out the Hugo themes.
+    link: http://themes.gohugo.io/
+    color_classes: bg-accent-color white
+    image: /images/homepage-screenshot-hugo-themes.jpg
+    copy: "Hugo provides a robust theming system that is easy to implement but capable of producing even the most complicated websites."
+  - heading: "Capable Templating"
+    cta: Get Started.
+    link: templates/
+    color_classes: bg-primary-color-light black
+    image: /images/home-page-templating-example.png
+    copy: "Hugo's Go-based templating provides just the right amount of logic to build anything from the simple to complex. If you prefer Jade/Pug-like syntax, you can also use Amber, Ace, or any combination of the three."
+---
+
+Hugo is one of the most popular open-source static site generators. With its amazing speed and flexibility, Hugo makes building websites fun again.
@@ -29,14 +29,14 @@ This has many benefits. The most noticeable is performance. HTTP servers are *ve

 * ["An Introduction to Static Site Generators", David Walsh][]
 * ["Hugo vs. Wordpress page load speed comparison: Hugo leaves WordPress in its dust", GettingThingsTech][hugovwordpress]
-* ["Static Site Generators", O-Reilly][]
+* ["Static Site Generators", O'Reilly][]
 * [StaticGen: Top Open-Source Static Site Generators (GitHub Stars)][]
 * ["Top 10 Static Website Generators", Netlify blog][]
 * ["The Resurgence of Static", dotCMS][dotcms]


 ["An Introduction to Static Site Generators", David Walsh]: https://davidwalsh.name/introduction-static-site-generators
-["Static Site Generators", O-Reilly]: /documents/oreilly-static-site-generators.pdf
+["Static Site Generators", O'Reilly]: http://www.oreilly.com/web-platform/free/files/static-site-generators.pdf
 ["Top 10 Static Website Generators", Netlify blog]: https://www.netlify.com/blog/2016/05/02/top-ten-static-website-generators/
 [hugovwordpress]: https://gettingthingstech.com/hugo-vs.-wordpress-page-load-speed-comparison-hugo-leaves-wordpress-in-its-dust/
 [StaticGen: Top Open-Source Static Site Generators (GitHub Stars)]: https://www.staticgen.com/
@@ -0,0 +1,119 @@
+
+
+---
+title: Hugo and the  General Data Protection Regulation (GDPR)
+linktitle: Hugo and GDPR
+description: About how to configure your Hugo site to meet the new regulations.
+date: 2018-05-25
+layout: single
+keywords: ["GDPR", "Privacy", "Data Protection"]
+menu:
+  docs:
+    parent: "about"
+    weight: 5
+weight: 5
+sections_weight: 5
+draft: false
+aliases: [/privacy/,/gdpr/]
+toc: true
+---
+
+
+ General Data Protection Regulation ([GDPR](https://en.wikipedia.org/wiki/General_Data_Protection_Regulation)) is a regulation in EU law on data protection and privacy for all individuals within the European Union and the European Economic Area. It became enforceable on 25 May 2018.
+
+ **Hugo is a static site generator. By using Hugo you are already standing on very solid ground. Static HTML files on disk are much easier to reason about compared to server and database driven web sites.**
+
+ But even static websites can integrate with external services, so from version `0.41`, Hugo provides a `Privacy Config` that covers the relevant built-in templates.
+
+ Note that:
+
+ * These settings have their defaults setting set to _off_, i.e. how it worked before Hugo `0.41`. You must do your own evaluation of your site and apply the appropriate settings.
+ * We will continue this work and improve this further in future Hugo versions.
+
+## All Privacy Settings
+
+Below are all privacy settings and their default value. These settings need to be put in your site config (e.g. `config.toml`).
+
+ {{< code-toggle file="config">}}
+[privacy]
+[privacy.disqus]
+disable = false
+[privacy.googleAnalytics]
+disable = false
+respectDoNotTrack = false
+anonymizeIP = false
+useSessionStorage = false
+[privacy.instagram]
+disable = false
+simple = false
+[privacy.speakerDeck]
+disable = false
+[privacy.twitter]
+disable = false
+enableDNT = false
+[privacy.vimeo]
+disable = false
+[privacy.youtube]
+disable = false
+privacyEnhanced = false
+{{< /code-toggle >}}
+
+
+## Disable All Services
+
+An example Privacy Config that disables all the relevant services in Hugo. With this configuration, the other settings will not matter.
+
+ {{< code-toggle file="config">}}
+[privacy]
+[privacy.disqus]
+disable = true
+[privacy.googleAnalytics]
+disable = true
+[privacy.instagram]
+disable = true
+[privacy.speakerDeck]
+disable = true
+[privacy.twitter]
+disable = true
+[privacy.vimeo]
+disable = true
+[privacy.youtube]
+disable = true
+{{< /code-toggle >}}
+
+## The Privacy Settings Explained
+
+### GoogleAnalytics
+
+anonymizeIP
+: Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
+
+respectDoNotTrack
+: Enabling this will make the GA templates respect the "Do Not Track" HTTP header.
+
+useSessionStorage
+: Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
+
+### Instagram
+
+simple
+: If simple mode is enabled, a static and no-JS version of the Instagram image card will be built. Note that this only supports image cards and the image itself will be fetched from Instagram's servers.
+
+**Note:** If you use the _simple mode_ for Instagram and a site styled with Bootstrap 4, you may want to disable the inlines styles provided by Hugo:
+
+ {{< code-toggle file="config">}}
+[services]
+[services.instagram]
+disableInlineCSS = true
+{{< /code-toggle >}}
+
+### Twitter
+
+enableDNT
+: Enabling this for the twitter/tweet shortcode, the tweet and its embedded page on your site are not used for purposes that include personalized suggestions and personalized ads.
+
+### YouTube
+
+privacyEnhanced
+: When you turn on privacy-enhanced mode, YouTube won’t store information about visitors on your website unless the user plays the embedded video.
+
@@ -61,7 +61,7 @@ Note that changes to any resource inside the `content` folder will trigger a rel

 #### List all Resources

-```html
+```go-html-template
 {{ range .Resources }}
 <li><a href="{{ .RelPermalink }}">{{ .ResourceType | title }}</a></li>
 {{ end }}
@@ -73,7 +73,7 @@ For an absolute URL, use `.Permalink`.

 #### List All Resources by Type

-```html
+```go-html-template
 {{ with .Resources.ByType "image" }}
 {{ end }}

@@ -83,7 +83,7 @@ Type here is `page` for pages, else the main type in the MIME type, so `image`,

 #### Get a Specific Resource

-```html
+```go-html-template
 {{ $logo := .Resources.GetByPrefix "logo" }}
 {{ with $logo }}
 {{ end }}
@@ -91,7 +91,7 @@ Type here is `page` for pages, else the main type in the MIME type, so `image`,

 #### Include Page Resource Content

-```html
+```go-html-template
 {{ with .Resources.ByType "page" }}
 {{ range . }}
 <h3>{{ .Title }}</h3>
@@ -146,7 +146,7 @@ This is the shortcode used in the examples above:

 And it is used like this:

-```html
+```go-html-template
 {{</* imgproc sunset Resize "300x" */>}}
 ```

@@ -7,7 +7,7 @@ publishdate: 2017-02-01
 lastmod: 2017-02-01
 layout: single
 menu:
-  main:
+  docs:
    parent: "about"
    weight: 10
 weight: 10
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo"
 slug: hugo
 url: /commands/hugo/
@@ -77,4 +77,4 @@ hugo [flags]
 * [hugo server](/commands/hugo_server/)	 - A high performance webserver
 * [hugo version](/commands/hugo_version/)	 - Print the version number of Hugo

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo benchmark"
 slug: hugo_benchmark
 url: /commands/hugo_benchmark/
@@ -70,4 +70,4 @@ hugo benchmark [flags]

 * [hugo](/commands/hugo/)	 - hugo builds your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo check"
 slug: hugo_check
 url: /commands/hugo_check/
@@ -35,4 +35,4 @@ Contains some verification checks
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo check ulimit](/commands/hugo_check_ulimit/)	 - Check system ulimit settings

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo check ulimit"
 slug: hugo_check_ulimit
 url: /commands/hugo_check_ulimit/
@@ -39,4 +39,4 @@ hugo check ulimit [flags]

 * [hugo check](/commands/hugo_check/)	 - Contains some verification checks

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo config"
 slug: hugo_config
 url: /commands/hugo_config/
@@ -19,7 +19,8 @@ hugo config [flags]
 ### Options

 ```
-  -h, --help   help for config
+  -h, --help            help for config
+  -s, --source string   filesystem path to read files relative from
 ```

 ### Options inherited from parent commands
@@ -38,4 +39,4 @@ hugo config [flags]

 * [hugo](/commands/hugo/)	 - hugo builds your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert"
 slug: hugo_convert
 url: /commands/hugo_convert/
@@ -42,4 +42,4 @@ See convert's subcommands toJSON, toTOML and toYAML for more information.
 * [hugo convert toTOML](/commands/hugo_convert_totoml/)	 - Convert front matter to TOML
 * [hugo convert toYAML](/commands/hugo_convert_toyaml/)	 - Convert front matter to YAML

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert toJSON"
 slug: hugo_convert_toJSON
 url: /commands/hugo_convert_tojson/
@@ -42,4 +42,4 @@ hugo convert toJSON [flags]

 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert toTOML"
 slug: hugo_convert_toTOML
 url: /commands/hugo_convert_totoml/
@@ -42,4 +42,4 @@ hugo convert toTOML [flags]

 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo convert toYAML"
 slug: hugo_convert_toYAML
 url: /commands/hugo_convert_toyaml/
@@ -42,4 +42,4 @@ hugo convert toYAML [flags]

 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo env"
 slug: hugo_env
 url: /commands/hugo_env/
@@ -38,4 +38,4 @@ hugo env [flags]

 * [hugo](/commands/hugo/)	 - hugo builds your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen"
 slug: hugo_gen
 url: /commands/hugo_gen/
@@ -38,4 +38,4 @@ A collection of several useful generators.
 * [hugo gen doc](/commands/hugo_gen_doc/)	 - Generate Markdown documentation for the Hugo CLI.
 * [hugo gen man](/commands/hugo_gen_man/)	 - Generate man pages for the Hugo CLI

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen autocomplete"
 slug: hugo_gen_autocomplete
 url: /commands/hugo_gen_autocomplete/
@@ -56,4 +56,4 @@ hugo gen autocomplete [flags]

 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen chromastyles"
 slug: hugo_gen_chromastyles
 url: /commands/hugo_gen_chromastyles/
@@ -43,4 +43,4 @@ hugo gen chromastyles [flags]

 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen doc"
 slug: hugo_gen_doc
 url: /commands/hugo_gen_doc/
@@ -45,4 +45,4 @@ hugo gen doc [flags]

 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo gen man"
 slug: hugo_gen_man
 url: /commands/hugo_gen_man/
@@ -41,4 +41,4 @@ hugo gen man [flags]

 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo import"
 slug: hugo_import
 url: /commands/hugo_import/
@@ -37,4 +37,4 @@ Import requires a subcommand, e.g. `hugo import jekyll jekyll_root_path target_p
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo import jekyll](/commands/hugo_import_jekyll/)	 - hugo import from Jekyll

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo import jekyll"
 slug: hugo_import_jekyll
 url: /commands/hugo_import_jekyll/
@@ -41,4 +41,4 @@ hugo import jekyll [flags]

 * [hugo import](/commands/hugo_import/)	 - Import your site from others.

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list"
 slug: hugo_list
 url: /commands/hugo_list/
@@ -40,4 +40,4 @@ List requires a subcommand, e.g. `hugo list drafts`.
 * [hugo list expired](/commands/hugo_list_expired/)	 - List all posts already expired
 * [hugo list future](/commands/hugo_list_future/)	 - List all posts dated in the future

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list drafts"
 slug: hugo_list_drafts
 url: /commands/hugo_list_drafts/
@@ -39,4 +39,4 @@ hugo list drafts [flags]

 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list expired"
 slug: hugo_list_expired
 url: /commands/hugo_list_expired/
@@ -40,4 +40,4 @@ hugo list expired [flags]

 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo list future"
 slug: hugo_list_future
 url: /commands/hugo_list_future/
@@ -40,4 +40,4 @@ hugo list future [flags]

 * [hugo list](/commands/hugo_list/)	 - Listing out various types of content

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo new"
 slug: hugo_new
 url: /commands/hugo_new/
@@ -48,4 +48,4 @@ hugo new [path] [flags]
 * [hugo new site](/commands/hugo_new_site/)	 - Create a new site (skeleton)
 * [hugo new theme](/commands/hugo_new_theme/)	 - Create a new theme

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo new site"
 slug: hugo_new_site
 url: /commands/hugo_new_site/
@@ -43,4 +43,4 @@ hugo new site [path] [flags]

 * [hugo new](/commands/hugo_new/)	 - Create new content for your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo new theme"
 slug: hugo_new_theme
 url: /commands/hugo_new_theme/
@@ -42,4 +42,4 @@ hugo new theme [name] [flags]

 * [hugo new](/commands/hugo_new/)	 - Create new content for your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo server"
 slug: hugo_server
 url: /commands/hugo_server/
@@ -88,4 +88,4 @@ hugo server [flags]

 * [hugo](/commands/hugo/)	 - hugo builds your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-01-31T11:40:21+01:00
+date: 2018-04-16
 title: "hugo version"
 slug: hugo_version
 url: /commands/hugo_version/
@@ -38,4 +38,4 @@ hugo version [flags]

 * [hugo](/commands/hugo/)	 - hugo builds your site

-###### Auto generated by spf13/cobra on 31-Jan-2018
+###### Auto generated by spf13/cobra on 16-Apr-2018
@@ -17,4 +17,4 @@ aliases: [/content/,/content/organization]
 toc: false
 ---

-A static site generator needs to extend beyond front matter and a couple templates to be both scalable and *manageable*. Hugo was designed with not only developers in mind, but also content managers and authors.
+A static site generator needs to extend beyond front matter and a couple of templates to be both scalable and *manageable*. Hugo was designed with not only developers in mind, but also content managers and authors.
@@ -0,0 +1,75 @@
+---
+title: Archetypes
+linktitle: Archetypes
+description: Archetypes are templates used when creating new content.
+date: 2017-02-01
+publishdate: 2017-02-01
+keywords: [archetypes,generators,metadata,front matter]
+categories: ["content management"]
+menu:
+  docs:
+    parent: "content-management"
+    weight: 70
+  quicklinks:
+weight: 70	#rem
+draft: false
+aliases: [/content/archetypes/]
+toc: true
+---
+
+## What are Archetypes?
+
+**Archetypes** are content template files in the [archetypes directory][] of your project that contain preconfigured [front matter][] and possibly also a content disposition for your website's [content types][]. These will be used when you run `hugo new`.
+
+
+The `hugo new` uses the `content-section` to find the most suitable archetype template in your project. If your project does not contain any archetype files, it will also look in the theme.
+
+{{< code file="archetype-example.sh" >}}
+hugo new posts/my-first-post.md
+{{< /code >}}
+
+The above will create a new content file in `content/posts/my-first-post.md` using the first archetype file found of these:
+
+1. `archetypes/posts.md`
+2. `archetypes/default.md`
+3. `themes/my-theme/archetypes/posts.md`
+4. `themes/my-theme/archetypes/default.md`
+
+The last two list items is only applicable if you use a theme and it uses the `my-theme` theme name as an example.
+
+## Create a New Archetype Template
+
+A fictional example for the section `newsletter` and the archetype file `archetypes/newsletter.md`. Create a new file in `archetypes/newsletter.md` and open it in a text editor.
+
+{{< code file="archetypes/newsletter.md" >}}
+---
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
+draft: true
+---
+
+**Insert Lead paragraph here.**
+
+## New Cool Posts
+
+{{ range first 10 ( where .Site.RegularPages "Type" "cool" ) }}
+* {{ .Title }}
+{{ end }}
+{{< /code >}}
+
+When you create a new newsletter with:
+
+```bash
+hugo new newsletter/the-latest-cool.stuff.md
+```
+
+It will create a new newsletter type of content file based on the archetype template.
+
+**Note:** the site will only be built if the `.Site` is in use in the archetype file, and this can be time consuming for big sites.
+
+The above _newsletter type archetype_ illustrates the possibilities: The full Hugo `.Site` and all of Hugo&#39;s template funcs can be used in the archetype file.
+
+
+[archetypes directory]: /getting-started/directory-structure/
+[content types]: /content-management/types/
+[front matter]: /content-management/front-matter/
@@ -27,15 +27,11 @@ Hugo comes with all the code you need to load Disqus into your templates. Before

 ### Configure Disqus

-Disqus comments require you set a single value in your [site's configuration file][configuration]. The following show the configuration variable in a `config.toml` and `config.yml`, respectively:
+Disqus comments require you set a single value in your [site's configuration file][configuration] like so:

-```
+{{< code-toggle copy="false" >}}
 disqusShortname = "yourdiscussshortname"
-```
-
-```
-disqusShortname: "yourdiscussshortname"
-```
+{{</ code-toggle >}}

 For many websites, this is enough configuration. However, you also have the option to set the following in the [front matter][] of a single content file:

@@ -52,7 +48,8 @@ See [Partial Templates][partials] to learn how to add the Disqus partial to your
 There are a few alternatives to commenting on static sites for those who do not want to use Disqus:

 * [Static Man](https://staticman.net/)
-* [txtpen](https://txtpen.com)
+* [Talkyard](https://www.talkyard.io/blog-comments) (Open source, & serverless hosting)
+* [txtpen](https://txtpen.github.io/hn/)
 * [IntenseDebate](http://intensedebate.com/)
 * [Graph Comment][]
 * [Muut](http://muut.com/)
@@ -61,13 +61,6 @@ To be sure to get the correct reference in this case, use the full path:
 {{</* relref "events/my-birthday.md" */>}} => /events/my-birthday/
 {{< /code >}}

-{{< todo >}}Remove this warning when https://github.com/gohugoio/hugo/issues/3703 is released.{{< /todo >}}
-
-A relative document name must *not* begin with a slash (`/`).
-```
-{{</* relref "/events/my-birthday.md" */>}} => ""
-```
-
 ### With Multiple Output Formats

 If the page exists in multiple [output formats][], `ref` or `relref` can be used with a output format name:
@@ -116,8 +109,22 @@ Ensuring heading uniqueness across the site is accomplished with a unique identi
 /content-management/cross-references/#hugo-heading-anchors:77cd9ea530577debf4ce0f28c8dca242
 ```

+### Manually Specifying Anchors
+
+For Markdown content files, if the `headerIds` [Blackfriday extension][bfext] is
+enabled (which it is by default), user can manually specify the anchor for any
+heading.
+
+Few examples:
+
+```
+## Alpha 101 {#alpha}
+
+## Version 1.0 {#version-1-dot-0}
+```

 [built-in Hugo shortcodes]: /content-management/shortcodes/#using-the-built-in-shortcodes
 [lists]: /templates/lists/
 [output formats]: /templates/output-formats/
 [shortcode]: /content-management/shortcodes/
+[bfext]: /content-management/formats/#blackfriday-extensions
--- a/Show More
+++ b/Show More