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

[ci skip]
releaser: Bump versions for release of 0.47
2026-08-31 18:52:38 +00:00 · 2018-08-17 09:15:18 +00:00 · 2018-08-17 09:15:18 +00:00 · 2018-08-17 11:03:28 +02:00 · 2018-08-17 10:38:31 +02:00 · 2018-08-17 08:19:47 +00:00
486 changed files with 13991 additions and 5593 deletions
@@ -1,7 +1,7 @@
 defaults: &defaults
  working_directory: /go/src/github.com/gohugoio
  docker:
-      - image: bepsays/ci-goreleaser:0.34.2-11
+      - image: bepsays/ci-goreleaser:0.79.0-2
    
 version: 2
 jobs:
@@ -0,0 +1,8 @@
+*.md
+*.log
+*.txt
+.git
+.github
+.circleci
+docs
+examples
@@ -0,0 +1,8 @@
+# Text files have auto line endings
+* text=auto
+
+# Go source files always have LF line endings
+*.go text eol=lf
+
+# SVG files should not be modified
+*.svg -text
@@ -15,5 +15,7 @@ vendor/*/
 *.debug
 coverage*.out

+dock.sh
+
 GoBuilds
 dist
@@ -1,11 +1,13 @@
 language: go
 sudo: false
 dist: trusty
+env:
+  HUGO_BUILD_TAGS="extended"
 git:
  depth: false
 go:
-  - 1.9.5
-  - "1.10.1"
+  - 1.9.7
+  - "1.10.3"
  - tip
 os:
  - linux
@@ -18,8 +20,9 @@ install:
  - go get github.com/magefile/mage
  - mage -v vendor
 script:
-  - mage -v hugoRace
+  - mage -v test
  - mage -v check
+  - mage -v hugo
  - ./hugo -s docs/
  - ./hugo --renderToMemory -s docs/
 before_install:
@@ -192,6 +192,12 @@ To list all available commands along with descriptions:
 mage -l
 ```

+**Note:** From Hugo 0.43 we have added a build tag, `extended` that adds **SCSS support**. This needs a C compiler installed to build. You can enable this when building by:
+
+```bash
+HUGO_BUILD_TAGS=extended mage install
+````
+
 ### Updating the Hugo Sources

 If you want to stay in sync with the Hugo repository, you can easily pull down
@@ -1,23 +1,27 @@
-FROM golang:1.9.0-alpine3.6 AS build
+# GitHub:       https://github.com/gohugoio
+# Twitter:      https://twitter.com/gohugoio
+# Website:      https://gohugo.io/

-RUN apk add --no-cache --virtual git musl-dev
-RUN go get github.com/golang/dep/cmd/dep
+FROM golang:1.10.3-alpine3.7 AS build
+
+ENV CGO_ENABLED=0
+ENV GOOS=linux

 WORKDIR /go/src/github.com/gohugoio/hugo
-ADD . /go/src/github.com/gohugoio/hugo/
-RUN dep ensure
-RUN go install -ldflags '-s -w'
+RUN apk add --no-cache \
+    git \
+    musl-dev && \
+  go get github.com/golang/dep/cmd/dep
+COPY . /go/src/github.com/gohugoio/hugo/
+RUN dep ensure -vendor-only && \
+  go install -ldflags '-s -w'

-FROM alpine:3.6
-RUN \
-  adduser -h /site -s /sbin/nologin -u 1000 -D hugo && \
-  apk add --no-cache \
-    dumb-init
-COPY --from=build /go/bin/hugo /bin/hugo
-USER    hugo
+# ---
+
+FROM scratch
+COPY --from=build /go/bin/hugo /hugo
 WORKDIR /site
 VOLUME  /site
 EXPOSE  1313
-
-ENTRYPOINT ["/usr/bin/dumb-init", "--", "hugo"]
+ENTRYPOINT [ "/hugo" ]
 CMD [ "--help" ]
@@ -3,24 +3,46 @@

 [[projects]]
  branch = "master"
+  digest = "1:f6a10073544cc0bd1eb9fd9f8d9bf4644971910a0f8393d51b5b4d286e554849"
+  name = "github.com/BurntSushi/locker"
+  packages = ["."]
+  pruneopts = ""
+  revision = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
+
+[[projects]]
+  branch = "master"
+  digest = "1:fe421c7102aa7290dc831e2772971a2c74155013b68c2769c0da44383f7aa6be"
  name = "github.com/BurntSushi/toml"
  packages = ["."]
+  pruneopts = ""
  revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"

 [[projects]]
+  digest = "1:8e47871087b94913898333f37af26732faaab30cdb41571136cf7aec9921dae7"
  name = "github.com/PuerkitoBio/purell"
  packages = ["."]
+  pruneopts = ""
  revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
  version = "v1.1.0"

 [[projects]]
  branch = "master"
+  digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c"
  name = "github.com/PuerkitoBio/urlesc"
  packages = ["."]
+  pruneopts = ""
  revision = "de5bf2ad457846296e2031421a34e2568e304e35"

 [[projects]]
  branch = "master"
+  digest = "1:587118db822769eb67defc43c6d9363f4d6f615106fa6f510c668b78063e21bc"
+  name = "github.com/alecthomas/assert"
+  packages = ["."]
+  pruneopts = ""
+  revision = "405dbfeb8e38effee6e723317226e93fff912d06"
+
+[[projects]]
+  digest = "1:055c07e4af5ddccc93ad394e04e85ca76c3cb2e067b18b97ac3ffd49cb04a339"
  name = "github.com/alecthomas/chroma"
  packages = [
    ".",
@@ -53,83 +75,136 @@
    "lexers/w",
    "lexers/x",
    "lexers/y",
-    "styles"
+    "styles",
  ]
-  revision = "6b1131c0069211a7729895c26f8c51765a4baf25"
+  pruneopts = ""
+  revision = "5d7fef2ae60b501bbf28d476c3f273b8017d8261"
+  version = "v0.5.0"

 [[projects]]
+  branch = "master"
+  digest = "1:ba0a389824c3c3d378f5f334370524b7d04b5a5ccedce7dd2da05ae8d3868609"
+  name = "github.com/alecthomas/colour"
+  packages = ["."]
+  pruneopts = ""
+  revision = "60882d9e27213e8552dcff6328914fe4c2b44bc9"
+
+[[projects]]
+  branch = "master"
+  digest = "1:1b12d492967d13ec7360082e12a1eb6e1be195baa5c83f23b371a490a40decda"
+  name = "github.com/alecthomas/repr"
+  packages = ["."]
+  pruneopts = ""
+  revision = "ead21651dde39fea129e6e4a612c675693d0f4ff"
+
+[[projects]]
+  digest = "1:05d0e4ae6b8d0273647964fe26762e3345d5d196aaeb858838e75336703451ba"
  name = "github.com/bep/debounce"
  packages = ["."]
+  pruneopts = ""
  revision = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"
  version = "v1.1.0"

 [[projects]]
-  branch = "master"
+  digest = "1:da56e55c4bf803e26ff8ece34f7b54727fdf053fbb2b50f92043e41ab2ef1e78"
  name = "github.com/bep/gitmap"
  packages = ["."]
-  revision = "012701e8669671499fc43e9792335a1dcbfe2afb"
+  pruneopts = ""
+  revision = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960"
+  version = "v1.0.0"

 [[projects]]
+  digest = "1:50f18fd801868be859fa7fdddfc3a56ec41b562176f84db31b2b78cedb530326"
+  name = "github.com/bep/go-tocss"
+  packages = [
+    "scss",
+    "scss/libsass",
+    "tocss",
+  ]
+  pruneopts = ""
+  revision = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"
+  version = "v0.5.0"
+
+[[projects]]
+  digest = "1:d814bbb551582d8f27085f6a9d941024ef20c3bee0132da6f9841c062cf338de"
  name = "github.com/chaseadamsio/goorgeous"
  packages = ["."]
+  pruneopts = ""
  revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f"
  version = "v1.1.0"

 [[projects]]
+  digest = "1:5b5e11b56adf922e0efc8856f86420a3467607975ff8ecb54bb0bac318c1548f"
  name = "github.com/cpuguy83/go-md2man"
  packages = ["md2man"]
-  revision = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"
-  version = "v1.0.8"
+  pruneopts = ""
+  revision = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"
+  version = "v1.0.6"

 [[projects]]
  branch = "master"
+  digest = "1:8f6c36ee73ded871996ada894e20dfecde56557d08b4d1849d5489076679971f"
  name = "github.com/danwakefield/fnmatch"
  packages = ["."]
+  pruneopts = ""
  revision = "cbb64ac3d964b81592e64f957ad53df015803288"

 [[projects]]
+  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
  name = "github.com/davecgh/go-spew"
  packages = ["spew"]
+  pruneopts = ""
  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
  version = "v1.1.0"

 [[projects]]
+  digest = "1:b218908776d4939d4ecfd8ae87918d17b01b491e219d09bedf24b4aeb0f0b7e9"
  name = "github.com/disintegration/imaging"
  packages = ["."]
+  pruneopts = ""
  revision = "dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
  version = "v1.2.4"

 [[projects]]
+  digest = "1:556b75e96f02319585d253d262c4ce5dfdf4b28be474f1e0877c5f4f9b10cf9e"
  name = "github.com/dlclark/regexp2"
  packages = [
    ".",
-    "syntax"
+    "syntax",
  ]
+  pruneopts = ""
  revision = "487489b64fb796de2e55f4e8a4ad1e145f80e957"
  version = "v1.1.6"

 [[projects]]
  branch = "master"
+  digest = "1:f0cd82a11574a06f08e22bf3c2ba0c259f4c84f73d95d011d7024b78febe17e9"
  name = "github.com/eknkc/amber"
  packages = [
    ".",
-    "parser"
+    "parser",
  ]
+  pruneopts = ""
  revision = "cdade1c073850f4ffc70a829e31235ea6892853b"

 [[projects]]
+  digest = "1:e5c807ac3b60699ccec9263f6eec756251b17e78582eb149f90ac345d9e58327"
  name = "github.com/fortytw2/leaktest"
  packages = ["."]
+  pruneopts = ""
  revision = "a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
  version = "v1.2.0"

 [[projects]]
+  digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd"
  name = "github.com/fsnotify/fsnotify"
  packages = ["."]
+  pruneopts = ""
  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
  version = "v1.4.7"

 [[projects]]
+  digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c"
  name = "github.com/gobwas/glob"
  packages = [
    ".",
@@ -139,31 +214,39 @@
    "syntax/ast",
    "syntax/lexer",
    "util/runes",
-    "util/strings"
+    "util/strings",
  ]
+  pruneopts = ""
  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
  version = "v0.2.3"

 [[projects]]
+  digest = "1:64d212c703a2b94054be0ce470303286b177ad260b2f89a307e3d1bb6c073ef6"
  name = "github.com/gorilla/websocket"
  packages = ["."]
+  pruneopts = ""
  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
  version = "v1.2.0"

 [[projects]]
  branch = "master"
+  digest = "1:4423ee95d6ee30bb22f680445c58889bb5b91e1b955405bf34374a053784a8a2"
  name = "github.com/hashicorp/go-immutable-radix"
  packages = ["."]
+  pruneopts = ""
  revision = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"

 [[projects]]
  branch = "master"
+  digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94"
  name = "github.com/hashicorp/golang-lru"
  packages = ["simplelru"]
+  pruneopts = ""
  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"

 [[projects]]
  branch = "master"
+  digest = "1:9b7c5846d70f425d7fe279595e32a20994c6075e87be03b5c367ed07280877c5"
  name = "github.com/hashicorp/hcl"
  packages = [
    ".",
@@ -175,195 +258,317 @@
    "hcl/token",
    "json/parser",
    "json/scanner",
-    "json/token"
+    "json/token",
  ]
+  pruneopts = ""
  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"

 [[projects]]
+  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
  name = "github.com/inconshreveable/mousetrap"
  packages = ["."]
+  pruneopts = ""
  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
  version = "v1.0"

 [[projects]]
+  digest = "1:dddb389214f3ebf7c1f885d0e1f9498a17608f4a9b623c827cafb3c5f91f9ac4"
  name = "github.com/jdkato/prose"
  packages = [
    "internal/util",
-    "transform"
+    "transform",
  ]
+  pruneopts = ""
  revision = "20d3663d4bc9dd10d75abcde9d92e04b4861c674"
  version = "v1.1.0"

 [[projects]]
+  digest = "1:41ea0e53c25c1c7f51b3ff6589bcf586a0fb548caceeb6a5dd60b91ed19ea801"
  name = "github.com/kyokomi/emoji"
  packages = ["."]
-  revision = "7e06b236c489543f53868841f188a294e3383eab"
-  version = "v1.5"
+  pruneopts = ""
+  revision = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"
+  version = "v1.5.1"

 [[projects]]
+  digest = "1:901c7dc16a166e57e940dee1350511ba5cb5e61eeca858edb76d21b65f9b7cff"
  name = "github.com/magefile/mage"
  packages = [
    "mg",
-    "sh"
+    "sh",
  ]
+  pruneopts = ""
  revision = "2f974307b636f59c13b88704cf350a4772fef271"
  version = "v1.0.2"

 [[projects]]
+  digest = "1:961dc3b1d11f969370533390fdf203813162980c858e1dabe827b60940c909a5"
  name = "github.com/magiconair/properties"
  packages = ["."]
-  revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
-  version = "v1.7.6"
+  pruneopts = ""
+  revision = "c2353362d570a7bfa228149c62842019201cfb71"
+  version = "v1.8.0"

 [[projects]]
+  digest = "1:fd46423a2fe75d52968baf37471b99e6f05cea3ac29c756128ead26af34e1c35"
  name = "github.com/markbates/inflect"
  packages = ["."]
+  pruneopts = ""
  revision = "a12c3aec81a6a938bf584a4bac567afed9256586"

 [[projects]]
+  digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c"
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  pruneopts = ""
+  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+  version = "v0.0.3"
+
+[[projects]]
+  digest = "1:81e673df85e765593a863f67cba4544cf40e8919590f04d67664940786c2b61a"
  name = "github.com/mattn/go-runewidth"
  packages = ["."]
+  pruneopts = ""
  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
  version = "v0.0.2"

 [[projects]]
+  digest = "1:bb98cbb82602cde3cafa5e2ee9b8fb1de3d57d490c09f0988d7edf2b30afec2d"
  name = "github.com/miekg/mmark"
  packages = ["."]
+  pruneopts = ""
  revision = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
  version = "v1.3.6"

 [[projects]]
  branch = "master"
-  name = "github.com/mitchellh/mapstructure"
+  digest = "1:0de0f377aeccd41384e883c59c6f184c9db01c96db33a2724a1eaadd60f92629"
+  name = "github.com/mitchellh/hashstructure"
  packages = ["."]
-  revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
+  pruneopts = ""
+  revision = "2bca23e0e452137f789efbc8610126fd8b94f73b"

 [[projects]]
  branch = "master"
+  digest = "1:f43ed2c836208c14f45158fd01577c985688a4d11cf9fd475a939819fef3b321"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  pruneopts = ""
+  revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac"
+
+[[projects]]
+  branch = "master"
+  digest = "1:a21a59f6adec3256fd6f5bd0377cb95ff8128d3ab716fae9944e71b017c68b49"
  name = "github.com/muesli/smartcrop"
  packages = [
    ".",
-    "options"
+    "options",
  ]
+  pruneopts = ""
  revision = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"

 [[projects]]
+  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
  name = "github.com/nicksnyder/go-i18n"
  packages = [
    "i18n/bundle",
    "i18n/language",
-    "i18n/translation"
+    "i18n/translation",
  ]
+  pruneopts = ""
  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
  version = "v1.10.0"

 [[projects]]
  branch = "master"
+  digest = "1:816e800c7b5689e114c0dc6acf494553d1e7a52575764c5d6de67fb32bd8bbb2"
  name = "github.com/olekukonko/tablewriter"
  packages = ["."]
-  revision = "b8a9be070da40449e501c3c4730a889e42d87a9e"
+  pruneopts = ""
+  revision = "d4647c9c7a84d847478d890b816b7d8b62b0b279"

 [[projects]]
+  digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457"
  name = "github.com/pelletier/go-toml"
  packages = ["."]
-  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
-  version = "v1.1.0"
+  pruneopts = ""
+  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
+  version = "v1.2.0"

 [[projects]]
+  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
  name = "github.com/pmezard/go-difflib"
  packages = ["difflib"]
+  pruneopts = ""
  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
  version = "v1.0.0"

 [[projects]]
+  branch = "master"
+  digest = "1:3f5b207bd1428aeb3d4bdb65f787236883a5d2d2dd154af011a078b0732d4de9"
  name = "github.com/russross/blackfriday"
  packages = ["."]
-  revision = "55d61fa8aa702f59229e6cff85793c22e580eaf5"
-  version = "v1.5.1"
+  pruneopts = ""
+  revision = "46c73eb196baff5bb07288f245b223bd1a30fba6"

 [[projects]]
+  digest = "1:354988e51f0b9061a2d6b94e84ede12be35bc09ee3be23f61c9d18246b0c2c24"
  name = "github.com/sanity-io/litter"
  packages = ["."]
+  pruneopts = ""
  revision = "ae543b7ba8fd6af63e4976198f146e1348ae53c1"
  version = "v1.1.0"

+[[projects]]
+  digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8"
+  name = "github.com/sergi/go-diff"
+  packages = ["diffmatchpatch"]
+  pruneopts = ""
+  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
+  version = "v1.0.0"
+
 [[projects]]
  branch = "master"
+  digest = "1:606fa779c7a80ab6a9ec5836cd12759f86cd6e1d82d5d60cf7ec5133e78c6cf8"
  name = "github.com/shurcooL/sanitized_anchor_name"
  packages = ["."]
+  pruneopts = ""
  revision = "86672fcb3f950f35f2e675df2240550f2a50762f"

 [[projects]]
+  digest = "1:7ba2551c9a8de293bc575dbe2c0d862c52252d26f267f784547f059f512471c8"
  name = "github.com/spf13/afero"
  packages = [
    ".",
-    "mem"
+    "mem",
  ]
-  revision = "63644898a8da0bc22138abf860edaf5277b6102e"
-  version = "v1.1.0"
+  pruneopts = ""
+  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
+  version = "v1.1.1"

 [[projects]]
+  digest = "1:d0b38ba6da419a6d4380700218eeec8623841d44a856bb57369c172fbf692ab4"
  name = "github.com/spf13/cast"
  packages = ["."]
+  pruneopts = ""
  revision = "8965335b8c7107321228e3e3702cab9832751bac"
  version = "v1.2.0"

 [[projects]]
+  digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6"
  name = "github.com/spf13/cobra"
  packages = [
    ".",
-    "doc"
+    "doc",
  ]
-  revision = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"
-  version = "v0.0.2"
+  pruneopts = ""
+  revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
+  version = "v0.0.3"

 [[projects]]
  branch = "master"
+  digest = "1:7c00f445c89f468abd5ab86546ba1fa11bac66e63325ade8ca05aa7220791fc7"
  name = "github.com/spf13/fsync"
  packages = ["."]
+  pruneopts = ""
  revision = "12a01e648f05a938100a26858d2d59a120307a18"

 [[projects]]
  branch = "master"
+  digest = "1:104517520aab91164020ab6524a5d6b7cafc641b2e42ac6236f6ac1deac4f66a"
  name = "github.com/spf13/jwalterweatherman"
  packages = ["."]
+  pruneopts = ""
  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"

 [[projects]]
  branch = "master"
+  digest = "1:5082c0d57a199dabc0868010784039249af0932fad2990b51ad9404c9a6b6e5d"
  name = "github.com/spf13/nitro"
  packages = ["."]
+  pruneopts = ""
  revision = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"

 [[projects]]
+  digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d"
  name = "github.com/spf13/pflag"
  packages = ["."]
-  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-  version = "v1.0.0"
+  pruneopts = ""
+  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
+  version = "v1.0.1"

 [[projects]]
+  digest = "1:a3018c5a423d6cfacf5c6e736ad07637494728fb446390e3f34cacae9e80a529"
  name = "github.com/spf13/viper"
  packages = ["."]
-  revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
-  version = "v1.0.2"
+  pruneopts = ""
+  revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"
+  version = "v1.1.0"

 [[projects]]
+  digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
  name = "github.com/stretchr/testify"
  packages = [
    "assert",
-    "require"
+    "require",
  ]
-  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
-  version = "v1.2.1"
+  pruneopts = ""
+  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+  version = "v1.2.2"

 [[projects]]
+  digest = "1:0308279931f894a1ba11e7d354d346c96ead9c7539a4fff1fce030845ec6c780"
+  name = "github.com/tdewolff/minify"
+  packages = [
+    ".",
+    "css",
+    "html",
+    "js",
+    "json",
+    "svg",
+    "xml",
+  ]
+  pruneopts = ""
+  revision = "8d72a4127ae33b755e95bffede9b92e396267ce2"
+  version = "v2.3.5"
+
+[[projects]]
+  digest = "1:6e64aa755995f3185ee55306ada462999775b8faae39aec142b3fd54248dd5ee"
+  name = "github.com/tdewolff/parse"
+  packages = [
+    ".",
+    "buffer",
+    "css",
+    "html",
+    "js",
+    "json",
+    "strconv",
+    "svg",
+    "xml",
+  ]
+  pruneopts = ""
+  revision = "d739d6fccb0971177e06352fea02d3552625efb1"
+  version = "v2.3.3"
+
+[[projects]]
+  branch = "master"
+  digest = "1:be92e3574c94090ee4659d49a4ab156301fd62c2bdad831ca52ad7ce3ee91e2e"
+  name = "github.com/wellington/go-libsass"
+  packages = ["libs"]
+  pruneopts = ""
+  revision = "615eaa47ef794d037c1906a0eb7bf85375a5decf"
+
+[[projects]]
+  digest = "1:bf83d7fb8e87f39806ce3550657a8a31bbeb96a35eb105bd98e7362559fba27f"
  name = "github.com/yosssi/ace"
  packages = ["."]
+  pruneopts = ""
  revision = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
  version = "v0.0.5"

 [[projects]]
  branch = "master"
+  digest = "1:0960a9f676f505c50b45b2db87151ef60991c6f4764083b02acfabf09bcdc5cc"
  name = "golang.org/x/image"
  packages = [
    "bmp",
@@ -374,33 +579,41 @@
    "tiff/lzw",
    "vp8",
    "vp8l",
-    "webp"
+    "webp",
  ]
-  revision = "f315e440302883054d0c2bd85486878cb4f8572c"
+  pruneopts = ""
+  revision = "c73c2afc3b812cdd6385de5a50616511c4a3d458"

 [[projects]]
  branch = "master"
+  digest = "1:b970d5e8b11b4c8927a06298566eb8daf66a009702688b4142cc2a961e374e91"
  name = "golang.org/x/net"
  packages = [
    "context",
-    "idna"
+    "idna",
  ]
-  revision = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"
+  pruneopts = ""
+  revision = "f4c29de78a2a91c00474a2e689954305c350adf9"

 [[projects]]
  branch = "master"
+  digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1"
  name = "golang.org/x/sync"
  packages = ["errgroup"]
+  pruneopts = ""
  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"

 [[projects]]
  branch = "master"
+  digest = "1:41e7b97b66e984325fed9d6cd43ca9e2efdd3c711980916ad444667d633f13f1"
  name = "golang.org/x/sys"
  packages = ["unix"]
-  revision = "3b87a42e500a6dc65dae1a55d0b641295971163e"
+  pruneopts = ""
+  revision = "2be389f392cd91df245b41638f818a1c041f0c08"

 [[projects]]
  branch = "master"
+  digest = "1:243aef9eafbe63eb8ca74de9497597832721201e92a9203078173d90a494456c"
  name = "golang.org/x/text"
  packages = [
    "collate",
@@ -419,19 +632,84 @@
    "unicode/cldr",
    "unicode/norm",
    "unicode/rangetable",
-    "width"
+    "width",
  ]
-  revision = "2cb43934f0eece38629746959acc633cba083fe4"
+  pruneopts = ""
+  revision = "cb6730876b985e110843c1842a7a63a63677cf08"

 [[projects]]
+  branch = "v2"
+  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
  name = "gopkg.in/yaml.v2"
  packages = ["."]
+  pruneopts = ""
  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-  version = "v2.2.1"

 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  inputs-digest = "b9b38ece73fd6c0d0b20eb2ff85dfcc15a82841223b4403566712fd7b7ae7d59"
+  input-imports = [
+    "github.com/BurntSushi/locker",
+    "github.com/BurntSushi/toml",
+    "github.com/PuerkitoBio/purell",
+    "github.com/alecthomas/assert",
+    "github.com/alecthomas/chroma",
+    "github.com/alecthomas/chroma/formatters",
+    "github.com/alecthomas/chroma/formatters/html",
+    "github.com/alecthomas/chroma/lexers",
+    "github.com/alecthomas/chroma/styles",
+    "github.com/bep/debounce",
+    "github.com/bep/gitmap",
+    "github.com/bep/go-tocss/scss",
+    "github.com/bep/go-tocss/scss/libsass",
+    "github.com/bep/go-tocss/tocss",
+    "github.com/chaseadamsio/goorgeous",
+    "github.com/disintegration/imaging",
+    "github.com/eknkc/amber",
+    "github.com/fortytw2/leaktest",
+    "github.com/fsnotify/fsnotify",
+    "github.com/gobwas/glob",
+    "github.com/gorilla/websocket",
+    "github.com/hashicorp/go-immutable-radix",
+    "github.com/jdkato/prose/transform",
+    "github.com/kyokomi/emoji",
+    "github.com/magefile/mage/mg",
+    "github.com/magefile/mage/sh",
+    "github.com/markbates/inflect",
+    "github.com/miekg/mmark",
+    "github.com/mitchellh/hashstructure",
+    "github.com/mitchellh/mapstructure",
+    "github.com/muesli/smartcrop",
+    "github.com/nicksnyder/go-i18n/i18n/bundle",
+    "github.com/nicksnyder/go-i18n/i18n/language",
+    "github.com/olekukonko/tablewriter",
+    "github.com/russross/blackfriday",
+    "github.com/sanity-io/litter",
+    "github.com/spf13/afero",
+    "github.com/spf13/cast",
+    "github.com/spf13/cobra",
+    "github.com/spf13/cobra/doc",
+    "github.com/spf13/fsync",
+    "github.com/spf13/jwalterweatherman",
+    "github.com/spf13/nitro",
+    "github.com/spf13/pflag",
+    "github.com/spf13/viper",
+    "github.com/stretchr/testify/assert",
+    "github.com/stretchr/testify/require",
+    "github.com/tdewolff/minify",
+    "github.com/tdewolff/minify/css",
+    "github.com/tdewolff/minify/html",
+    "github.com/tdewolff/minify/js",
+    "github.com/tdewolff/minify/json",
+    "github.com/tdewolff/minify/svg",
+    "github.com/tdewolff/minify/xml",
+    "github.com/yosssi/ace",
+    "golang.org/x/image/webp",
+    "golang.org/x/net/context",
+    "golang.org/x/sync/errgroup",
+    "golang.org/x/text/transform",
+    "golang.org/x/text/unicode/norm",
+    "gopkg.in/yaml.v2",
+  ]
  solver-name = "gps-cdcl"
  solver-version = 1
@@ -10,12 +10,20 @@

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

 [[constraint]]
-  branch = "master"
  name = "github.com/bep/gitmap"
+  version = "^1.0.0"
  
+[[constraint]]
+  version = "v0.5.0"
+  name = "github.com/bep/go-tocss"
+
+[[override]]
+   branch = "master"
+   name = "github.com/wellington/go-libsass"
+ 
 [[constraint]]
 name = "github.com/chaseadamsio/goorgeous"
 version = "^1.1.0"
@@ -149,3 +157,15 @@
 [[constraint]]
  name = "github.com/bep/debounce"
  version = "^1.1.0"
+
+[[constraint]]
+  name = "github.com/tdewolff/minify"
+  version = "^2.3.5"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/BurntSushi/locker"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mitchellh/hashstructure"
@@ -8,7 +8,7 @@ A Fast and Flexible Static Site Generator built with love by [bep](https://githu
 [Documentation](https://gohugo.io/overview/introduction/) |
 [Installation Guide](https://gohugo.io/overview/installing/) |
 [Contribution Guide](CONTRIBUTING.md) |
-[Twitter](http://twitter.com/gohugoio)
+[Twitter](https://twitter.com/gohugoio)

 [![GoDoc](https://godoc.org/github.com/gohugoio/hugo?status.svg)](https://godoc.org/github.com/gohugoio/hugo)
 [![Linux and macOS Build Status](https://api.travis-ci.org/gohugoio/hugo.svg?branch=master&label=Linux+and+macOS+build "Linux and macOS Build Status")](https://travis-ci.org/gohugoio/hugo)
@@ -56,7 +56,7 @@ Use the [installation instructions in the Hugo documentation](https://gohugo.io/

 #### Prerequisite Tools

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

 #### Vendored Dependencies
@@ -1,13 +1,19 @@
+image: Visual Studio 2015
+
 init:
-  - set PATH=%PATH%;C:\MinGW\bin;%GOPATH%\bin
+  - set PATH=%PATH%;C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%GOPATH%\bin
  - go version
  - go env

+environment:
+  GOPATH: C:\GOPATH\
+  HUGO_BUILD_TAGS: extended
+
 # clones and cd's to path
 clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo

 install:
-  - gem install asciidoctor
+#  - gem install asciidoctor
  - pip install docutils
  - go get github.com/magefile/mage

@@ -0,0 +1,2 @@
+# Temp script used to test new builds.
+ docker run --rm --mount type=bind,source="$(pwd)",target=/go/src/github.com/gohugoio/hugo -w /go/src/github.com/gohugoio/hugo  -i -t bepsays/ci-goreleaser:latest /bin/bash
@@ -24,34 +24,52 @@ type Partition struct {
 	Load func() (map[string]interface{}, error)
 }

-type lazyPartition struct {
+// Lazy represents a lazily loaded cache.
+type Lazy struct {
 	initSync sync.Once
+	initErr  error
 	cache    map[string]interface{}
 	load     func() (map[string]interface{}, error)
 }

-func (l *lazyPartition) init() error {
-	var err error
+// NewLazy creates a lazy cache with the given load func.
+func NewLazy(load func() (map[string]interface{}, error)) *Lazy {
+	return &Lazy{load: load}
+}
+
+func (l *Lazy) init() error {
 	l.initSync.Do(func() {
-		var c map[string]interface{}
-		c, err = l.load()
+		c, err := l.load()
 		l.cache = c
+		l.initErr = err
+
 	})

-	return err
+	return l.initErr
+}
+
+// Get initializes the cache if not already initialized, then looks up the
+// given key.
+func (l *Lazy) Get(key string) (interface{}, bool, error) {
+	l.init()
+	if l.initErr != nil {
+		return nil, false, l.initErr
+	}
+	v, found := l.cache[key]
+	return v, found, nil
 }

 // PartitionedLazyCache is a lazily loaded cache paritioned by a supplied string key.
 type PartitionedLazyCache struct {
-	partitions map[string]*lazyPartition
+	partitions map[string]*Lazy
 }

 // NewPartitionedLazyCache creates a new NewPartitionedLazyCache with the supplied
 // partitions.
 func NewPartitionedLazyCache(partitions ...Partition) *PartitionedLazyCache {
-	lazyPartitions := make(map[string]*lazyPartition, len(partitions))
+	lazyPartitions := make(map[string]*Lazy, len(partitions))
 	for _, partition := range partitions {
-		lazyPartitions[partition.Key] = &lazyPartition{load: partition.Load}
+		lazyPartitions[partition.Key] = NewLazy(partition.Load)
 	}
 	cache := &PartitionedLazyCache{partitions: lazyPartitions}

@@ -67,11 +85,12 @@ func (c *PartitionedLazyCache) Get(partition, key string) (interface{}, error) {
 		return nil, nil
 	}

-	if err := p.init(); err != nil {
+	v, found, err := p.Get(key)
+	if err != nil {
 		return nil, err
 	}

-	if v, found := p.cache[key]; found {
+	if found {
 		return v, nil
 	}

@@ -56,7 +56,7 @@ func (c *benchmarkCmd) benchmark(cmd *cobra.Command, args []string) error {
 		return nil
 	}

-	comm, err := initializeConfig(false, &c.hugoBuilderCommon, c, cfgInit)
+	comm, err := initializeConfig(true, false, &c.hugoBuilderCommon, c, cfgInit)
 	if err != nil {
 		return err
 	}
@@ -16,6 +16,8 @@ package commands
 import (
 	"os"
 	"path/filepath"
+	"regexp"
+	"strings"
 	"sync"
 	"time"

@@ -23,8 +25,6 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/gohugoio/hugo/utils"
-
 	"github.com/spf13/afero"

 	"github.com/gohugoio/hugo/hugolib"
@@ -34,38 +34,44 @@ import (
 	"github.com/gohugoio/hugo/deps"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
-	src "github.com/gohugoio/hugo/source"
+	"github.com/gohugoio/hugo/langs"
 )

-type commandeer struct {
+type commandeerHugoState struct {
 	*deps.DepsCfg
+	hugo     *hugolib.HugoSites
+	fsCreate sync.Once
+}

-	hugo *hugolib.HugoSites
+type commandeer struct {
+	*commandeerHugoState
+
+	// Currently only set when in "fast render mode". But it seems to
+	// be fast enough that we could maybe just add it for all server modes.
+	changeDetector *fileChangeDetector
+
+	// We need to reuse this on server rebuilds.
+	destinationFs afero.Fs

 	h    *hugoBuilderCommon
 	ftch flagsToConfigHandler

-	pathSpec    *helpers.PathSpec
 	visitedURLs *types.EvictingStringQueue

-	staticDirsConfig []*src.Dirs
-
-	// We watch these for changes.
-	configFiles []string
-
 	doWithCommandeer func(c *commandeer) error

-	// We can do this only once.
-	fsCreate sync.Once
+	// We watch these for changes.
+	configFiles []string

 	// Used in cases where we get flooded with events in server mode.
 	debounce func(f func())

 	serverPorts         []int
 	languagesConfigured bool
-	languages           helpers.Languages
+	languages           langs.Languages

 	configured bool
+	paused     bool
 }

 func (c *commandeer) Set(key string, value interface{}) {
@@ -75,31 +81,14 @@ func (c *commandeer) Set(key string, value interface{}) {
 	c.Cfg.Set(key, value)
 }

-// PathSpec lazily creates a new PathSpec, as all the paths must
-// be configured before it is created.
-func (c *commandeer) PathSpec() *helpers.PathSpec {
-	c.configured = true
-	return c.pathSpec
-}
-
 func (c *commandeer) initFs(fs *hugofs.Fs) error {
+	c.destinationFs = fs.Destination
 	c.DepsCfg.Fs = fs
-	ps, err := helpers.NewPathSpec(fs, c.Cfg)
-	if err != nil {
-		return err
-	}
-	c.pathSpec = ps
-
-	dirsConfig, err := c.createStaticDirsConfig()
-	if err != nil {
-		return err
-	}
-	c.staticDirsConfig = dirsConfig

 	return nil
 }

-func newCommandeer(running bool, h *hugoBuilderCommon, f flagsToConfigHandler, doWithCommandeer func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {
+func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f flagsToConfigHandler, doWithCommandeer func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {

 	var rebuildDebouncer func(f func())
 	if running {
@@ -110,17 +99,80 @@ func newCommandeer(running bool, h *hugoBuilderCommon, f flagsToConfigHandler, d
 	}

 	c := &commandeer{
-		h:                h,
-		ftch:             f,
-		doWithCommandeer: doWithCommandeer,
-		visitedURLs:      types.NewEvictingStringQueue(10),
-		debounce:         rebuildDebouncer,
+		h:                   h,
+		ftch:                f,
+		commandeerHugoState: &commandeerHugoState{},
+		doWithCommandeer:    doWithCommandeer,
+		visitedURLs:         types.NewEvictingStringQueue(10),
+		debounce:            rebuildDebouncer,
 	}

-	return c, c.loadConfig(running)
+	return c, c.loadConfig(mustHaveConfigFile, running)
 }

-func (c *commandeer) loadConfig(running bool) error {
+type fileChangeDetector struct {
+	sync.Mutex
+	current map[string]string
+	prev    map[string]string
+
+	irrelevantRe *regexp.Regexp
+}
+
+func (f *fileChangeDetector) OnFileClose(name, md5sum string) {
+	f.Lock()
+	defer f.Unlock()
+	f.current[name] = md5sum
+}
+
+func (f *fileChangeDetector) changed() []string {
+	if f == nil {
+		return nil
+	}
+	f.Lock()
+	defer f.Unlock()
+	var c []string
+	for k, v := range f.current {
+		vv, found := f.prev[k]
+		if !found || v != vv {
+			c = append(c, k)
+		}
+	}
+
+	return f.filterIrrelevant(c)
+}
+
+func (f *fileChangeDetector) filterIrrelevant(in []string) []string {
+	var filtered []string
+	for _, v := range in {
+		if !f.irrelevantRe.MatchString(v) {
+			filtered = append(filtered, v)
+		}
+	}
+	return filtered
+}
+
+func (f *fileChangeDetector) PrepareNew() {
+	if f == nil {
+		return
+	}
+
+	f.Lock()
+	defer f.Unlock()
+
+	if f.current == nil {
+		f.current = make(map[string]string)
+		f.prev = make(map[string]string)
+		return
+	}
+
+	f.prev = make(map[string]string)
+	for k, v := range f.current {
+		f.prev[k] = v
+	}
+	f.current = make(map[string]string)
+}
+
+func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {

 	if c.DepsCfg == nil {
 		c.DepsCfg = &deps.DepsCfg{}
@@ -168,12 +220,18 @@ func (c *commandeer) loadConfig(running bool) error {
 		doWithConfig)

 	if err != nil {
-		return err
+		if mustHaveConfigFile {
+			return err
+		}
+		if err != hugolib.ErrNoConfigFile {
+			return err
+		}
+
 	}

 	c.configFiles = configFiles

-	if l, ok := c.Cfg.Get("languagesSorted").(helpers.Languages); ok {
+	if l, ok := c.Cfg.Get("languagesSorted").(langs.Languages); ok {
 		c.languagesConfigured = true
 		c.languages = l
 	}
@@ -203,12 +261,41 @@ func (c *commandeer) loadConfig(running bool) error {
 	c.fsCreate.Do(func() {
 		fs := hugofs.NewFrom(sourceFs, config)

-		// Hugo writes the output to memory instead of the disk.
-		if createMemFs {
+		if c.destinationFs != nil {
+			// Need to reuse the destination on server rebuilds.
+			fs.Destination = c.destinationFs
+		} else if createMemFs {
+			// Hugo writes the output to memory instead of the disk.
 			fs.Destination = new(afero.MemMapFs)
 		}

+		doLiveReload := !c.h.buildWatch && !config.GetBool("disableLiveReload")
+		fastRenderMode := doLiveReload && !config.GetBool("disableFastRender")
+
+		if fastRenderMode {
+			// For now, fast render mode only. It should, however, be fast enough
+			// for the full variant, too.
+			changeDetector := &fileChangeDetector{
+				// We use this detector to decide to do a Hot reload of a single path or not.
+				// We need to filter out source maps and possibly some other to be able
+				// to make that decision.
+				irrelevantRe: regexp.MustCompile(`\.map$`),
+			}
+			changeDetector.PrepareNew()
+			fs.Destination = hugofs.NewHashingFs(fs.Destination, changeDetector)
+			c.changeDetector = changeDetector
+		}
+
 		err = c.initFs(fs)
+		if err != nil {
+			return
+		}
+
+		var h *hugolib.HugoSites
+
+		h, err = hugolib.NewHugoSites(*c.DepsCfg)
+		c.hugo = h
+
 	})

 	if err != nil {
@@ -221,7 +308,7 @@ func (c *commandeer) loadConfig(running bool) error {
 			cacheDir = cacheDir + helpers.FilePathSeparator
 		}
 		isDir, err := helpers.DirExists(cacheDir, sourceFs)
-		utils.CheckErr(cfg.Logger, err)
+		checkErr(cfg.Logger, err)
 		if !isDir {
 			mkdir(cacheDir)
 		}
@@ -232,18 +319,19 @@ func (c *commandeer) loadConfig(running bool) error {

 	cfg.Logger.INFO.Println("Using config file:", config.ConfigFileUsed())

-	themeDir := c.PathSpec().GetThemeDir()
+	themeDir := c.hugo.PathSpec.GetFirstThemeDir()
 	if themeDir != "" {
 		if _, err := sourceFs.Stat(themeDir); os.IsNotExist(err) {
 			return newSystemError("Unable to find theme Directory:", themeDir)
 		}
 	}

-	themeVersionMismatch, minVersion := c.isThemeVsHugoVersionMismatch(sourceFs)
+	dir, 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)
+		name := filepath.Base(dir)
+		cfg.Logger.ERROR.Printf("%s theme does not support Hugo version %s. Minimum version required is %s\n",
+			strings.ToUpper(name), helpers.CurrentHugoVersion.ReleaseVersion(), minVersion)
 	}

 	return nil
@@ -14,9 +14,12 @@
 package commands

 import (
+	"os"
+
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"

 	"github.com/spf13/nitro"
 )
@@ -148,7 +151,7 @@ Complete documentation is available at http://gohugo.io/.`,
 				return nil
 			}

-			c, err := initializeConfig(cc.buildWatch, &cc.hugoBuilderCommon, cc, cfgInit)
+			c, err := initializeConfig(true, cc.buildWatch, &cc.hugoBuilderCommon, cc, cfgInit)
 			if err != nil {
 				return err
 			}
@@ -174,6 +177,7 @@ Complete documentation is available at http://gohugo.io/.`,
 	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)")
+	cc.cmd.Flags().Bool("minify", false, "minify any supported output format (HTML, XML etc.)")

 	// Set bash-completion
 	_ = cc.cmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{})
@@ -241,3 +245,39 @@ func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) {
 	_ = cmd.Flags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})
 	_ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
 }
+
+func checkErr(logger *jww.Notepad, err error, s ...string) {
+	if err == nil {
+		return
+	}
+	if len(s) == 0 {
+		logger.CRITICAL.Println(err)
+		return
+	}
+	for _, message := range s {
+		logger.ERROR.Println(message)
+	}
+	logger.ERROR.Println(err)
+}
+
+func stopOnErr(logger *jww.Notepad, err error, s ...string) {
+	if err == nil {
+		return
+	}
+
+	defer os.Exit(-1)
+
+	if len(s) == 0 {
+		newMessage := err.Error()
+		// Printing an empty string results in a error with
+		// no message, no bueno.
+		if newMessage != "" {
+			logger.CRITICAL.Println(newMessage)
+		}
+	}
+	for _, message := range s {
+		if message != "" {
+			logger.CRITICAL.Println(message)
+		}
+	}
+}
@@ -44,7 +44,7 @@ func newConfigCmd() *configCmd {
 }

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

 	if err != nil {
 		return err
@@ -96,7 +96,7 @@ func (cc *convertCmd) convertContents(mark rune) error {
 		return newUserError("Unsafe operation not allowed, use --unsafe or set a different output path")
 	}

-	c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, nil)
+	c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, nil)
 	if err != nil {
 		return err
 	}
@@ -23,6 +23,8 @@ import (
 	"sync/atomic"
 	"syscall"

+	"github.com/gohugoio/hugo/hugolib/filesystems"
+
 	"golang.org/x/sync/errgroup"

 	"log"
@@ -32,8 +34,6 @@ import (
 	"strings"
 	"time"

-	src "github.com/gohugoio/hugo/source"
-
 	"github.com/gohugoio/hugo/config"

 	"github.com/gohugoio/hugo/parser"
@@ -43,7 +43,6 @@ import (
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/livereload"
-	"github.com/gohugoio/hugo/utils"
 	"github.com/gohugoio/hugo/watcher"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
@@ -103,12 +102,12 @@ func Execute(args []string) Response {
 }

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

-	c, err := newCommandeer(running, h, f, doWithCommandeer)
+	c, err := newCommandeer(mustHaveConfigFile, running, h, f, doWithCommandeer)
 	if err != nil {
 		return nil, err
 	}
@@ -210,16 +209,25 @@ func initializeFlags(cmd *cobra.Command, cfg config.Provider) {
 		"verboseLog",
 	}

+	// Will set a value even if it is the default.
+	flagKeysForced := []string{
+		"minify",
+	}
+
 	for _, key := range persFlagKeys {
-		setValueFromFlag(cmd.PersistentFlags(), key, cfg, "")
+		setValueFromFlag(cmd.PersistentFlags(), key, cfg, "", false)
 	}
 	for _, key := range flagKeys {
-		setValueFromFlag(cmd.Flags(), key, cfg, "")
+		setValueFromFlag(cmd.Flags(), key, cfg, "", false)
+	}
+
+	for _, key := range flagKeysForced {
+		setValueFromFlag(cmd.Flags(), key, cfg, "", true)
 	}

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

 }

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

-func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targetKey string) {
+func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targetKey string, force bool) {
 	key = strings.TrimSpace(key)
-	if flags.Changed(key) {
+	if (force && flags.Lookup(key) != nil) || 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))
@@ -277,9 +285,13 @@ func (c *commandeer) fullBuild() error {
 	copyStaticFunc := func() error {
 		cnt, err := c.copyStatic()
 		if err != nil {
-			return fmt.Errorf("Error copying static files: %s", err)
+			if !os.IsNotExist(err) {
+				return fmt.Errorf("Error copying static files: %s", err)
+			}
+			c.Logger.WARN.Println("No Static directory found")
 		}
 		langCount = cnt
+		langCount = cnt
 		return nil
 	}
 	buildSitesFunc := func() error {
@@ -344,10 +356,10 @@ func (c *commandeer) build() error {
 		if err != nil {
 			return err
 		}
-		c.Logger.FEEDBACK.Println("Watching for changes in", c.PathSpec().AbsPathify(c.Cfg.GetString("contentDir")))
+		c.Logger.FEEDBACK.Println("Watching for changes in", c.hugo.PathSpec.AbsPathify(c.Cfg.GetString("contentDir")))
 		c.Logger.FEEDBACK.Println("Press Ctrl+C to stop")
 		watcher, err := c.newWatcher(watchDirs...)
-		utils.CheckErr(c.Logger, err)
+		checkErr(c.Logger, err)
 		defer watcher.Close()

 		var sigs = make(chan os.Signal)
@@ -380,49 +392,30 @@ func (c *commandeer) copyStatic() (map[string]uint64, error) {
 	return c.doWithPublishDirs(c.copyStaticTo)
 }

-func (c *commandeer) createStaticDirsConfig() ([]*src.Dirs, error) {
-	var dirsConfig []*src.Dirs
-
-	if !c.languages.IsMultihost() {
-		dirs, err := src.NewDirs(c.Fs, c.Cfg, c.DepsCfg.Logger)
-		if err != nil {
-			return nil, err
-		}
-		dirsConfig = append(dirsConfig, dirs)
-	} else {
-		for _, l := range c.languages {
-			dirs, err := src.NewDirs(c.Fs, l, c.DepsCfg.Logger)
-			if err != nil {
-				return nil, err
-			}
-			dirsConfig = append(dirsConfig, dirs)
-		}
-	}
-
-	return dirsConfig, nil
-
-}
-
-func (c *commandeer) doWithPublishDirs(f func(dirs *src.Dirs, publishDir string) (uint64, error)) (map[string]uint64, error) {
+func (c *commandeer) doWithPublishDirs(f func(sourceFs *filesystems.SourceFilesystem) (uint64, error)) (map[string]uint64, error) {

 	langCount := make(map[string]uint64)

-	for _, dirs := range c.staticDirsConfig {
+	staticFilesystems := c.hugo.BaseFs.SourceFilesystems.Static

-		cnt, err := f(dirs, c.pathSpec.PublishDir)
+	if len(staticFilesystems) == 0 {
+		c.Logger.WARN.Println("No static directories found to sync")
+		return langCount, nil
+	}
+
+	for lang, fs := range staticFilesystems {
+		cnt, err := f(fs)
 		if err != nil {
 			return langCount, err
 		}
-
-		if dirs.Language == nil {
+		if lang == "" {
 			// Not multihost
 			for _, l := range c.languages {
 				langCount[l.Lang] = cnt
 			}
 		} else {
-			langCount[dirs.Language.Lang] = cnt
+			langCount[lang] = cnt
 		}
-
 	}

 	return langCount, nil
@@ -443,29 +436,18 @@ func (fs *countingStatFs) Stat(name string) (os.FileInfo, error) {
 	return f, err
 }

-func (c *commandeer) copyStaticTo(dirs *src.Dirs, publishDir string) (uint64, error) {
-
+func (c *commandeer) copyStaticTo(sourceFs *filesystems.SourceFilesystem) (uint64, error) {
+	publishDir := c.hugo.PathSpec.PublishDir
 	// If root, remove the second '/'
 	if publishDir == "//" {
 		publishDir = helpers.FilePathSeparator
 	}

-	if dirs.Language != nil {
-		// Multihost setup.
-		publishDir = filepath.Join(publishDir, dirs.Language.Lang)
+	if sourceFs.PublishFolder != "" {
+		publishDir = filepath.Join(publishDir, sourceFs.PublishFolder)
 	}

-	staticSourceFs, err := dirs.CreateStaticFs()
-	if err != nil {
-		return 0, err
-	}
-
-	if staticSourceFs == nil {
-		c.Logger.WARN.Println("No static directories found to sync")
-		return 0, nil
-	}
-
-	fs := &countingStatFs{Fs: staticSourceFs}
+	fs := &countingStatFs{Fs: sourceFs.Fs}

 	syncer := fsync.NewSyncer()
 	syncer.NoTimes = c.Cfg.GetBool("noTimes")
@@ -485,6 +467,8 @@ func (c *commandeer) copyStaticTo(dirs *src.Dirs, publishDir string) (uint64, er
 	}
 	c.Logger.INFO.Println("syncing static files to", publishDir)

+	var err error
+
 	// because we are using a baseFs (to get the union right).
 	// set sync src to root
 	err = syncer.Sync(publishDir, helpers.FilePathSeparator)
@@ -498,6 +482,10 @@ func (c *commandeer) copyStaticTo(dirs *src.Dirs, publishDir string) (uint64, er
 	return numFiles, err
 }

+func (c *commandeer) firstPathSpec() *helpers.PathSpec {
+	return c.hugo.Sites[0].PathSpec
+}
+
 func (c *commandeer) timeTrack(start time.Time, name string) {
 	if c.h.quiet {
 		return
@@ -514,41 +502,10 @@ func (c *commandeer) getDirList() ([]string, error) {
 	var seen = make(map[string]bool)
 	var nested []string

-	dataDir := c.PathSpec().AbsPathify(c.Cfg.GetString("dataDir"))
-	i18nDir := c.PathSpec().AbsPathify(c.Cfg.GetString("i18nDir"))
-	staticSyncer, err := newStaticSyncer(c)
-	if err != nil {
-		return nil, err
-	}
-
-	layoutDir := c.PathSpec().GetLayoutDirPath()
-	staticDirs := staticSyncer.d.AbsStaticDirs
-
 	newWalker := func(allowSymbolicDirs bool) func(path string, fi os.FileInfo, err error) error {
 		return func(path string, fi os.FileInfo, err error) error {
 			if err != nil {
-				if path == dataDir && os.IsNotExist(err) {
-					c.Logger.WARN.Println("Skip dataDir:", err)
-					return nil
-				}
-
-				if path == i18nDir && os.IsNotExist(err) {
-					c.Logger.WARN.Println("Skip i18nDir:", err)
-					return nil
-				}
-
-				if path == layoutDir && os.IsNotExist(err) {
-					c.Logger.WARN.Println("Skip layoutDir:", err)
-					return nil
-				}
-
 				if os.IsNotExist(err) {
-					for _, staticDir := range staticDirs {
-						if path == staticDir && os.IsNotExist(err) {
-							c.Logger.WARN.Println("Skip staticDir:", err)
-						}
-					}
-					// Ignore.
 					return nil
 				}

@@ -605,23 +562,32 @@ func (c *commandeer) getDirList() ([]string, error) {
 	regularWalker := newWalker(false)

 	// SymbolicWalk will log anny ERRORs
-	_ = helpers.SymbolicWalk(c.Fs.Source, dataDir, regularWalker)
-	_ = 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)
+	// Also note that the Dirnames fetched below will contain any relevant theme
+	// directories.
+	for _, contentDir := range c.hugo.PathSpec.BaseFs.Content.Dirnames {
+		_ = helpers.SymbolicWalk(c.Fs.Source, contentDir, symLinkWalker)
 	}

-	for _, staticDir := range staticDirs {
+	for _, staticDir := range c.hugo.PathSpec.BaseFs.Data.Dirnames {
 		_ = helpers.SymbolicWalk(c.Fs.Source, staticDir, regularWalker)
 	}

-	if c.PathSpec().ThemeSet() {
-		themesDir := c.PathSpec().GetThemeDir()
-		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "layouts"), regularWalker)
-		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "i18n"), regularWalker)
-		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "data"), regularWalker)
+	for _, staticDir := range c.hugo.PathSpec.BaseFs.I18n.Dirnames {
+		_ = helpers.SymbolicWalk(c.Fs.Source, staticDir, regularWalker)
+	}
+
+	for _, staticDir := range c.hugo.PathSpec.BaseFs.Layouts.Dirnames {
+		_ = helpers.SymbolicWalk(c.Fs.Source, staticDir, regularWalker)
+	}
+
+	for _, staticFilesystem := range c.hugo.PathSpec.BaseFs.Static {
+		for _, staticDir := range staticFilesystem.Dirnames {
+			_ = helpers.SymbolicWalk(c.Fs.Source, staticDir, regularWalker)
+		}
+	}
+
+	for _, assetDir := range c.hugo.PathSpec.BaseFs.Assets.Dirnames {
+		_ = helpers.SymbolicWalk(c.Fs.Source, assetDir, regularWalker)
 	}

 	if len(nested) > 0 {
@@ -646,69 +612,31 @@ func (c *commandeer) getDirList() ([]string, error) {
 	return a, nil
 }

-func (c *commandeer) recreateAndBuildSites(watching bool) (err error) {
-	defer c.timeTrack(time.Now(), "Total")
-	if err := c.initSites(); err != nil {
-		return err
-	}
-	if !c.h.quiet {
-		c.Logger.FEEDBACK.Println("Started building sites ...")
-	}
-	return c.hugo.Build(hugolib.BuildCfg{CreateSitesFromConfig: true})
-}
-
 func (c *commandeer) resetAndBuildSites() (err error) {
-	if err = c.initSites(); err != nil {
-		return
-	}
 	if !c.h.quiet {
 		c.Logger.FEEDBACK.Println("Started building sites ...")
 	}
 	return c.hugo.Build(hugolib.BuildCfg{ResetState: true})
 }

-func (c *commandeer) initSites() error {
-	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
-	}
-
-	c.hugo = h
-
-	return nil
-}
-
 func (c *commandeer) buildSites() (err error) {
-	if err := c.initSites(); err != nil {
-		return err
-	}
 	return c.hugo.Build(hugolib.BuildCfg{})
 }

 func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
 	defer c.timeTrack(time.Now(), "Total")

-	if err := c.initSites(); err != nil {
-		return err
-	}
 	visited := c.visitedURLs.PeekAllSet()
 	doLiveReload := !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload")
 	if doLiveReload && !c.Cfg.GetBool("disableFastRender") {

 		// Make sure we always render the home pages
 		for _, l := range c.languages {
-			langPath := c.PathSpec().GetLangSubDir(l.Lang)
+			langPath := c.hugo.PathSpec.GetLangSubDir(l.Lang)
 			if langPath != "" {
 				langPath = langPath + "/"
 			}
-			home := c.pathSpec.PrependBasePath("/" + langPath)
+			home := c.hugo.PathSpec.PrependBasePath("/" + langPath)
 			visited[home] = true
 		}

@@ -717,12 +645,22 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
 }

 func (c *commandeer) fullRebuild() {
-	if err := c.loadConfig(true); err != nil {
+	c.commandeerHugoState = &commandeerHugoState{}
+	err := c.loadConfig(true, true)
+	if 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()
+		// Set the processing on pause until the state is recovered.
+		c.paused = true
+	} else {
+		c.paused = false
+	}
+
+	if !c.paused {
+		if err := c.buildSites(); err != nil {
+			jww.ERROR.Println(err)
+		} else if !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload") {
+			livereload.ForceRefresh()
+		}
 	}
 }

@@ -762,6 +700,35 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 		for {
 			select {
 			case evs := <-watcher.Events:
+				for _, ev := range evs {
+					if configSet[ev.Name] {
+						if ev.Op&fsnotify.Chmod == fsnotify.Chmod {
+							continue
+						}
+						if ev.Op&fsnotify.Remove == fsnotify.Remove {
+							for _, configFile := range c.configFiles {
+								counter := 0
+								for watcher.Add(configFile) != nil {
+									counter++
+									if counter >= 100 {
+										break
+									}
+									time.Sleep(100 * time.Millisecond)
+								}
+							}
+						}
+						// Config file changed. Need full rebuild.
+						c.fullRebuild()
+						break
+					}
+				}
+
+				if c.paused {
+					// Wait for the server to get into a consistent state before
+					// we continue with processing.
+					continue
+				}
+
 				if len(evs) > 50 {
 					// This is probably a mass edit of the content dir.
 					// Schedule a full rebuild for when it slows down.
@@ -777,15 +744,6 @@ 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 := c.hugo.ContentChanges.GetSymbolicLinkMappings(ev.Name)
 					if len(contentMapped) > 0 {
@@ -892,7 +850,7 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 						c.Logger.FEEDBACK.Printf("Syncing all static files\n")
 						_, err := c.copyStatic()
 						if err != nil {
-							utils.StopOnErr(c.Logger, err, "Error copying static files to publish dir")
+							stopOnErr(c.Logger, err, "Error copying static files to publish dir")
 						}
 					} else {
 						if err := staticSyncer.syncsStaticEvents(staticEvents); err != nil {
@@ -905,12 +863,11 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 						// 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
-						if len(staticEvents) > 0 {
-							for _, ev := range staticEvents {
-								path := staticSyncer.d.MakeStaticPathRelative(ev.Name)
-								livereload.RefreshPath(path)
-							}
-
+						if len(staticEvents) == 1 {
+							ev := staticEvents[0]
+							path := c.hugo.BaseFs.SourceFilesystems.MakeStaticPathRelative(ev.Name)
+							path = c.firstPathSpec().RelURL(helpers.ToSlashTrimLeading(path), false)
+							livereload.RefreshPath(path)
 						} else {
 							livereload.ForceRefresh()
 						}
@@ -918,34 +875,54 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 				}

 				if len(dynamicEvents) > 0 {
+					partitionedEvents := partitionDynamicEvents(
+						c.firstPathSpec().BaseFs.SourceFilesystems,
+						dynamicEvents)
+
 					doLiveReload := !c.h.buildWatch && !c.Cfg.GetBool("disableLiveReload")
-					onePageName := pickOneWriteOrCreatePath(dynamicEvents)
+					onePageName := pickOneWriteOrCreatePath(partitionedEvents.ContentEvents)

 					c.Logger.FEEDBACK.Println("\nChange detected, rebuilding site")
 					const layout = "2006-01-02 15:04:05.000 -0700"
 					c.Logger.FEEDBACK.Println(time.Now().Format(layout))

+					c.changeDetector.PrepareNew()
 					if err := c.rebuildSites(dynamicEvents); err != nil {
 						c.Logger.ERROR.Println("Failed to rebuild site:", err)
 					}

 					if doLiveReload {
-						navigate := c.Cfg.GetBool("navigateToChanged")
-						// We have fetched the same page above, but it may have
-						// changed.
-						var p *hugolib.Page
-
-						if navigate {
-							if onePageName != "" {
-								p = c.hugo.GetContentPage(onePageName)
+						if len(partitionedEvents.ContentEvents) == 0 && len(partitionedEvents.AssetEvents) > 0 {
+							changed := c.changeDetector.changed()
+							if c.changeDetector != nil && len(changed) == 0 {
+								// Nothing has changed.
+								continue
+							} else if len(changed) == 1 {
+								pathToRefresh := c.firstPathSpec().RelURL(helpers.ToSlashTrimLeading(changed[0]), false)
+								livereload.RefreshPath(pathToRefresh)
+							} else {
+								livereload.ForceRefresh()
 							}
-
 						}

-						if p != nil {
-							livereload.NavigateToPathForPort(p.RelPermalink(), p.Site.ServerPort())
-						} else {
-							livereload.ForceRefresh()
+						if len(partitionedEvents.ContentEvents) > 0 {
+
+							navigate := c.Cfg.GetBool("navigateToChanged")
+							// We have fetched the same page above, but it may have
+							// changed.
+							var p *hugolib.Page
+
+							if navigate {
+								if onePageName != "" {
+									p = c.hugo.GetContentPage(onePageName)
+								}
+							}
+
+							if p != nil {
+								livereload.NavigateToPathForPort(p.RelPermalink(), p.Site.ServerPort())
+							} else {
+								livereload.ForceRefresh()
+							}
 						}
 					}
 				}
@@ -960,6 +937,26 @@ func (c *commandeer) newWatcher(dirList ...string) (*watcher.Batcher, error) {
 	return watcher, nil
 }

+// dynamicEvents contains events that is considered dynamic, as in "not static".
+// Both of these categories will trigger a new build, but the asset events
+// does not fit into the "navigate to changed" logic.
+type dynamicEvents struct {
+	ContentEvents []fsnotify.Event
+	AssetEvents   []fsnotify.Event
+}
+
+func partitionDynamicEvents(sourceFs *filesystems.SourceFilesystems, events []fsnotify.Event) (de dynamicEvents) {
+	for _, e := range events {
+		if sourceFs.IsAsset(e.Name) {
+			de.AssetEvents = append(de.AssetEvents, e)
+		} else {
+			de.ContentEvents = append(de.ContentEvents, e)
+		}
+	}
+	return
+
+}
+
 func pickOneWriteOrCreatePath(events []fsnotify.Event) string {
 	name := ""

@@ -976,32 +973,36 @@ 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(fs afero.Fs) (mismatch bool, requiredMinVersion string) {
-	if !c.PathSpec().ThemeSet() {
+// less than any of the themes' min_version.
+func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (dir string, mismatch bool, requiredMinVersion string) {
+	if !c.hugo.PathSpec.ThemeSet() {
 		return
 	}

-	themeDir := c.PathSpec().GetThemeDir()
+	for _, absThemeDir := range c.hugo.BaseFs.AbsThemeDirs {

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

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

-	if err != nil || !exists {
-		return
-	}
+		if err != nil || !exists {
+			continue
+		}

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

-	tomlMeta, err := parser.HandleTOMLMetaData(b)
+		tomlMeta, err := parser.HandleTOMLMetaData(b)

-	if err != nil {
-		return
-	}
+		if err != nil {
+			continue
+		}
+
+		if minVersion, ok := tomlMeta["min_version"]; ok {
+			if helpers.CompareVersion(minVersion) > 0 {
+				return absThemeDir, true, fmt.Sprint(minVersion)
+			}
+		}

-	if minVersion, ok := tomlMeta["min_version"]; ok {
-		return helpers.CompareVersion(minVersion) > 0, fmt.Sprint(minVersion)
 	}

 	return
@@ -23,5 +23,5 @@ func init() {

  You need to open cmd.exe and run Hugo from there.
  
-  Visit http://gohugo.io/ for more information.`
+  Visit https://gohugo.io/ for more information.`
 }
@@ -50,7 +50,7 @@ List requires a subcommand, e.g. ` + "`hugo list drafts`.",
 					c.Set("buildDrafts", true)
 					return nil
 				}
-				c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, cfgInit)
+				c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
 				if err != nil {
 					return err
 				}
@@ -86,7 +86,7 @@ posted in the future.`,
 					c.Set("buildFuture", true)
 					return nil
 				}
-				c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, cfgInit)
+				c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
 				if err != nil {
 					return err
 				}
@@ -122,7 +122,7 @@ expired.`,
 					c.Set("buildExpired", true)
 					return nil
 				}
-				c, err := initializeConfig(false, &cc.hugoBuilderCommon, cc, cfgInit)
+				c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
 				if err != nil {
 					return err
 				}
@@ -71,7 +71,7 @@ func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {
 		return nil
 	}

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

 	if err != nil {
 		return err
@@ -104,9 +104,6 @@ func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {
 			return hugolib.NewSite(*cfg)
 		}
 		var s *hugolib.Site
-		if err := c.initSites(); err != nil {
-			return nil, err
-		}

 		if err := c.hugo.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
 			return nil, err
@@ -129,27 +126,6 @@ func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {
 	return create.NewContent(ps, siteFactory, kind, createPath)
 }

-func nextStepsText() string {
-	var nextStepsText bytes.Buffer
-
-	nextStepsText.WriteString(`Just a few more steps and you're ready to go:
-
-1. Download a theme into the same-named folder.
-   Choose a theme from https://themes.gohugo.io/, or
-   create your own with the "hugo new theme <THEMENAME>" command.
-2. Perhaps you want to add some content. You can add single files
-   with "hugo new `)
-
-	nextStepsText.WriteString(filepath.Join("<SECTIONNAME>", "<FILENAME>.<FORMAT>"))
-
-	nextStepsText.WriteString(`".
-3. Start the built-in live server via "hugo server".
-
-Visit https://gohugo.io/ for quickstart guide and full documentation.`)
-
-	return nextStepsText.String()
-}
-
 func mkdir(x ...string) {
 	p := filepath.Join(x...)

@@ -15,24 +15,18 @@ package commands

 import (
 	"bytes"
-	"path/filepath"
-
-	"github.com/spf13/viper"
-
 	"errors"
-
-	"github.com/gohugoio/hugo/create"
-
 	"fmt"
-
+	"path/filepath"
 	"strings"

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

 var _ cmder = (*newSiteCmd)(nil)
@@ -104,7 +98,7 @@ func (n *newSiteCmd) doNewSite(fs *hugofs.Fs, basepath string, force bool) error

 	createConfig(fs, basepath, n.configFormat)

-	// Create a defaul archetype file.
+	// Create a default archetype file.
 	helpers.SafeWriteToDisk(filepath.Join(archeTypePath, "default.md"),
 		strings.NewReader(create.ArchetypeTemplateTemplate), fs.Source)

@@ -146,3 +140,24 @@ func createConfig(fs *hugofs.Fs, inpath string, kind string) (err error) {

 	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
 }
+
+func nextStepsText() string {
+	var nextStepsText bytes.Buffer
+
+	nextStepsText.WriteString(`Just a few more steps and you're ready to go:
+
+1. Download a theme into the same-named folder.
+   Choose a theme from https://themes.gohugo.io/, or
+   create your own with the "hugo new theme <THEMENAME>" command.
+2. Perhaps you want to add some content. You can add single files
+   with "hugo new `)
+
+	nextStepsText.WriteString(filepath.Join("<SECTIONNAME>", "<FILENAME>.<FORMAT>"))
+
+	nextStepsText.WriteString(`".
+3. Start the built-in live server via "hugo server".
+
+Visit https://gohugo.io/ for quickstart guide and full documentation.`)
+
+	return nextStepsText.String()
+}
@@ -14,16 +14,14 @@
 package commands

 import (
-	"path/filepath"
-
 	"bytes"
-
+	"errors"
+	"path/filepath"
 	"strings"
 	"time"

-	"github.com/gohugoio/hugo/hugofs"
-
 	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 )
@@ -53,8 +51,9 @@ as you see fit.`,
 	return ccmd
 }

+// newTheme creates a new Hugo theme template
 func (n *newThemeCmd) newTheme(cmd *cobra.Command, args []string) error {
-	c, err := initializeConfig(false, &n.hugoBuilderCommon, n, nil)
+	c, err := initializeConfig(false, false, &n.hugoBuilderCommon, n, nil)

 	if err != nil {
 		return err
@@ -64,13 +63,13 @@ func (n *newThemeCmd) newTheme(cmd *cobra.Command, args []string) error {
 		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)
+	createpath := c.hugo.PathSpec.AbsPathify(filepath.Join(c.Cfg.GetString("themesDir"), args[0]))
+	jww.FEEDBACK.Println("Creating theme at", createpath)

 	cfg := c.DepsCfg

 	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
-		return newUserError(createpath, "already exists")
+		return errors.New(createpath + " already exists")
 	}

 	mkdir(createpath, "layouts", "_default")
@@ -81,6 +80,24 @@ func (n *newThemeCmd) newTheme(cmd *cobra.Command, args []string) error {
 	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "list.html")
 	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "single.html")

+	baseofDefault := []byte(`<!DOCTYPE html>
+<html>
+    {{- partial "head.html" . -}}
+    <body>
+        {{- partial "header.html" . -}}
+        <div id="content">
+        {{- block "main" . }}{{- end }}
+        </div>
+        {{- partial "footer.html" . -}}
+    </body>
+</html>
+`)
+	err = helpers.WriteToDisk(filepath.Join(createpath, "layouts", "_default", "baseof.html"), bytes.NewReader(baseofDefault), cfg.Fs.Source)
+	if err != nil {
+		return err
+	}
+
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "head.html")
 	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
 	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")

@@ -118,7 +135,7 @@ 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)
+	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE"), bytes.NewReader(by), cfg.Fs.Source)
 	if err != nil {
 		return err
 	}
@@ -135,12 +152,12 @@ func (n *newThemeCmd) createThemeMD(fs *hugofs.Fs, inpath string) (err error) {

 name = "` + strings.Title(helpers.MakeTitle(filepath.Base(inpath))) + `"
 license = "MIT"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
+licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE"
 description = ""
 homepage = "http://example.com/"
 tags = []
 features = []
-min_version = "0.38"
+min_version = "0.41"

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

-	c, err := initializeConfig(true, &s.hugoBuilderCommon, s, cfgInit)
+	c, err := initializeConfig(true, true, &s.hugoBuilderCommon, s, cfgInit)
 	if err != nil {
 		return err
 	}
@@ -288,7 +288,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
 		publishDir = filepath.Join(publishDir, root)
 	}

-	absPublishDir := f.c.PathSpec().AbsPathify(publishDir)
+	absPublishDir := f.c.hugo.PathSpec.AbsPathify(publishDir)

 	if i == 0 {
 		if f.s.renderToDisk {
@@ -298,7 +298,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
 		}
 	}

-	httpFs := afero.NewHttpFs(f.c.Fs.Destination)
+	httpFs := afero.NewHttpFs(f.c.destinationFs)
 	fs := filesOnlyFs{httpFs.Dir(absPublishDir)}

 	doLiveReload := !f.s.buildWatch && !f.c.Cfg.GetBool("disableLiveReload")
@@ -17,6 +17,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"runtime"
 	"testing"
 	"time"

@@ -27,6 +28,10 @@ import (
 )

 func TestServer(t *testing.T) {
+	if isWindowsCI() {
+		// TODO(bep) not sure why server tests have started to fail on the Windows CI server.
+		t.Skip("Skip server test on appveyor")
+	}
 	assert := require.New(t)
 	dir, err := createSimpleTestSite(t)
 	assert.NoError(err)
@@ -107,3 +112,7 @@ func TestFixURL(t *testing.T) {
 		}
 	}
 }
+
+func isWindowsCI() bool {
+	return runtime.GOOS == "windows" && os.Getenv("CI") != ""
+}
@@ -17,53 +17,43 @@ import (
 	"os"
 	"path/filepath"

+	"github.com/gohugoio/hugo/hugolib/filesystems"
+
 	"github.com/fsnotify/fsnotify"
 	"github.com/gohugoio/hugo/helpers"
-	src "github.com/gohugoio/hugo/source"
 	"github.com/spf13/fsync"
 )

 type staticSyncer struct {
 	c *commandeer
-	d *src.Dirs
 }

 func newStaticSyncer(c *commandeer) (*staticSyncer, error) {
-	dirs, err := src.NewDirs(c.Fs, c.Cfg, c.DepsCfg.Logger)
-	if err != nil {
-		return nil, err
-	}
-
-	return &staticSyncer{c: c, d: dirs}, nil
+	return &staticSyncer{c: c}, nil
 }

-func (s *staticSyncer) isStatic(path string) bool {
-	return s.d.IsStatic(path)
+func (s *staticSyncer) isStatic(filename string) bool {
+	return s.c.hugo.BaseFs.SourceFilesystems.IsStatic(filename)
 }

 func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {
 	c := s.c

-	syncFn := func(dirs *src.Dirs, publishDir string) (uint64, error) {
-		staticSourceFs, err := dirs.CreateStaticFs()
-		if err != nil {
-			return 0, err
+	syncFn := func(sourceFs *filesystems.SourceFilesystem) (uint64, error) {
+		publishDir := c.hugo.PathSpec.PublishDir
+		// If root, remove the second '/'
+		if publishDir == "//" {
+			publishDir = helpers.FilePathSeparator
 		}

-		if dirs.Language != nil {
-			// Multihost setup
-			publishDir = filepath.Join(publishDir, dirs.Language.Lang)
-		}
-
-		if staticSourceFs == nil {
-			c.Logger.WARN.Println("No static directories found to sync")
-			return 0, nil
+		if sourceFs.PublishFolder != "" {
+			publishDir = filepath.Join(publishDir, sourceFs.PublishFolder)
 		}

 		syncer := fsync.NewSyncer()
 		syncer.NoTimes = c.Cfg.GetBool("noTimes")
 		syncer.NoChmod = c.Cfg.GetBool("noChmod")
-		syncer.SrcFs = staticSourceFs
+		syncer.SrcFs = sourceFs.Fs
 		syncer.DestFs = c.Fs.Destination

 		// prevent spamming the log on changes
@@ -88,8 +78,7 @@ func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {

 			fromPath := ev.Name

-			// If we are here we already know the event took place in a static dir
-			relPath := dirs.MakeStaticPathRelative(fromPath)
+			relPath := sourceFs.MakePathRelative(fromPath)
 			if relPath == "" {
 				// Not member of this virtual host.
 				continue
@@ -105,7 +94,7 @@ func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {
 			// the source of that static file. In this case Hugo will incorrectly remove that file
 			// from the published directory.
 			if ev.Op&fsnotify.Rename == fsnotify.Rename || ev.Op&fsnotify.Remove == fsnotify.Remove {
-				if _, err := staticSourceFs.Stat(relPath); os.IsNotExist(err) {
+				if _, err := sourceFs.Fs.Stat(relPath); os.IsNotExist(err) {
 					// If file doesn't exist in any static dir, remove it
 					toRemove := filepath.Join(publishDir, relPath)

@@ -19,6 +19,7 @@ import (

 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/resource/tocss/scss"
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 )
@@ -44,13 +45,24 @@ func newVersionCmd() *versionCmd {
 }

 func printHugoVersion() {
-	if hugolib.CommitHash == "" {
-		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)
+	program := "Hugo Static Site Generator"
+
+	version := "v" + helpers.CurrentHugoVersion.String()
+	if hugolib.CommitHash != "" {
+		version += "-" + strings.ToUpper(hugolib.CommitHash)
 	}
+	if scss.Supports() {
+		version += "/extended"
+	}
+
+	osArch := runtime.GOOS + "/" + runtime.GOARCH
+
+	var buildDate string
+	if hugolib.BuildDate != "" {
+		buildDate = hugolib.BuildDate
+	} else {
+		buildDate = "unknown"
+	}
+
+	jww.FEEDBACK.Println(program, version, osArch, "BuildDate:", buildDate)
 }
@@ -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.
+
+// Package errors contains common Hugo errors and error related utilities.
+package errors
+
+import (
+	"errors"
+)
+
+// We will, at least to begin with, make some Hugo features (SCSS with libsass) optional,
+// and this error is used to signal those situations.
+var FeatureNotAvailableErr = errors.New("this feature is not available in your current Hugo version")
@@ -0,0 +1,53 @@
+// 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 hugio
+
+import (
+	"io"
+	"strings"
+)
+
+// ReadSeeker wraps io.Reader and io.Seeker.
+type ReadSeeker interface {
+	io.Reader
+	io.Seeker
+}
+
+// ReadSeekCloser is implemented by afero.File. We use this as the common type for
+// content in Resource objects, even for strings.
+type ReadSeekCloser interface {
+	ReadSeeker
+	io.Closer
+}
+
+// ReadSeekerNoOpCloser implements ReadSeekCloser by doing nothing in Close.
+type ReadSeekerNoOpCloser struct {
+	ReadSeeker
+}
+
+// Close does nothing.
+func (r ReadSeekerNoOpCloser) Close() error {
+	return nil
+}
+
+// NewReadSeekerNoOpCloser creates a new ReadSeekerNoOpCloser with the given ReadSeeker.
+func NewReadSeekerNoOpCloser(r ReadSeeker) ReadSeekerNoOpCloser {
+	return ReadSeekerNoOpCloser{r}
+}
+
+// NewReadSeekerNoOpCloserFromString uses strings.NewReader to create a new ReadSeekerNoOpCloser
+// from the given string.
+func NewReadSeekerNoOpCloserFromString(content string) ReadSeekerNoOpCloser {
+	return ReadSeekerNoOpCloser{strings.NewReader(content)}
+}
@@ -0,0 +1,43 @@
+// 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 hugio
+
+import (
+	"io"
+)
+
+type multiWriteCloser struct {
+	io.Writer
+	closers []io.WriteCloser
+}
+
+func (m multiWriteCloser) Close() error {
+	var err error
+	for _, c := range m.closers {
+		if closeErr := c.Close(); err != nil {
+			err = closeErr
+		}
+	}
+	return err
+}
+
+// NewMultiWriteCloser creates a new io.WriteCloser that duplicates its writes to all the
+// provided writers.
+func NewMultiWriteCloser(writeClosers ...io.WriteCloser) io.WriteCloser {
+	writers := make([]io.Writer, len(writeClosers))
+	for i, w := range writeClosers {
+		writers[i] = w
+	}
+	return multiWriteCloser{Writer: io.MultiWriter(writers...), closers: writeClosers}
+}
@@ -0,0 +1,37 @@
+// 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 loggers
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+// NewDebugLogger is a convenience function to create a debug logger.
+func NewDebugLogger() *jww.Notepad {
+	return jww.NewNotepad(jww.LevelDebug, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
+}
+
+// NewWarningLogger is a convenience function to create a warning logger.
+func NewWarningLogger() *jww.Notepad {
+	return jww.NewNotepad(jww.LevelWarn, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
+}
+
+// NewErrorLogger is a convenience function to create an error logger.
+func NewErrorLogger() *jww.Notepad {
+	return jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
+}
@@ -0,0 +1,44 @@
+// 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 maps
+
+import (
+	"strings"
+
+	"github.com/spf13/cast"
+)
+
+// ToLower makes all the keys in the given map lower cased and will do so
+// recursively.
+// Notes:
+// * This will modify the map given.
+// * Any nested map[interface{}]interface{} will be converted to map[string]interface{}.
+func ToLower(m map[string]interface{}) {
+	for k, v := range m {
+		switch v.(type) {
+		case map[interface{}]interface{}:
+			v = cast.ToStringMap(v)
+			ToLower(v.(map[string]interface{}))
+		case map[string]interface{}:
+			ToLower(v.(map[string]interface{}))
+		}
+
+		lKey := strings.ToLower(k)
+		if k != lKey {
+			delete(m, k)
+			m[lKey] = v
+		}
+
+	}
+}
@@ -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 maps
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestToLower(t *testing.T) {
+
+	tests := []struct {
+		input    map[string]interface{}
+		expected map[string]interface{}
+	}{
+		{
+			map[string]interface{}{
+				"abC": 32,
+			},
+			map[string]interface{}{
+				"abc": 32,
+			},
+		},
+		{
+			map[string]interface{}{
+				"abC": 32,
+				"deF": map[interface{}]interface{}{
+					23: "A value",
+					24: map[string]interface{}{
+						"AbCDe": "A value",
+						"eFgHi": "Another value",
+					},
+				},
+				"gHi": map[string]interface{}{
+					"J": 25,
+				},
+			},
+			map[string]interface{}{
+				"abc": 32,
+				"def": map[string]interface{}{
+					"23": "A value",
+					"24": map[string]interface{}{
+						"abcde": "A value",
+						"efghi": "Another value",
+					},
+				},
+				"ghi": map[string]interface{}{
+					"j": 25,
+				},
+			},
+		},
+	}
+
+	for i, test := range tests {
+		// ToLower modifies input.
+		ToLower(test.input)
+		if !reflect.DeepEqual(test.expected, test.input) {
+			t.Errorf("[%d] Expected\n%#v, got\n%#v\n", i, test.expected, test.input)
+		}
+	}
+}
@@ -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,14 +11,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package hugolib
+package maps

 import (
 	"reflect"
 	"sort"
 	"sync"

-	"github.com/gohugoio/hugo/tpl/math"
+	"github.com/gohugoio/hugo/common/math"
 )

 // Scratch is a writable context used for stateful operations in Page/Node rendering.
@@ -130,6 +130,6 @@ func (c *Scratch) GetSortedMapValues(key string) interface{} {
 	return sortedArray
 }

-func newScratch() *Scratch {
+func NewScratch() *Scratch {
 	return &Scratch{values: make(map[string]interface{})}
 }
@@ -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,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package hugolib
+package maps

 import (
 	"reflect"
@@ -23,7 +23,7 @@ import (

 func TestScratchAdd(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()
 	scratch.Add("int1", 10)
 	scratch.Add("int1", 20)
 	scratch.Add("int2", 20)
@@ -53,7 +53,7 @@ func TestScratchAdd(t *testing.T) {

 func TestScratchAddSlice(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()

 	_, err := scratch.Add("intSlice", []int{1, 2})
 	assert.Nil(t, err)
@@ -82,14 +82,14 @@ func TestScratchAddSlice(t *testing.T) {

 func TestScratchSet(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()
 	scratch.Set("key", "val")
 	assert.Equal(t, "val", scratch.Get("key"))
 }

 func TestScratchDelete(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()
 	scratch.Set("key", "val")
 	scratch.Delete("key")
 	scratch.Add("key", "Lucy Parsons")
@@ -99,7 +99,7 @@ func TestScratchDelete(t *testing.T) {
 // Issue #2005
 func TestScratchInParallel(t *testing.T) {
 	var wg sync.WaitGroup
-	scratch := newScratch()
+	scratch := NewScratch()
 	key := "counter"
 	scratch.Set(key, int64(1))
 	for i := 1; i <= 10; i++ {
@@ -133,7 +133,7 @@ func TestScratchInParallel(t *testing.T) {

 func TestScratchGet(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()
 	nothing := scratch.Get("nothing")
 	if nothing != nil {
 		t.Errorf("Should not return anything, but got %v", nothing)
@@ -142,7 +142,7 @@ func TestScratchGet(t *testing.T) {

 func TestScratchSetInMap(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()
 	scratch.SetInMap("key", "lux", "Lux")
 	scratch.SetInMap("key", "abc", "Abc")
 	scratch.SetInMap("key", "zyx", "Zyx")
@@ -153,7 +153,7 @@ func TestScratchSetInMap(t *testing.T) {

 func TestScratchGetSortedMapValues(t *testing.T) {
 	t.Parallel()
-	scratch := newScratch()
+	scratch := NewScratch()
 	nothing := scratch.GetSortedMapValues("nothing")
 	if nothing != nil {
 		t.Errorf("Should not return anything, but got %v", nothing)
@@ -161,7 +161,7 @@ func TestScratchGetSortedMapValues(t *testing.T) {
 }

 func BenchmarkScratchGet(b *testing.B) {
-	scratch := newScratch()
+	scratch := NewScratch()
 	scratch.Add("A", 1)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
@@ -0,0 +1,135 @@
+// 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 math
+
+import (
+	"errors"
+	"reflect"
+)
+
+// DoArithmetic performs arithmetic operations (+,-,*,/) using reflection to
+// determine the type of the two terms.
+func DoArithmetic(a, b interface{}, op rune) (interface{}, error) {
+	av := reflect.ValueOf(a)
+	bv := reflect.ValueOf(b)
+	var ai, bi int64
+	var af, bf float64
+	var au, bu uint64
+	switch av.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		ai = av.Int()
+		switch bv.Kind() {
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			bi = bv.Int()
+		case reflect.Float32, reflect.Float64:
+			af = float64(ai) // may overflow
+			ai = 0
+			bf = bv.Float()
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			bu = bv.Uint()
+			if ai >= 0 {
+				au = uint64(ai)
+				ai = 0
+			} else {
+				bi = int64(bu) // may overflow
+				bu = 0
+			}
+		default:
+			return nil, errors.New("Can't apply the operator to the values")
+		}
+	case reflect.Float32, reflect.Float64:
+		af = av.Float()
+		switch bv.Kind() {
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			bf = float64(bv.Int()) // may overflow
+		case reflect.Float32, reflect.Float64:
+			bf = bv.Float()
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			bf = float64(bv.Uint()) // may overflow
+		default:
+			return nil, errors.New("Can't apply the operator to the values")
+		}
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		au = av.Uint()
+		switch bv.Kind() {
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			bi = bv.Int()
+			if bi >= 0 {
+				bu = uint64(bi)
+				bi = 0
+			} else {
+				ai = int64(au) // may overflow
+				au = 0
+			}
+		case reflect.Float32, reflect.Float64:
+			af = float64(au) // may overflow
+			au = 0
+			bf = bv.Float()
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			bu = bv.Uint()
+		default:
+			return nil, errors.New("Can't apply the operator to the values")
+		}
+	case reflect.String:
+		as := av.String()
+		if bv.Kind() == reflect.String && op == '+' {
+			bs := bv.String()
+			return as + bs, nil
+		}
+		return nil, errors.New("Can't apply the operator to the values")
+	default:
+		return nil, errors.New("Can't apply the operator to the values")
+	}
+
+	switch op {
+	case '+':
+		if ai != 0 || bi != 0 {
+			return ai + bi, nil
+		} else if af != 0 || bf != 0 {
+			return af + bf, nil
+		} else if au != 0 || bu != 0 {
+			return au + bu, nil
+		}
+		return 0, nil
+	case '-':
+		if ai != 0 || bi != 0 {
+			return ai - bi, nil
+		} else if af != 0 || bf != 0 {
+			return af - bf, nil
+		} else if au != 0 || bu != 0 {
+			return au - bu, nil
+		}
+		return 0, nil
+	case '*':
+		if ai != 0 || bi != 0 {
+			return ai * bi, nil
+		} else if af != 0 || bf != 0 {
+			return af * bf, nil
+		} else if au != 0 || bu != 0 {
+			return au * bu, nil
+		}
+		return 0, nil
+	case '/':
+		if bi != 0 {
+			return ai / bi, nil
+		} else if bf != 0 {
+			return af / bf, nil
+		} else if bu != 0 {
+			return au / bu, nil
+		}
+		return nil, errors.New("Can't divide the value by 0")
+	default:
+		return nil, errors.New("There is no such an operation")
+	}
+}
@@ -0,0 +1,109 @@
+// 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 math
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/alecthomas/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDoArithmetic(t *testing.T) {
+	t.Parallel()
+
+	for i, test := range []struct {
+		a      interface{}
+		b      interface{}
+		op     rune
+		expect interface{}
+	}{
+		{3, 2, '+', int64(5)},
+		{3, 2, '-', int64(1)},
+		{3, 2, '*', int64(6)},
+		{3, 2, '/', int64(1)},
+		{3.0, 2, '+', float64(5)},
+		{3.0, 2, '-', float64(1)},
+		{3.0, 2, '*', float64(6)},
+		{3.0, 2, '/', float64(1.5)},
+		{3, 2.0, '+', float64(5)},
+		{3, 2.0, '-', float64(1)},
+		{3, 2.0, '*', float64(6)},
+		{3, 2.0, '/', float64(1.5)},
+		{3.0, 2.0, '+', float64(5)},
+		{3.0, 2.0, '-', float64(1)},
+		{3.0, 2.0, '*', float64(6)},
+		{3.0, 2.0, '/', float64(1.5)},
+		{uint(3), uint(2), '+', uint64(5)},
+		{uint(3), uint(2), '-', uint64(1)},
+		{uint(3), uint(2), '*', uint64(6)},
+		{uint(3), uint(2), '/', uint64(1)},
+		{uint(3), 2, '+', uint64(5)},
+		{uint(3), 2, '-', uint64(1)},
+		{uint(3), 2, '*', uint64(6)},
+		{uint(3), 2, '/', uint64(1)},
+		{3, uint(2), '+', uint64(5)},
+		{3, uint(2), '-', uint64(1)},
+		{3, uint(2), '*', uint64(6)},
+		{3, uint(2), '/', uint64(1)},
+		{uint(3), -2, '+', int64(1)},
+		{uint(3), -2, '-', int64(5)},
+		{uint(3), -2, '*', int64(-6)},
+		{uint(3), -2, '/', int64(-1)},
+		{-3, uint(2), '+', int64(-1)},
+		{-3, uint(2), '-', int64(-5)},
+		{-3, uint(2), '*', int64(-6)},
+		{-3, uint(2), '/', int64(-1)},
+		{uint(3), 2.0, '+', float64(5)},
+		{uint(3), 2.0, '-', float64(1)},
+		{uint(3), 2.0, '*', float64(6)},
+		{uint(3), 2.0, '/', float64(1.5)},
+		{3.0, uint(2), '+', float64(5)},
+		{3.0, uint(2), '-', float64(1)},
+		{3.0, uint(2), '*', float64(6)},
+		{3.0, uint(2), '/', float64(1.5)},
+		{0, 0, '+', 0},
+		{0, 0, '-', 0},
+		{0, 0, '*', 0},
+		{"foo", "bar", '+', "foobar"},
+		{3, 0, '/', false},
+		{3.0, 0, '/', false},
+		{3, 0.0, '/', false},
+		{uint(3), uint(0), '/', false},
+		{3, uint(0), '/', false},
+		{-3, uint(0), '/', false},
+		{uint(3), 0, '/', false},
+		{3.0, uint(0), '/', false},
+		{uint(3), 0.0, '/', false},
+		{3, "foo", '+', false},
+		{3.0, "foo", '+', false},
+		{uint(3), "foo", '+', false},
+		{"foo", 3, '+', false},
+		{"foo", "bar", '-', false},
+		{3, 2, '%', false},
+	} {
+		errMsg := fmt.Sprintf("[%d] %v", i, test)
+
+		result, err := DoArithmetic(test.a, test.b, test.op)
+
+		if b, ok := test.expect.(bool); ok && !b {
+			require.Error(t, err, errMsg)
+			continue
+		}
+
+		require.NoError(t, err, errMsg)
+		assert.Equal(t, test.expect, result, errMsg)
+	}
+}
@@ -16,6 +16,8 @@ package config
 import (
 	"strings"

+	"github.com/spf13/cast"
+
 	"github.com/spf13/viper"
 )

@@ -40,5 +42,16 @@ func FromConfigString(config, configType string) (Provider, error) {
 		return nil, err
 	}
 	return v, nil
-
+}
+
+// GetStringSlicePreserveString returns a string slice from the given config and key.
+// It differs from the GetStringSlice method in that if the config value is a string,
+// we do not attempt to split it into fields.
+func GetStringSlicePreserveString(cfg Provider, key string) []string {
+	sd := cfg.Get(key)
+	if sds, ok := sd.(string); ok {
+		return []string{sds}
+	} else {
+		return cast.ToStringSlice(sd)
+	}
 }
@@ -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 config
+
+import (
+	"testing"
+
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetStringSlicePreserveString(t *testing.T) {
+	assert := require.New(t)
+	cfg := viper.New()
+
+	s := "This is a string"
+	sSlice := []string{"This", "is", "a", "slice"}
+
+	cfg.Set("s1", s)
+	cfg.Set("s2", sSlice)
+
+	assert.Equal([]string{s}, GetStringSlicePreserveString(cfg, "s1"))
+	assert.Equal(sSlice, GetStringSlicePreserveString(cfg, "s2"))
+	assert.Nil(GetStringSlicePreserveString(cfg, "s3"))
+}
@@ -30,7 +30,6 @@ type Config struct {
 	Disqus          Disqus
 	GoogleAnalytics GoogleAnalytics
 	Instagram       Instagram
-	SpeakerDeck     SpeakerDeck
 	Twitter         Twitter
 	Vimeo           Vimeo
 	YouTube         YouTube
@@ -65,11 +64,6 @@ type Instagram struct {
 	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"`
@@ -77,11 +71,19 @@ type Twitter struct {
 	// 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
+
+	// If simple mode is enabled, a static and no-JS version of the Tweet will be built.
+	Simple bool
 }

 // Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode.
 type Vimeo struct {
 	Service `mapstructure:",squash"`
+
+	// If simple mode is enabled, only a thumbnail is fetched from i.vimeocdn.com and
+	// shown with a play button overlaid. If a user clicks the button, he/she will
+	// be taken to the video page on vimeo.com in a new browser tab.
+	Simple bool
 }

 // YouTube holds the privacy configuration settingsrelated to the YouTube shortcode.
@@ -39,13 +39,13 @@ useSessionStorage = true
 [privacy.instagram]
 disable = true
 simple = true
-[privacy.speakerDeck]
-disable = true
 [privacy.twitter]
 disable = true
 enableDNT = true
+simple = true
 [privacy.vimeo]
 disable = true
+simple = true
 [privacy.youtube]
 disable = true
 privacyEnhanced = true
@@ -65,11 +65,11 @@ simple = true
 	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.Twitter.Simple)
 	assert.True(pc.Vimeo.Disable)
-
+	assert.True(pc.Vimeo.Simple)
 	assert.True(pc.YouTube.PrivacyEnhanced)
 	assert.True(pc.YouTube.Disable)
 }
@@ -30,6 +30,7 @@ type Config struct {
 	Disqus          Disqus
 	GoogleAnalytics GoogleAnalytics
 	Instagram       Instagram
+	Twitter         Twitter
 }

 // Disqus holds the functional configuration settings related to the Disqus template.
@@ -52,12 +53,20 @@ type Instagram struct {
 	DisableInlineCSS bool
 }

+// Twitter holds the functional configuration settings related to the Twitter shortcodes.
+type Twitter struct {
+	// The Simple variant of Twitter is decorated with a basic set of inline styles.
+	// This means that if you 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.
+	// Keep backwards compatibility.
 	if c.GoogleAnalytics.ID == "" {
 		// Try the global config
 		c.GoogleAnalytics.ID = cfg.GetString(googleAnalyticsKey)
@@ -35,6 +35,8 @@ shortname = "DS"
 id = "ga_id"
 [services.instagram]
 disableInlineCSS = true
+[services.twitter]
+disableInlineCSS = true
 `
 	cfg, err := config.FromConfigString(tomlConfig, "toml")
 	assert.NoError(err)
@@ -16,6 +16,7 @@ package create

 import (
 	"bytes"
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -31,6 +32,7 @@ func NewContent(
 	ps *helpers.PathSpec,
 	siteFactory func(filename string, siteUsed bool) (*hugolib.Site, error), kind, targetPath string) error {
 	ext := helpers.Ext(targetPath)
+	fs := ps.BaseFs.SourceFilesystems.Archetypes.Fs

 	jww.INFO.Printf("attempting to create %q of %q of ext %q", targetPath, kind, ext)

@@ -40,9 +42,9 @@ func NewContent(
 	siteUsed := false

 	if archetypeFilename != "" {
-		f, err := ps.Fs.Source.Open(archetypeFilename)
+		f, err := fs.Open(archetypeFilename)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to open archetype file: %s", err)
 		}
 		defer f.Close()

@@ -71,7 +73,7 @@ func NewContent(
 	targetDir := filepath.Dir(targetPath)

 	if targetDir != "" && targetDir != "." {
-		exists, _ = helpers.Exists(targetDir, ps.Fs.Source)
+		exists, _ = helpers.Exists(targetDir, fs)
 	}

 	if exists {
@@ -101,42 +103,27 @@ func NewContent(
 	return nil
 }

-// FindArchetype takes a given kind/archetype of content and returns an output
-// path for that archetype.  If no archetype is found, an empty string is
-// returned.
+// FindArchetype takes a given kind/archetype of content and returns the path
+// to the archetype in the archetype filesystem, blank if none found.
 func findArchetype(ps *helpers.PathSpec, kind, ext string) (outpath string) {
-	search := []string{ps.AbsPathify(ps.Cfg.GetString("archetypeDir"))}
+	fs := ps.BaseFs.Archetypes.Fs

-	if ps.Cfg.GetString("theme") != "" {
-		themeDir := filepath.Join(ps.AbsPathify(ps.Cfg.GetString("themesDir")+"/"+ps.Cfg.GetString("theme")), "/archetypes/")
-		if _, err := ps.Fs.Source.Stat(themeDir); os.IsNotExist(err) {
-			jww.ERROR.Printf("Unable to find archetypes directory for theme %q at %q", ps.Cfg.GetString("theme"), themeDir)
+	// If the new content isn't in a subdirectory, kind == "".
+	// Therefore it should be excluded otherwise `is a directory`
+	// error will occur. github.com/gohugoio/hugo/issues/411
+	var pathsToCheck = []string{"default"}
+
+	if ext != "" {
+		if kind != "" {
+			pathsToCheck = append([]string{kind + ext, "default" + ext}, pathsToCheck...)
 		} else {
-			search = append(search, themeDir)
+			pathsToCheck = append([]string{"default" + ext}, pathsToCheck...)
 		}
 	}

-	for _, x := range search {
-		// If the new content isn't in a subdirectory, kind == "".
-		// Therefore it should be excluded otherwise `is a directory`
-		// error will occur. github.com/gohugoio/hugo/issues/411
-		var pathsToCheck = []string{"default"}
-
-		if ext != "" {
-			if kind != "" {
-				pathsToCheck = append([]string{kind + ext, "default" + ext}, pathsToCheck...)
-			} else {
-				pathsToCheck = append([]string{"default" + ext}, pathsToCheck...)
-			}
-		}
-
-		for _, p := range pathsToCheck {
-			curpath := filepath.Join(x, p)
-			jww.DEBUG.Println("checking", curpath, "for archetypes")
-			if exists, _ := helpers.Exists(curpath, ps.Fs.Source); exists {
-				jww.INFO.Println("curpath: " + curpath)
-				return curpath
-			}
+	for _, p := range pathsToCheck {
+		if exists, _ := helpers.Exists(p, fs); exists {
+			return p
 		}
 	}

@@ -89,10 +89,11 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 	)

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

 	name := f.TranslationBaseName()
@@ -115,9 +116,9 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 		// TODO(bep) archetype revive the issue about wrong tpl funcs arg order
 		archetypeTemplate = []byte(ArchetypeTemplateTemplate)
 	} else {
-		archetypeTemplate, err = afero.ReadFile(s.Fs.Source, archetypeFilename)
+		archetypeTemplate, err = afero.ReadFile(s.BaseFs.Archetypes.Fs, archetypeFilename)
 		if err != nil {
-			return nil, fmt.Errorf("Failed to read archetype file %q: %s", archetypeFilename, err)
+			return nil, fmt.Errorf("failed to read archetype file %s", err)
 		}

 	}
@@ -133,7 +134,7 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 		return nil, fmt.Errorf("Failed to parse archetype file %q: %s", archetypeFilename, err)
 	}

-	templ := templateHandler.Lookup(templateName)
+	templ, _ := templateHandler.Lookup(templateName)

 	var buff bytes.Buffer
 	if err := templ.Execute(&buff, data); err != nil {
@@ -58,17 +58,15 @@ func TestNewContent(t *testing.T) {

 	for _, c := range cases {
 		cfg, fs := newTestCfg()
-		ps, err := helpers.NewPathSpec(fs, cfg)
-		require.NoError(t, err)
+		require.NoError(t, initFs(fs))
 		h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
 		require.NoError(t, err)
-		require.NoError(t, initFs(fs))

 		siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
 			return h.Sites[0], nil
 		}

-		require.NoError(t, create.NewContent(ps, siteFactory, c.kind, c.path))
+		require.NoError(t, create.NewContent(h.PathSpec, siteFactory, c.kind, c.path))

 		fname := filepath.Join("content", filepath.FromSlash(c.path))
 		content := readFileFromFs(t, fs.Source, fname)
@@ -89,6 +87,9 @@ func initViper(v *viper.Viper) {
 	v.Set("layoutDir", "layouts")
 	v.Set("i18nDir", "i18n")
 	v.Set("theme", "sample")
+	v.Set("archetypeDir", "archetypes")
+	v.Set("resourceDir", "resources")
+	v.Set("publishDir", "public")
 }

 func initFs(fs *hugofs.Fs) error {
@@ -187,6 +188,13 @@ func readFileFromFs(t *testing.T, fs afero.Fs, filename string) string {
 func newTestCfg() (*viper.Viper, *hugofs.Fs) {

 	v := viper.New()
+	v.Set("contentDir", "content")
+	v.Set("dataDir", "data")
+	v.Set("i18nDir", "i18n")
+	v.Set("layoutDir", "layouts")
+	v.Set("archetypeDir", "archetypes")
+	v.Set("assetDir", "assets")
+
 	fs := hugofs.NewMem(v)

 	v.SetFs(fs.Source)
@@ -1,16 +1,19 @@
 package deps

 import (
-	"io/ioutil"
-	"log"
-	"os"
+	"sync"
 	"time"

+	"github.com/gohugoio/hugo/common/loggers"
+
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/langs"
+	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/metrics"
 	"github.com/gohugoio/hugo/output"
+	"github.com/gohugoio/hugo/resource"
 	"github.com/gohugoio/hugo/source"
 	"github.com/gohugoio/hugo/tpl"
 	jww "github.com/spf13/jwalterweatherman"
@@ -20,6 +23,7 @@ import (
 // There will be normally only one instance of deps in play
 // at a given time, i.e. one per Site built.
 type Deps struct {
+
 	// The logger to use.
 	Log *jww.Notepad `json:"-"`

@@ -29,6 +33,9 @@ type Deps struct {
 	// The templates to use. This will usually implement the full tpl.TemplateHandler.
 	Tmpl tpl.TemplateFinder `json:"-"`

+	// We use this to parse and execute ad-hoc text templates.
+	TextTmpl tpl.TemplateParseFinder `json:"-"`
+
 	// The file systems to use.
 	Fs *hugofs.Fs `json:"-"`

@@ -41,13 +48,16 @@ type Deps struct {
 	// The SourceSpec to use
 	SourceSpec *source.SourceSpec `json:"-"`

+	// The Resource Spec to use
+	ResourceSpec *resource.Spec
+
 	// The configuration to use
 	Cfg config.Provider `json:"-"`

 	// The translation func to use
 	Translate func(translationID string, args ...interface{}) string `json:"-"`

-	Language *helpers.Language
+	Language *langs.Language

 	// All the output formats available for the current site.
 	OutputFormatsConfig output.Formats
@@ -61,6 +71,30 @@ type Deps struct {

 	// Timeout is configurable in site config.
 	Timeout time.Duration
+
+	// BuildStartListeners will be notified before a build starts.
+	BuildStartListeners *Listeners
+}
+
+type Listeners struct {
+	sync.Mutex
+
+	// A list of funcs to be notified about an event.
+	listeners []func()
+}
+
+func (b *Listeners) Add(f func()) {
+	b.Lock()
+	defer b.Unlock()
+	b.listeners = append(b.listeners, f)
+}
+
+func (b *Listeners) Notify() {
+	b.Lock()
+	defer b.Unlock()
+	for _, notify := range b.listeners {
+		notify()
+	}
 }

 // ResourceProvider is used to create and refresh, and clone resources needed.
@@ -114,7 +148,7 @@ func New(cfg DepsCfg) (*Deps, error) {
 	}

 	if logger == nil {
-		logger = jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
+		logger = loggers.NewErrorLogger()
 	}

 	if fs == nil {
@@ -128,6 +162,11 @@ func New(cfg DepsCfg) (*Deps, error) {
 		return nil, err
 	}

+	resourceSpec, err := resource.NewSpec(ps, logger, cfg.OutputFormats, cfg.MediaTypes)
+	if err != nil {
+		return nil, err
+	}
+
 	contentSpec, err := helpers.NewContentSpec(cfg.Language)
 	if err != nil {
 		return nil, err
@@ -152,8 +191,10 @@ func New(cfg DepsCfg) (*Deps, error) {
 		PathSpec:            ps,
 		ContentSpec:         contentSpec,
 		SourceSpec:          sp,
+		ResourceSpec:        resourceSpec,
 		Cfg:                 cfg.Language,
 		Language:            cfg.Language,
+		BuildStartListeners: &Listeners{},
 		Timeout:             time.Duration(timeoutms) * time.Millisecond,
 	}

@@ -166,10 +207,11 @@ func New(cfg DepsCfg) (*Deps, error) {

 // ForLanguage creates a copy of the Deps with the language dependent
 // parts switched out.
-func (d Deps) ForLanguage(l *helpers.Language) (*Deps, error) {
+func (d Deps) ForLanguage(cfg DepsCfg) (*Deps, error) {
+	l := cfg.Language
 	var err error

-	d.PathSpec, err = helpers.NewPathSpec(d.Fs, l)
+	d.PathSpec, err = helpers.NewPathSpecWithBaseBaseFsProvided(d.Fs, l, d.BaseFs)
 	if err != nil {
 		return nil, err
 	}
@@ -179,6 +221,15 @@ func (d Deps) ForLanguage(l *helpers.Language) (*Deps, error) {
 		return nil, err
 	}

+	// The resource cache is global so reuse.
+	// TODO(bep) clean up these inits.
+	resourceCache := d.ResourceSpec.ResourceCache
+	d.ResourceSpec, err = resource.NewSpec(d.PathSpec, d.Log, cfg.OutputFormats, cfg.MediaTypes)
+	if err != nil {
+		return nil, err
+	}
+	d.ResourceSpec.ResourceCache = resourceCache
+
 	d.Cfg = l
 	d.Language = l

@@ -190,6 +241,8 @@ func (d Deps) ForLanguage(l *helpers.Language) (*Deps, error) {
 		return nil, err
 	}

+	d.BuildStartListeners = &Listeners{}
+
 	return &d, nil

 }
@@ -206,11 +259,17 @@ type DepsCfg struct {
 	Fs *hugofs.Fs

 	// The language to use.
-	Language *helpers.Language
+	Language *langs.Language

 	// The configuration to use.
 	Cfg config.Provider

+	// The media types configured.
+	MediaTypes media.Types
+
+	// The output formats configured.
+	OutputFormats output.Formats
+
 	// Template handling.
 	TemplateProvider ResourceProvider
 	WithTemplate     func(templ tpl.TemplateHandler) error
@@ -1,6 +1,6 @@
 # Hugo Docs

-Documentation site for [Hugo](https://github.com/gohugoio/hugo), the very fast and flexible static site generator built with love in GoLang.
+Documentation site for [Hugo](https://github.com/gohugoio/hugo), the very fast and flexible static site generator built with love in Go.

 ## Contributing

@@ -34,7 +34,6 @@ section = [ "HTML", "RSS"]

 [mediaTypes]
 [mediaTypes."text/netlify"]
-suffix = ""
 delimiter = ""

 [outputFormats]
@@ -70,7 +69,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.41"
+  release = "0.47"
  ## Setting this to true will add a "noindex" to *EVERY* page on the site
  removefromexternalsearch = false
  ## Gh repo for site footer (include trailing slash)
@@ -167,7 +166,11 @@ anchor = "smart"
  weight = 35
  identifier = "variables"
  url = "/variables/"
-
+[[menu.docs]]
+  name = "Hugo Pipes"
+  weight = 36
+  identifier = "pipes"
+  url = "/hugo-pipes/"
 [[menu.docs]]
  name = "CLI"
  weight = 40
@@ -12,7 +12,6 @@ menu:
 weight: 20
 sections_weight: 20
 draft: false
-aliases: [/about/features]
 toc: true
 ---

@@ -53,12 +52,13 @@ toc: true
 * Integrated [Google Analytics][] support
 * Automatic [RSS][] creation
 * Support for [Go][], [Amber], and [Ace][] HTML templates
-* [Syntax highlighting][] powered by [Pygments][]
+* [Syntax highlighting][] powered by [Chroma][] (partly compatible with Pygments)


 [Ace]: /templates/alternatives/
 [aliases]: /content-management/urls/#aliases
 [Amber]: https://github.com/eknkc/amber
+[Chroma]: https://github.com/alecthomas/chroma
 [content summaries]: /content-management/summaries/
 [content types]: /content-management/types/
 [Disqus]: https://disqus.com/
@@ -77,7 +77,6 @@ toc: true
 [Permalink]: /content-management/urls/#permalinks
 [Powerful theming]: /themes/
 [Pretty URLs]: /content-management/urls/
-[Pygments]: http://pygments.org/
 [RSS]: /templates/rss/
 [Shortcodes]: /content-management/shortcodes/
 [sort content]: /templates/
@@ -23,7 +23,7 @@ toc: true

 **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.
+ 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:

@@ -46,13 +46,13 @@ useSessionStorage = false
 [privacy.instagram]
 disable = false
 simple = false
-[privacy.speakerDeck]
-disable = false
 [privacy.twitter]
 disable = false
 enableDNT = false
+simple = false
 [privacy.vimeo]
 disable = false
+simple = false
 [privacy.youtube]
 disable = false
 privacyEnhanced = false
@@ -71,8 +71,6 @@ disable = true
 disable = true
 [privacy.instagram]
 disable = true
-[privacy.speakerDeck]
-disable = true
 [privacy.twitter]
 disable = true
 [privacy.vimeo]
@@ -112,8 +110,25 @@ disableInlineCSS = true
 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.

+simple
+: If simple mode is enabled, a static and no-JS version of a tweet will be built.
+
+
+**Note:** If you use the _simple mode_ for Twitter, you may want to disable the inlines styles provided by Hugo:
+
+ {{< code-toggle file="config">}}
+[services]
+[services.twitter]
+disableInlineCSS = true
+{{< /code-toggle >}}
+
 ### 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.

+### Vimeo
+
+simple
+: If simple mode is enabled, the video thumbnail is fetched from Vimeo's servers and it is overlayed with a play button. If the user clicks to play the video, it will open in a new tab directly on Vimeo's website.
+
@@ -24,7 +24,7 @@ This documentation belongs in other places in this documentation site, but is pu

 Also see this demo project from [bep](https://github.com/bep/), the clever Norwegian behind these new features:

-* http://hugotest.bep.is/
+* https://temp.bep.is/hugotest/
 * https://github.com/bep/hugotest (source)

 ## Page Resources
@@ -43,27 +43,23 @@ Hugo is for people building a blog, a company site, a portfolio site, documentat

 [@spf13]: https://twitter.com/@spf13
 [Aerobatic]: https://www.aerobatic.com/
-[Amazon S3]: http://aws.amazon.com/s3/
-[Azure]: https://blogs.msdn.microsoft.com/acoat/2016/01/28/publish-a-static-web-site-using-azure-web-apps/
-[CloudFront]: http://aws.amazon.com/cloudfront/ "Amazon CloudFront"
-[contributing to it]: https://github.com/gohugoio/hugo
-[DreamHost]: http://www.dreamhost.com/
+[Amazon S3]: https://aws.amazon.com/s3/
+[Azure]: https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-static-website
+[CloudFront]: https://aws.amazon.com/cloudfront/ "Amazon CloudFront"
+[DreamHost]: https://www.dreamhost.com/
 [Firebase]: https://firebase.google.com/docs/hosting/ "Firebase static hosting"
 [GitHub Pages]: https://pages.github.com/
 [GitLab Pages]: https://about.gitlab.com/features/pages/
 [Go language]: https://golang.org/
 [GoDaddy]: https://www.godaddy.com/ "Godaddy.com Hosting"
-[Google Cloud Storage]: http://cloud.google.com/storage/
+[Google Cloud Storage]: https://cloud.google.com/storage/
 [Heroku]: https://www.heroku.com/
-[Jekyll]: http://jekyllrb.com/
 [Jekyll]: https://jekyllrb.com/
 [Middleman]: https://middlemanapp.com/
-[Middleman]: https://middlemanapp.com/
-[Nanoc]: http://nanoc.ws/
 [Nanoc]: https://nanoc.ws/
 [Netlify]: https://netlify.com
+[Rackspace]: https://www.rackspace.com/cloud/files
+[Surge]: https://surge.sh
+[contributing to it]: https://github.com/gohugoio/hugo
 [rackspace]: https://www.rackspace.com/cloud/files
 [static site generator]: /about/benefits/
-[Rackspace]: https://www.rackspace.com/cloud/files
-[static site generator]: /about/benefits/
-[Surge]: https://surge.sh
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 title: "hugo"
 slug: hugo
 url: /commands/hugo/
@@ -24,43 +24,44 @@ hugo [flags]
 ### Options

 ```
-  -b, --baseURL string             hostname (and path) to the root, e.g. http://spf13.com/
-  -D, --buildDrafts                include content marked as draft
-  -E, --buildExpired               include expired content
-  -F, --buildFuture                include content with publishdate in the future
-      --cacheDir string            filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --canonifyURLs               (deprecated) if true, all relative URLs will be canonicalized using baseURL
-      --cleanDestinationDir        remove files from destination not found in static directories
-      --config string              config file (default is path/config.yaml|json|toml)
-  -c, --contentDir string          filesystem path to content directory
-      --debug                      debug output
-  -d, --destination string         filesystem path to write files to
-      --disableKinds stringSlice   disable different kind of pages (home, RSS etc.)
-      --enableGitInfo              add Git revision, date and author info to the pages
-      --forceSyncStatic            copy all files when static is changed.
-      --gc                         enable to run some cleanup tasks (remove unused cache files) after the build
-  -h, --help                       help for hugo
-      --i18n-warnings              print missing translations
-      --ignoreCache                ignores the cache directory
-  -l, --layoutDir string           filesystem path to layout directory
-      --log                        enable Logging
-      --logFile string             log File path (if set, logging enabled automatically)
-      --noChmod                    don't sync permission mode of files
-      --noTimes                    don't sync modification time of files
-      --pluralizeListTitles        (deprecated) pluralize titles in lists using inflect (default true)
-      --preserveTaxonomyNames      (deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
-      --quiet                      build in quiet mode
-      --renderToMemory             render to memory (only useful for benchmark testing)
-  -s, --source string              filesystem path to read files relative from
-      --stepAnalysis               display memory and timing of different steps of the program
-      --templateMetrics            display metrics about template executions
-      --templateMetricsHints       calculate some improvement hints when combined with --templateMetrics
-  -t, --theme string               theme to use (located in /themes/THEMENAME/)
-      --themesDir string           filesystem path to themes directory
-      --uglyURLs                   (deprecated) if true, use /filename.html instead of /filename/
-  -v, --verbose                    verbose output
-      --verboseLog                 verbose logging
-  -w, --watch                      watch filesystem for changes and recreate as needed
+  -b, --baseURL string          hostname (and path) to the root, e.g. http://spf13.com/
+  -D, --buildDrafts             include content marked as draft
+  -E, --buildExpired            include expired content
+  -F, --buildFuture             include content with publishdate in the future
+      --cacheDir string         filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
+      --canonifyURLs            (deprecated) if true, all relative URLs will be canonicalized using baseURL
+      --cleanDestinationDir     remove files from destination not found in static directories
+      --config string           config file (default is path/config.yaml|json|toml)
+  -c, --contentDir string       filesystem path to content directory
+      --debug                   debug output
+  -d, --destination string      filesystem path to write files to
+      --disableKinds strings    disable different kind of pages (home, RSS etc.)
+      --enableGitInfo           add Git revision, date and author info to the pages
+      --forceSyncStatic         copy all files when static is changed.
+      --gc                      enable to run some cleanup tasks (remove unused cache files) after the build
+  -h, --help                    help for hugo
+      --i18n-warnings           print missing translations
+      --ignoreCache             ignores the cache directory
+  -l, --layoutDir string        filesystem path to layout directory
+      --log                     enable Logging
+      --logFile string          log File path (if set, logging enabled automatically)
+      --minify                  minify any supported output format (HTML, XML etc.)
+      --noChmod                 don't sync permission mode of files
+      --noTimes                 don't sync modification time of files
+      --pluralizeListTitles     (deprecated) pluralize titles in lists using inflect (default true)
+      --preserveTaxonomyNames   (deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
+      --quiet                   build in quiet mode
+      --renderToMemory          render to memory (only useful for benchmark testing)
+  -s, --source string           filesystem path to read files relative from
+      --stepAnalysis            display memory and timing of different steps of the program
+      --templateMetrics         display metrics about template executions
+      --templateMetricsHints    calculate some improvement hints when combined with --templateMetrics
+  -t, --theme string            theme to use (located in /themes/THEMENAME/)
+      --themesDir string        filesystem path to themes directory
+      --uglyURLs                (deprecated) if true, use /filename.html instead of /filename/
+  -v, --verbose                 verbose output
+      --verboseLog              verbose logging
+  -w, --watch                   watch filesystem for changes and recreate as needed
 ```

 ### SEE ALSO
@@ -77,4 +78,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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 title: "hugo benchmark"
 slug: hugo_benchmark
 url: /commands/hugo_benchmark/
@@ -20,38 +20,38 @@ hugo benchmark [flags]
 ### Options

 ```
-  -b, --baseURL string             hostname (and path) to the root, e.g. http://spf13.com/
-  -D, --buildDrafts                include content marked as draft
-  -E, --buildExpired               include expired content
-  -F, --buildFuture                include content with publishdate in the future
-      --cacheDir string            filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --canonifyURLs               (deprecated) if true, all relative URLs will be canonicalized using baseURL
-      --cleanDestinationDir        remove files from destination not found in static directories
-  -c, --contentDir string          filesystem path to content directory
-  -n, --count int                  number of times to build the site (default 13)
-      --cpuprofile string          path/filename for the CPU profile file
-  -d, --destination string         filesystem path to write files to
-      --disableKinds stringSlice   disable different kind of pages (home, RSS etc.)
-      --enableGitInfo              add Git revision, date and author info to the pages
-      --forceSyncStatic            copy all files when static is changed.
-      --gc                         enable to run some cleanup tasks (remove unused cache files) after the build
-  -h, --help                       help for benchmark
-      --i18n-warnings              print missing translations
-      --ignoreCache                ignores the cache directory
-  -l, --layoutDir string           filesystem path to layout directory
-      --memprofile string          path/filename for the memory profile file
-      --noChmod                    don't sync permission mode of files
-      --noTimes                    don't sync modification time of files
-      --pluralizeListTitles        (deprecated) pluralize titles in lists using inflect (default true)
-      --preserveTaxonomyNames      (deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
-      --renderToMemory             render to memory (only useful for benchmark testing)
-  -s, --source string              filesystem path to read files relative from
-      --stepAnalysis               display memory and timing of different steps of the program
-      --templateMetrics            display metrics about template executions
-      --templateMetricsHints       calculate some improvement hints when combined with --templateMetrics
-  -t, --theme string               theme to use (located in /themes/THEMENAME/)
-      --themesDir string           filesystem path to themes directory
-      --uglyURLs                   (deprecated) if true, use /filename.html instead of /filename/
+  -b, --baseURL string          hostname (and path) to the root, e.g. http://spf13.com/
+  -D, --buildDrafts             include content marked as draft
+  -E, --buildExpired            include expired content
+  -F, --buildFuture             include content with publishdate in the future
+      --cacheDir string         filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
+      --canonifyURLs            (deprecated) if true, all relative URLs will be canonicalized using baseURL
+      --cleanDestinationDir     remove files from destination not found in static directories
+  -c, --contentDir string       filesystem path to content directory
+  -n, --count int               number of times to build the site (default 13)
+      --cpuprofile string       path/filename for the CPU profile file
+  -d, --destination string      filesystem path to write files to
+      --disableKinds strings    disable different kind of pages (home, RSS etc.)
+      --enableGitInfo           add Git revision, date and author info to the pages
+      --forceSyncStatic         copy all files when static is changed.
+      --gc                      enable to run some cleanup tasks (remove unused cache files) after the build
+  -h, --help                    help for benchmark
+      --i18n-warnings           print missing translations
+      --ignoreCache             ignores the cache directory
+  -l, --layoutDir string        filesystem path to layout directory
+      --memprofile string       path/filename for the memory profile file
+      --noChmod                 don't sync permission mode of files
+      --noTimes                 don't sync modification time of files
+      --pluralizeListTitles     (deprecated) pluralize titles in lists using inflect (default true)
+      --preserveTaxonomyNames   (deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
+      --renderToMemory          render to memory (only useful for benchmark testing)
+  -s, --source string           filesystem path to read files relative from
+      --stepAnalysis            display memory and timing of different steps of the program
+      --templateMetrics         display metrics about template executions
+      --templateMetricsHints    calculate some improvement hints when combined with --templateMetrics
+  -t, --theme string            theme to use (located in /themes/THEMENAME/)
+      --themesDir string        filesystem path to themes directory
+      --uglyURLs                (deprecated) if true, use /filename.html instead of /filename/
 ```

 ### Options inherited from parent commands
@@ -70,4 +70,4 @@ hugo benchmark [flags]

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

-###### Auto generated by spf13/cobra on 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 title: "hugo config"
 slug: hugo_config
 url: /commands/hugo_config/
@@ -39,4 +39,4 @@ hugo config [flags]

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

-###### Auto generated by spf13/cobra on 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 title: "hugo server"
 slug: hugo_server
 url: /commands/hugo_server/
@@ -30,46 +30,46 @@ hugo server [flags]
 ### Options

 ```
-      --appendPort                 append port to baseURL (default true)
-  -b, --baseURL string             hostname (and path) to the root, e.g. http://spf13.com/
-      --bind string                interface to which the server will bind (default "127.0.0.1")
-  -D, --buildDrafts                include content marked as draft
-  -E, --buildExpired               include expired content
-  -F, --buildFuture                include content with publishdate in the future
-      --cacheDir string            filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --canonifyURLs               (deprecated) if true, all relative URLs will be canonicalized using baseURL
-      --cleanDestinationDir        remove files from destination not found in static directories
-  -c, --contentDir string          filesystem path to content directory
-  -d, --destination string         filesystem path to write files to
-      --disableFastRender          enables full re-renders on changes
-      --disableKinds stringSlice   disable different kind of pages (home, RSS etc.)
-      --disableLiveReload          watch without enabling live browser reload on rebuild
-      --enableGitInfo              add Git revision, date and author info to the pages
-      --forceSyncStatic            copy all files when static is changed.
-      --gc                         enable to run some cleanup tasks (remove unused cache files) after the build
-  -h, --help                       help for server
-      --i18n-warnings              print missing translations
-      --ignoreCache                ignores the cache directory
-  -l, --layoutDir string           filesystem path to layout directory
-      --liveReloadPort int         port for live reloading (i.e. 443 in HTTPS proxy situations) (default -1)
-      --meminterval string         interval to poll memory usage (requires --memstats), valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". (default "100ms")
-      --memstats string            log memory usage to this file
-      --navigateToChanged          navigate to changed content file on live browser reload
-      --noChmod                    don't sync permission mode of files
-      --noHTTPCache                prevent HTTP caching
-      --noTimes                    don't sync modification time of files
-      --pluralizeListTitles        (deprecated) pluralize titles in lists using inflect (default true)
-  -p, --port int                   port on which the server will listen (default 1313)
-      --preserveTaxonomyNames      (deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
-      --renderToDisk               render to Destination path (default is render to memory & serve from there)
-  -s, --source string              filesystem path to read files relative from
-      --stepAnalysis               display memory and timing of different steps of the program
-      --templateMetrics            display metrics about template executions
-      --templateMetricsHints       calculate some improvement hints when combined with --templateMetrics
-  -t, --theme string               theme to use (located in /themes/THEMENAME/)
-      --themesDir string           filesystem path to themes directory
-      --uglyURLs                   (deprecated) if true, use /filename.html instead of /filename/
-  -w, --watch                      watch filesystem for changes and recreate as needed (default true)
+      --appendPort              append port to baseURL (default true)
+  -b, --baseURL string          hostname (and path) to the root, e.g. http://spf13.com/
+      --bind string             interface to which the server will bind (default "127.0.0.1")
+  -D, --buildDrafts             include content marked as draft
+  -E, --buildExpired            include expired content
+  -F, --buildFuture             include content with publishdate in the future
+      --cacheDir string         filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
+      --canonifyURLs            (deprecated) if true, all relative URLs will be canonicalized using baseURL
+      --cleanDestinationDir     remove files from destination not found in static directories
+  -c, --contentDir string       filesystem path to content directory
+  -d, --destination string      filesystem path to write files to
+      --disableFastRender       enables full re-renders on changes
+      --disableKinds strings    disable different kind of pages (home, RSS etc.)
+      --disableLiveReload       watch without enabling live browser reload on rebuild
+      --enableGitInfo           add Git revision, date and author info to the pages
+      --forceSyncStatic         copy all files when static is changed.
+      --gc                      enable to run some cleanup tasks (remove unused cache files) after the build
+  -h, --help                    help for server
+      --i18n-warnings           print missing translations
+      --ignoreCache             ignores the cache directory
+  -l, --layoutDir string        filesystem path to layout directory
+      --liveReloadPort int      port for live reloading (i.e. 443 in HTTPS proxy situations) (default -1)
+      --meminterval string      interval to poll memory usage (requires --memstats), valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". (default "100ms")
+      --memstats string         log memory usage to this file
+      --navigateToChanged       navigate to changed content file on live browser reload
+      --noChmod                 don't sync permission mode of files
+      --noHTTPCache             prevent HTTP caching
+      --noTimes                 don't sync modification time of files
+      --pluralizeListTitles     (deprecated) pluralize titles in lists using inflect (default true)
+  -p, --port int                port on which the server will listen (default 1313)
+      --preserveTaxonomyNames   (deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
+      --renderToDisk            render to Destination path (default is render to memory & serve from there)
+  -s, --source string           filesystem path to read files relative from
+      --stepAnalysis            display memory and timing of different steps of the program
+      --templateMetrics         display metrics about template executions
+      --templateMetricsHints    calculate some improvement hints when combined with --templateMetrics
+  -t, --theme string            theme to use (located in /themes/THEMENAME/)
+      --themesDir string        filesystem path to themes directory
+      --uglyURLs                (deprecated) if true, use /filename.html instead of /filename/
+  -w, --watch                   watch filesystem for changes and recreate as needed (default true)
 ```

 ### Options inherited from parent commands
@@ -88,4 +88,4 @@ hugo server [flags]

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

-###### Auto generated by spf13/cobra on 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-08-17
 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 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Aug-2018
@@ -170,7 +170,7 @@ Last but not least, we have to create the second list that contains all publicat
 The layout for this page can be defined in the template `layouts/taxonomy/author.html`.

 {{< code file="layouts/taxonomy/author.html" download="author.html" >}}
-{{ range .Data.Pages }}
+{{ range .Pages }}
    <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
    <span>written by {{ .Author.DisplayName }}</span>
    {{ .Summary }}
@@ -41,7 +41,11 @@ For many websites, this is enough configuration. However, you also have the opti

 ### Render Hugo's Built-in Disqus Partial Template

-See [Partial Templates][partials] to learn how to add the Disqus partial to your Hugo website's templates.
+Disqus has its own [internal template](https://gohugo.io/templates/internal/#disqus) available, to render it add the following code where you want comments to appear:
+
+```
+{{ template "_internal/disqus.html" . }}
+```

 ## Comments Alternatives

@@ -1,6 +1,6 @@
 ---
 title: Links and Cross References
-description: Hugo makes it easy to link documents together.
+description: Shortcodes for creating links to documents.
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-03-31
@@ -16,114 +16,72 @@ toc: true
 ---


- The `ref` and `relref` shortcodes link documents together, both of which are [built-in Hugo shortcodes][]. These shortcodes are also used to provide links to headings inside of your content, whether across documents or within a document. The only difference between `ref` and `relref` is whether the resulting URL is absolute (`http://1.com/about/`) or relative (`/about/`), respectively.
+The `ref` and `relref` shortcode resolves the absolute or relative permalink given a path to a document.

 ## Use `ref` and `relref`

-```
+```go-html-template
 {{</* ref "document.md" */>}}
 {{</* ref "#anchor" */>}}
 {{</* ref "document.md#anchor" */>}}
+{{</* ref "/blog/my-post" */>}}
+{{</* ref "/blog/my-post.md" */>}}
 {{</* relref "document.md" */>}}
 {{</* relref "#anchor" */>}}
 {{</* relref "document.md#anchor" */>}}
 ```

-The single parameter to `ref` is a string with a content `documentname` (e.g., `about.md`) with or without an appended in-document `anchor` (`#who`) without spaces.
+The single parameter to `ref` is a string with a content `documentname` (e.g., `about.md`) with or without an appended in-document `anchor` (`#who`) without spaces. Hugo is flexible in how we search for documents, so the file suffix may be omitted.

-### Document Names
+**Paths without a leading `/` will first  be tried resolved relative to the current page.**

-The `documentname` is the name of a document, including the format extension; this may be just the filename, or the relative path from the `content/` directory. With a document `content/blog/post.md`, either format will produce the same result:
+You will get an error if you document could not be uniquely resolved. The error behaviour can be configured, see below.

-```
-{{</* relref "blog/post.md" */>}} => `/blog/post/`
-{{</* relref "post.md" */>}} => `/blog/post/`
+### Link to another language version
+
+Link to another language version of a document, you need to use this syntax:
+
+```go-html-template
+{{</* relref path="document.md" lang="jp" */>}}
 ```

-If you have the same filename used across multiple sections, you should only use the relative path format; otherwise, the behavior will be `undefined`. This is best illustrated with an example `content` directory:
+### Get another Output Format

-```
-.
-└── content
-    ├── events
-    │   └── my-birthday.md
-    ├── galleries
-    │   └── my-birthday.md
-    ├── meta
-    │   └── my-article.md
-    └── posts
-        └── my-birthday.md
-```
+To link to a given Output Format of a document, you can use this syntax:

-To be sure to get the correct reference in this case, use the full path: 
-
-{{< code file="content/meta/my-article.md" copy="false" >}}
-{{</* relref "events/my-birthday.md" */>}} => /events/my-birthday/
-{{< /code >}}
-
-### With Multiple Output Formats
-
-If the page exists in multiple [output formats][], `ref` or `relref` can be used with a output format name:
-
-```
- [Neat]({{</* ref "blog/neat.md" "amp" */>}})
+```go-html-template
+{{</* relref path="document.md" outputFormat="rss" */>}}
 ```

 ### Anchors

 When an `anchor` is provided by itself, the current page’s unique identifier will be appended; when an `anchor` is provided appended to `documentname`, the found page's unique identifier will be appended:

-```
+```go-html-template
 {{</* relref "#anchors" */>}} => #anchors:9decaf7
-{{</* relref "about-hugo/hugo-features.md#content" */>}} => /blog/post/#who:badcafe
 ```

 The above examples render as follows for this very page as well as a reference to the "Content" heading in the Hugo docs features pageyoursite

-```
+```go-html-template
 {{</* relref "#who" */>}} => #who:9decaf7
-{{</* relref "blog/post.md#who" */>}} => /blog/post/#who:badcafe
+{{</* relref "/blog/post.md#who" */>}} => /blog/post/#who:badcafe
 ```

 More information about document unique identifiers and headings can be found [below]({{< ref "#hugo-heading-anchors" >}}).

-### Examples

-* `{{</* ref "blog/post.md" */>}}` => `https://example.com/blog/post/`
-* `{{</* ref "post.md#tldr" */>}}` => `https://example.com/blog/post/#tldr:caffebad`
-* `{{</* relref "post.md" */>}}` => `/blog/post/`
-* `{{</* relref "blog/post.md#tldr" */>}}` => `/blog/post/#tldr:caffebad`
-* `{{</* ref "#tldr" */>}}` => `#tldr:badcaffe`
-* `{{</* relref "#tldr" */>}}` => `#tldr:badcaffe`
+## Ref and RelRef Configuration

-## Hugo Heading Anchors
+The behaviour can, since Hugo 0.45, be configured in `config.toml`:

-When using Markdown document types, Hugo generates heading anchors automatically. The generated anchor for this section is `hugo-heading-anchors`. Because the heading anchors are generated automatically, Hugo takes some effort to ensure that heading anchors are unique both inside a document and across the entire site.
+refLinksErrorLevel ("ERROR") 
+: When using `ref` or `relref` to resolve page links and a link cannot resolved, it will be logged with this logg level. Valid values are `ERROR` (default) or `WARNING`. Any `ERROR` will fail the build (`exit -1`).

-Ensuring heading uniqueness across the site is accomplished with a unique identifier for each document based on its path. Unless a document is renamed or moved between sections *in the filesystem*, the unique identifier for the document will not change: `blog/post.md` will always have a unique identifier of `81df004c333b392d34a49fd3a91ba720`.
+refLinksNotFoundURL
+: URL to be used as a placeholder when a page reference cannot be found in `ref` or `relref`. Is used as-is.

-`ref` and `relref` were added so you can make these reference links without having to know the document’s unique identifier. (The links in document tables of contents are automatically up-to-date with this value.)

-```
-{{</* relref "content-management/cross-references.md#hugo-heading-anchors" */>}}
-/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/
@@ -17,10 +17,10 @@ menu:

 ## The Image Page Resource

-The `image` is a [Page Resource]({{< relref "content-management/page-resources" >}}), and the processing methods listed below does not work on images inside your `/static` folder.
+The `image` is a [Page Resource]({{< relref "/content-management/page-resources" >}}), and the processing methods listed below does not work on images inside your `/static` folder.


-To get all images in a [Page Bundle]({{< relref "content-management/organization#page-bundles" >}}):
+To get all images in a [Page Bundle]({{< relref "/content-management/organization#page-bundles" >}}):


 ```go-html-template
@@ -36,47 +36,7 @@ A **menu** is a named array of menu entries accessible by name via the [`.Site.M
 If you make use of the [multilingual feature](/content-management/multilingual/), you can define language-independent menus.
 {{% /note %}}

-A menu entry has the following properties (i.e., variables) available to it:
-
-`.URL`
-: string
-
-`.Name`
-: string
-
-`.Menu`
-: string
-
-`.Identifier`
-: string
-
-`.Pre`
-: template.HTML
-
-`.Post`
-: template.HTML
-
-`.Weight`
-: int
-
-`.Parent`
-: string
-
-`.Children`
-: Menu
-
-Note that menus also have the following functions available as well:
-
-`.HasChildren`
-: boolean
-
-Additionally, there are some relevant functions available to menus on a page:
-
-`.IsMenuCurrent`
-: (menu string, menuEntry *MenuEntry ) boolean
-
-`.HasMenuCurrent`
-: (menu string, menuEntry *MenuEntry) boolean
+See the [Menu Entry Properties][me-props] for all the variables and functions related to a menu entry.

 ## Add content to menus

@@ -139,7 +99,7 @@ The URLs must be relative to the context root. If the `baseURL` is `https://exam
 {{% /note %}}

 ## Nesting
- 
+
 All nesting of content is done via the `parent` field.

 The parent of an entry should be the identifier of another entry. The identifier should be unique (within a menu).
@@ -159,3 +119,4 @@ See [Menu Templates](/templates/menu-templates/) for information on how to rende
 [config]: /getting-started/configuration/
 [multilingual]: /content-management/multilingual/
 [sitevars]: /variables/
+[me-props]: /variables/menus/
@@ -13,12 +13,14 @@ menu:
    weight: 150
 weight: 150	#rem
 draft: false
-aliases: [/content/multilingual/,/content-management/multilingual/,/tutorials/create-a-multilingual-site/]
+aliases: [/content/multilingual/,/tutorials/create-a-multilingual-site/]
 toc: true
 ---

 You should define the available languages in a `languages` section in your site configuration.

+> Also See [Hugo Multilingual Part 1: Content translation](https://regisphilibert.com/blog/2018/08/hugo-multilingual-part-1-managing-content-translation/)
+
 ## Configure Languages

 The following is an example of a site configuration for a multilingual Hugo project:
@@ -35,14 +37,13 @@ help  = "Help"
 title = "My blog"
 weight = 1
 [languages.en.params]
-linkedin = "english-link"
+linkedin = "https://linkedin.com/whoever"

 [languages.fr]
-copyright = "Tout est à moi"
-title = "Mon blog"
+title = "Mon blogue"
 weight = 2
 [languages.fr.params]
-linkedin = "lien-francais"
+linkedin = "https://linkedin.com/fr/whoever"
 [languages.fr.params.navigation]
 help  = "Aide"
 {{< /code-toggle >}}
@@ -55,11 +56,13 @@ and taxonomy pages will be rendered below `/` in English (your default content l

 When working with front matter `Params` in [single page templates][singles], omit the `params` in the key for the translation.

-If you want all of the languages to be put below their respective language code, enable `defaultContentLanguageInSubdir: true`.
+`defaultContentLanguage` sets the project's default language. If not set, the default language will be `en`.
+
+If the default language needs to be rendererd below its own language code (`/en`) like the others, set `defaultContentLanguageInSubdir: true`.

 Only the obvious non-global options can be overridden per language. Examples of global options are `baseURL`, `buildDrafts`, etc.

-## Disable a Language
+### Disable a Language

 You can disable one or more languages. This can be useful when working on a new translation.

@@ -81,7 +84,7 @@ HUGO_DISABLELANGUAGES=" " hugo server
 ```


-## Configure Multilingual Multihost
+### Configure Multilingual Multihost

 From **Hugo 0.31** we support multiple languages in a multihost configuration. See [this issue](https://github.com/gohugoio/hugo/issues/4027) for details.

@@ -94,11 +97,11 @@ Example:

 {{< code-toggle file="config" >}}
 [languages]
-[languages.no]
-baseURL = "https://example.no"
-languageName = "Norsk"
+[languages.fr]
+baseURL = "https://example.fr"
+languageName = "Français"
 weight = 1
-title = "På norsk"
+title = "En Français"

 [languages.en]
 baseURL = "https://example.com"
@@ -127,7 +130,7 @@ Press Ctrl+C to stop

 Live reload and `--navigateToChanged` between the servers work as expected.

-## Taxonomies and Blackfriday
+### Taxonomies and Blackfriday

 Taxonomies and [Blackfriday configuration][config] can also be set per language:

@@ -156,40 +159,113 @@ plaque = "plaques"

 ## Translate Your Content

-Translated articles are identified by the name of the content file.
+There are two ways to manage your content translation, both ensures each page is assigned a language and linked to its translations.

-### Examples of Translated Articles
+### Translation by filename
+
+Considering the following example:

 1. `/content/about.en.md`
 2. `/content/about.fr.md`

-In this example, the `about.md` will be assigned the configured `defaultContentLanguage`. 
+The first file is assigned the english language and linked to the second.
+The second file is assigned the french language and linked to the first.

-1. `/content/about.md`
-2. `/content/about.fr.md`
+Their language is __assigned__ according to the language code added as __suffix to the filename__. 

-This way, you can slowly start to translate your current content without having to rename everything. If left unspecified, the default value for `defaultContentLanguage` is `en`.
+By having the same **path and base filename**, the content pieces are __linked__ together as translated pages.
+{{< note >}}

-By having the same **directory and base filename**, the content pieces are linked together as translated pieces.
+If a file is missing any language code, it will be assigned the default language.

-You can also set the key used to link the translations explicitly in front matter:
+{{</ note >}}
+### Translation by content directory
+
+This system uses different content directories for each of the languages. Each language's content directory is set using the `contentDir` param.
+
+{{< code-toggle file="config" >}}
+
+languages:
+  en:
+    weight: 10
+    languageName: "English"
+    contentDir: "content/english"
+  nn:
+    weight: 20
+    languageName: "Français"
+    contentDir: "content/french"
+
+{{< /code-toggle >}}
+
+The value of `contentDir` can be any valid path, even absolute path references. The only restriction is that the content directories cannot overlap.
+
+Considering the following example in conjunction with the configuration above: 
+
+1. `/content/english/about.md`
+2. `/content/french/about.md`
+
+The first file is assigned the english language and is linked to the second.
+<br>The second file is assigned the french language and is linked to the first.
+
+Their language is __assigned__ according to the content directory they are __placed__ in.
+
+By having the same **path and basename** (relative to their language content directory), the content pieces are __linked__ together as translated pages.
+
+### Bypassing default linking.
+
+Any pages sharing the same `translationKey`  set in front matter will be linked as translated pages regardless of basename or location.
+
+Considering the following example:
+
+1. `/content/about-us.en.md`
+2. `/content/om.nn.md`
+3. `/content/presentation/a-propos.fr.md`

 ```yaml
-translationKey: "my-story"
+# set in all three pages
+translationKey: "about"
 ```

-If you need distinct URLs per language, you can set the slug in the non-default language file. For example, you can define a custom slug for a French translation in the front matter of `content/about.fr.md` as follows:
+By setting the `translationKey` front matter param to `about` in all three pages, they will be __linked__ as translated pages.

-```yaml
+
+### Localizing permalinks
+
+Because paths and filenames are used to handle linking, all translated pages, except for the language part, will be sharing the same url.
+
+To localize the URLs, the [`slug`]({{< ref "/content-management/organization/index.md#slug" >}}) or [`url`]({{< ref "/content-management/organization/index.md#url" >}}) front matter param can be set in any of the non-default language file. 
+
+For example, a french translation (`content/about.fr.md`) can have its own localized slug.
+
+{{< code-toggle >}}
+Title: A Propos
 slug: "a-propos"
+{{< /code-toggle >}}

-```

-At render, Hugo will build both `/about/` and `/a-propos/` as properly linked translated pages.
+At render, Hugo will build both `/about/` and `fr/a-propos/` while maintaning their translation linking.
+{{% note %}}
+If using `url`, remember to include the language part as well: `fr/compagnie/a-propos/`.
+{{%/ note %}}

-For merging of content from other languages (i.e. missing content translations), see [lang.Merge](/functions/lang.merge/).
+### Page Bundles

-## Link to Translated Content
+To avoid the burden of having to duplicate files, each Page Bundle inherits the resources of its linked translated pages' bundles except for the content files (markdown files, html files etc...).
+
+Therefore, from within a template, the page will have access to the files from all linked pages' bundles.
+
+If, across the linked bundles, two or more files share the same basenname, only one will be included and chosen as follows:
+
+* File from current language Bundle, if present.
+* First file found across bundles by order of language `Weight`.
+
+{{% note %}}
+
+Page Bundle's resources follow the same language assignement logic as content files, be it by filename (`image.jpg`, `image.fr.jpg`) or by directory (`english/about/header.jpg`, `french/about/header.jpg`).
+
+{{%/ note %}}
+
+## Reference the Translated Content

 To create a list of links to translated content, use a template similar to the following:

@@ -210,7 +286,7 @@ The above can be put in a `partial` (i.e., inside `layouts/partials/`) and inclu

 The above also uses the [`i18n` function][i18func] described in the next section.

-## List All Available Languages
+### List All Available Languages

 `.AllTranslations` on a `Page` can be used to list all translations, including itself. Called on the home page it can be used to build a language navigator:

@@ -282,7 +358,7 @@ i18n|MISSING_TRANSLATION|en|wordCount

 ## Customize Dates

-At the time of this writing, Golang does not yet have support for internationalized locales, but if you do some work, you can simulate it. For example, if you want to use French month names, you can add a data file like ``data/mois.yaml`` with this content:
+At the time of this writing, Go does not yet have support for internationalized locales, but if you do some work, you can simulate it. For example, if you want to use French month names, you can add a data file like ``data/mois.yaml`` with this content:

 ~~~yaml
 1: "janvier"
@@ -366,7 +442,7 @@ For merging of content from other languages (i.e. missing content translations),

 To support Multilingual mode in your themes, some considerations must be taken for the URLs in the templates. If there is more than one language, URLs must meet the following criteria:

-* Come from the built-in `.Permalink` or `.URL`
+* Come from the built-in `.Permalink` or `.RelPermalink`
 * Be constructed with
    * The [`relLangURL` template function][rellangurl] or the [`absLangURL` template function][abslangurl] **OR**
    * Prefixed with `{{ .LanguagePrefix }}`
@@ -21,7 +21,7 @@ toc: true

 Hugo `0.32` announced page-relative images and other resources packaged into `Page Bundles`. 

-These terms are connected, and you also need to read about [Page Resources]({{< relref "content-management/page-resources" >}}) and [Image Processing]({{< relref "content-management/image-processing" >}}) to get the full picture.
+These terms are connected, and you also need to read about [Page Resources]({{< relref "/content-management/page-resources" >}}) and [Image Processing]({{< relref "/content-management/image-processing" >}}) to get the full picture.

 {{% imgproc 1-featured Resize "300x" %}}
 The illustration shows 3 bundles. Note that the home page bundle cannot contain other content pages, but other files (images etc.) are fine.
@@ -97,7 +97,7 @@ anywhere:
 But you can get it by `.Site.GetPage`. Here is an example:

 ```go-html-template
-{{ $headless := .Site.GetPage "page" "some-headless-bundle" }}
+{{ $headless := .Site.GetPage "/some-headless-bundle" }}
 {{ $reusablePages := $headless.Resources.Match "author*" }}
 <h2>Authors</h2>
 {{ range $reusablePages }}
@@ -39,7 +39,7 @@ To list up to 5 related pages is as simple as including something similar to thi
 Read [this blog article](https://regisphilibert.com/blog/2018/04/hugo-optmized-relashionships-with-related-content/) for a great explanation of more advanced usage of this feature.
 {{% /note %}}

-The full set of methods available on the page lists can bee seen in this Go interface:
+The full set of methods available on the page lists can be seen in this Go interface:

 ```go
 // A PageGenealogist finds related pages in a page collection. This interface is implemented
@@ -178,7 +178,7 @@ This shortcode will convert the source code provided into syntax-highlighted HTM
 <section id="main">
  <div>
   <h1 id="title">{{ .Title }}</h1>
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
        {{ .Render "summary"}}
    {{ end }}
  </div>
@@ -194,7 +194,7 @@ The `highlight` shortcode example above would produce the following HTML when th
 <span style="color: #f92672">&lt;section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;main&quot;</span><span style="color: #f92672">&gt;</span>
  <span style="color: #f92672">&lt;div&gt;</span>
   <span style="color: #f92672">&lt;h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;title&quot;</span><span style="color: #f92672">&gt;</span>{{ .Title }}<span style="color: #f92672">&lt;/h1&gt;</span>
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
        {{ .Render &quot;summary&quot;}}
    {{ end }}
  <span style="color: #f92672">&lt;/div&gt;</span>
@@ -268,34 +268,6 @@ Assuming that standard Hugo pretty URLs are turned on.
 <a href="/about/#who:c28654c202e73453784cfd2c5ab356c0">Who</a>
 ```

-### `speakerdeck`
-
-To embed slides from [Speaker Deck][], click on "&lt;&#8239;/&gt;&nbsp;Embed" (under Share right next to the template on Speaker Deck) and copy the URL:
-
-```
-<script async class="speakerdeck-embed" data-id="4e8126e72d853c0060001f97" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
-```
-
-#### `speakerdeck` Example Input
-
-Extract the value from the field `data-id` and pass it to the shortcode:
-
-{{< code file="speakerdeck-example-input.md" >}}
-{{</* speakerdeck 4e8126e72d853c0060001f97 */>}}
-{{< /code >}}
-
-#### `speakerdeck` Example Output
-
-{{< output file="speakerdeck-example-input.md" >}}
-{{< speakerdeck 4e8126e72d853c0060001f97 >}}
-{{< /output >}}
-
-#### `speakerdeck` Example Display
-
-For the preceding `speakerdeck` example, the following simulates the displayed experience for visitors to your website. Naturally, the final display will be contingent on your stylesheets and surrounding markup.
-
-{{< speakerdeck 4e8126e72d853c0060001f97 >}}
-
 ### `tweet`

 You want to include a single tweet into your blog post? Everything you need is the URL of the tweet:
@@ -402,6 +374,10 @@ Using the preceding `youtube` example (without `autoplay="true"`), the following

 {{< youtube w7Ft2ymGmfc >}}

+## Privacy Config
+
+To learn how to configure your Hugo site to meet the new EU privacy regulation, see [Hugo and the GDPR][].
+
 ## Create Custom Shortcodes

 To learn more about creating custom shortcodes, see the [shortcode template documentation][].
@@ -410,6 +386,7 @@ To learn more about creating custom shortcodes, see the [shortcode template docu
 [contentmanagementsection]: /content-management/formats/
 [examplegist]: https://gist.github.com/spf13/7896402
 [figureelement]: http://html5doctor.com/the-figure-figcaption-elements/ "An article from HTML5 doctor discussing the fig and figcaption elements."
+[Hugo and the GDPR]: /about/hugo-and-gdpr/
 [Instagram]: https://www.instagram.com/
 [pagevariables]: /variables/page/
 [partials]: /templates/partials/
@@ -418,7 +395,6 @@ To learn more about creating custom shortcodes, see the [shortcode template docu
 [sctemps]: /templates/shortcode-templates/
 [scvars]: /variables/shortcodes/
 [shortcode template documentation]: /templates/shortcode-templates/
-[Speaker Deck]: https://speakerdeck.com/
 [templatessection]: /templates/
 [Vimeo]: https://vimeo.com/
 [YouTube Videos]: https://www.youtube.com/
@@ -1,6 +1,6 @@
 ---
 title: Static Files
-description: "The `static` folder is where you place all your **static files**."
+description: "Files that get served **statically** (as-is, no modification) on the site root."
 date: 2017-11-18
 categories: [content management]
 keywords: [source, directories]
@@ -13,36 +13,58 @@ aliases: [/static-files]
 toc: true
 ---

-The `static` folder is where you place all your **static files**, e.g. stylesheets, JavaScript, images etc.
+By default, the `static/` directory in the site project is used for
+all **static files** (e.g. stylesheets, JavaScript, images).

-You can set the name of the static folder to use in your configuration file.  From **Hugo 0.31** you can configure as many static directories as you need. All the files in all the static directories will form a union filesystem.
+Hugo can be configured to look into a different directory, or even
+**multiple directories** for such static files by configuring the
+`staticDir` parameter in the [site config][]. All the files in all the
+static directories will form a union filesystem.

-Example:
+This union filesystem will be served from your site root. So a file
+`<SITE PROJECT>/static/me.png` will be accessible as
+`<MY_BASEURL>/me.png`.
+
+Here's an example of setting `staticDir` and `staticDir2` for a
+multi-language site:

 {{< code-toggle copy="false" file="config" >}}
 staticDir = ["static1", "static2"]
-[languages]
-[languages.no]
-staticDir = ["staticDir_override", "static_no"]
-baseURL = "https://example.no"
-languageName = "Norsk"
-weight = 1
-title = "På norsk"

+[languages]
 [languages.en]
 staticDir2 = "static_en"
 baseURL = "https://example.com"
 languageName = "English"
 weight = 2
 title = "In English"
+[languages.no]
+staticDir = ["staticDir_override", "static_no"]
+baseURL = "https://example.no"
+languageName = "Norsk"
+weight = 1
+title = "På norsk"
 {{</ code-toggle >}}

 In the above, with no theme used:

-* The English site will get its static files as a union of "static1", "static2" and "static_en". On file duplicates, the right-most version will win.
-* The Norwegian site will get its static files as a union of "staticDir_override" and "static_no".
+- The English site will get its static files as a union of "static1",
+  "static2" and "static_en". On file duplicates, the right-most
+  version will win.
+- The Norwegian site will get its static files as a union of
+  "staticDir_override" and "static_no".

-**Note:** The `2` `static2` (can be a number between 0 and 10) is added to tell Hugo that you want to **add** this directory to the global set of static directories. Using `staticDir` on the language level would replace the global value.
+Note 1
+: The **2** (can be a number between 0 and 10) in `staticDir2` is
+  added to tell Hugo that you want to **add** this directory to the
+  global set of static directories defined using `staticDir`. Using
+  `staticDir` on the language level would replace the global value (as
+  can be seen in the Norwegian site case).
+
+Note 2
+: The example above is a [multihost setup][]. In a regular setup, all
+  the static directories will be available to all sites.


-**Note:** The example above is a [multihost setup](/content-management/multilingual/#configure-multilingual-multihost). In a regular setup, all the static directories will be available to all sites.
+[site config]: /getting-started/configuration/#all-configuration-settings
+[multihost setup]: /content-management/multilingual/#configure-multilingual-multihost
@@ -1,7 +1,7 @@
 ---
 title: Content Summaries
 linktitle: Summaries
-description: Hugo generates summaries of your content. 
+description: Hugo generates summaries of your content.
 date: 2017-01-10
 publishdate: 2017-01-10
 lastmod: 2017-01-10
@@ -57,7 +57,7 @@ Be careful to enter <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> exactly
 You can show content summaries with the following code. You could use the following snippet, for example, in a [section template][].

 {{< code file="page-list-with-summaries.html" >}}
-{{ range first 10 .Data.Pages }}
+{{ range first 10 .Pages }}
    <article>
      <!-- this <div> includes the title summary -->
      <div>
@@ -78,4 +78,4 @@ Note how the `.Truncated` boolean valuable may be used to hide the "Read More...

 [org]: /content-management/formats/
 [pagevariables]: /variables/page/
-[section template]: /templates/section-templates/
+[section template]: /templates/section-templates/
@@ -72,7 +72,13 @@ pygmentsCodefences
 : Set to true to enable syntax highlighting in code fences with a language tag in markdown (see below for an example).

 pygmentsStyle
-: The style of code highlighting. See https://help.farbox.com/pygments.html for a gallery. Note that this option is not relevant when `pygmentsUseClasses` is set.
+: The style of code highlighting. Note that this option is not
+  relevant when `pygmentsUseClasses` is set.
+
+  Syntax highlighting galleries:
+  **Chroma** ([short snippets](https://xyproto.github.io/splash/docs/all.html),
+  [long snippets](https://xyproto.github.io/splash/docs/longer/all.html)),
+  [Pygments](https://help.farbox.com/pygments.html)

 pygmentsUseClasses
 : Set to `true` to use CSS classes to format your highlighted code. See [Generate Syntax Highlighter CSS](#generate-syntax-highlighter-css).
@@ -128,7 +134,7 @@ Highlighting is carried out via the [built-in shortcode](/content-management/sho
 <section id="main">
  <div>
    <h1 id="title">{{ .Title }}</h1>
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
      {{ .Render "summary"}}
    {{ end }}
  </div>
@@ -151,7 +157,7 @@ It is also possible to add syntax highlighting with GitHub flavored code fences.
 <section id="main">
  <div>
    <h1 id="title">{{ .Title }}</h1>
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
      {{ .Render "summary"}}
    {{ end }}
  </div>
@@ -13,7 +13,7 @@ menu:
    weight: 130
 weight: 130	#rem
 draft: false
-aliases: [/extras/toc/,/content-management/toc/]
+aliases: [/extras/toc/]
 toc: true
 ---

@@ -88,7 +88,7 @@ Luckily, redirects can be handled easily with **aliases** in Hugo.

 ### Example: Aliases

-Let's assume you create a new piece of content at `content/posts/my-awesome-blog-post.md`. The content is a revision of your previous post at `content/posts/my-original-url.md`. You can create an `aliases` field in the front matter of your new `my-awesome-blog-post.md` where you can add previous paths. The following examples show how to create this filed in TOML and YAML front matter, respectively.
+Let's assume you create a new piece of content at `content/posts/my-awesome-blog-post.md`. The content is a revision of your previous post at `content/posts/my-original-url.md`. You can create an `aliases` field in the front matter of your new `my-awesome-blog-post.md` where you can add previous paths. The following examples show how to create this field in TOML and YAML front matter, respectively.

 #### TOML Front Matter

@@ -188,7 +188,7 @@ content/posts/post-1.md

 ## Ugly URLs

-If you would like to have what are often referred to as "ugly URLs" (e.g., example.com/urls.html), set `uglyurls = true` or `uglyurls: true` in your site's `config.toml` or `config.yaml`, respectively. You can also use the `--uglyURLs=true` [flag from the command line][usage] with `hugo` or `hugo server`..
+If you would like to have what are often referred to as "ugly URLs" (e.g., example.com/urls.html), set `uglyurls = true` or `uglyurls: true` in your site's `config.toml` or `config.yaml`, respectively. You can also use the `--uglyURLs=true` [flag from the command line][usage] with `hugo` or `hugo server`.

 If you want a specific piece of content to have an exact URL, you can specify this in the [front matter][] under the `url` key. The following are examples of the same content directory and what the eventual URL structure will be when Hugo runs with its default behavior.

@@ -253,7 +253,7 @@ Or, if you are on Windows and do not have `grep` installed:
 hugo config | FINDSTR /I canon
 ```

-## Override URLS with Front Matter
+## Override URLs with Front Matter

 In addition to specifying permalink values in your site configuration for different content sections, Hugo provides even more granular control for individual pieces of content.

@@ -42,7 +42,7 @@ If you are having trouble following the installation guides for Go, check out [G

 ### Install Go From Source

-[Download the latest stable version of Go][godl] and follow the official [Golang installation guide][goinstall].
+[Download the latest stable version of Go][godl] and follow the official [Go installation guide][goinstall].

 Once you're finished installing Go, let's confirm everything is working correctly. Open a terminal---or command line under Windows--and type the following:

@@ -390,7 +390,7 @@ Thank you for reading through this contribution guide. Hopefully, we will see yo

 Feel free to [open an issue][newissue] if you think you found a bug or you have a new idea to improve Hugo. We are happy to hear from you.

-## Additional References for Learning Git and Golang
+## Additional References for Learning Git and Go

 * [Codecademy's Free "Learn Git" Course][codecademy] (Free)
 * [Code School and GitHub's "Try Git" Tutorial][trygit] (Free)
@@ -1,6 +1,6 @@
 ---
 title: .GetPage
-description: "Gets a `Page` of a given `Kind` and `path`."
+description: "Gets a `Page` of a given `path`."
 godocref:
 date: 2017-02-01
 publishdate: 2017-02-01
@@ -10,7 +10,7 @@ menu:
  docs:
    parent: "functions"
 keywords: [sections,lists,indexes]
-signature: [".GetPage KIND PATH"]
+signature: [".GetPage PATH"]
 workson: []
 hugoversion:
 relatedfuncs: []
@@ -18,35 +18,42 @@ deprecated: false
 aliases: []
 ---

-Every `Page` has a [`Kind` attribute][page_kinds] that shows what kind of page it is. While this attribute can be used to list pages of a certain `kind` using `where`, often it can be useful to fetch a single page by its path.
-
-`.GetPage` returns a page of a given `Kind` and `path`.
+`.GetPage` returns a page of a given `path`. Both `Site` and `Page` implements this method. The `Page` variant will, if given a relative path -- i.e. a path without a leading `/` -- try look for the page relative to the current page.

 {{% note %}}
-If the `path` is `"foo/bar.md"`, it can be written as exactly that, or broken up
-into multiple strings as `"foo" "bar.md"`.
+**Note:** We overhauled and simplified the `.GetPage` API in Hugo 0.45. Before that you needed to provide a `Kind` attribute in addition to the path, e.g. `{{ .Site.GetPage "section" "blog" }}`. This will still work, but is now superflous.
 {{% /note %}}

-```
-{{ with .Site.GetPage "section" "blog" }}{{ .Title }}{{ end }}
+
+```go-html-template
+{{ with .Site.GetPage "/blog" }}{{ .Title }}{{ end }}
 ```

 This method wil return `nil` when no page could be found, so the above will not print anything if the blog section is not found.

-For a regular page (whose `Kind` is `page`):
+To fund a regular page in the blog section::

-```
-{{ with .Site.GetPage "page" "blog/my-post.md" }}{{ .Title }}{{ end }}
+```go-html-template
+{{ with .Site.GetPage "/blog/my-post.md" }}{{ .Title }}{{ end }}
 ```

-Note that the `path` can also be supplied like this, where the slash-separated
-path elements are added as separate strings:
+And since `Page` also provides a `.GetPage` method, the above is the same as:

-```
-{{ with .Site.GetPage "page" "blog" "my-post.md" }}{{ .Title }}{{ end }}
+```go-html-template
+{{ with .Site.GetPage "/blog" }}
+{{ with .GetPage "my-post.md" }}{{ .Title }}{{ end }}
+{{ end }}
 ```

-## `.GetPage` Example
+## .GetPage and Multilingual Sites
+
+The previous examples have used the full content filename to lookup the post. Depending on how you have organized your content (whether you have the language code in the file name or not, e.g. `my-post.en.md`), you may want to do the lookup without extension. This will get you the current language's version of the page:
+
+```go-html-template
+{{ with .Site.GetPage "/blog/my-post" }}{{ .Title }}{{ end }}
+```
+
+## .GetPage Example

 This code snippet---in the form of a [partial template][partials]---allows you to do the following:

@@ -57,7 +64,7 @@ This code snippet---in the form of a [partial template][partials]---allows you t

 {{< code file="grab-top-two-tags.html" >}}
 <ul class="most-popular-tags">
-{{ $t := .Site.GetPage "taxonomyTerm" "tags" }}
+{{ $t := .Site.GetPage "/tags" }}
 {{ range first 2 $t.Data.Terms.ByCount }}
    <li>{{ . }}</li>
 {{ end }}
@@ -39,7 +39,7 @@ You can use `after` in combination with the [`first` function][] and Hugo's [pow
 {{ define "main" }}
 <section class="row featured-article">
    <h2>Featured Article</h2>
-    {{ range first 1 .Data.Pages.ByPublishDate.Reverse }}
+    {{ range first 1 .Pages.ByPublishDate.Reverse }}
     <header>
        <h3><a href="{{.Permalink}}">{{.Title}}</a></h3>
    </header>
@@ -48,7 +48,7 @@ You can use `after` in combination with the [`first` function][] and Hugo's [pow
 </section>
 <div class="row recent-articles">
    <h2>Recent Articles</h2>
-    {{ range first 3 (after 1 .Data.Pages.ByPublishDate.Reverse) }}
+    {{ range first 3 (after 1 .Pages.ByPublishDate.Reverse) }}
        <section class="recent-article">
            <header>
                <h3><a href="{{.Permalink}}">{{.Title}}</a></h3>
@@ -7,7 +7,6 @@ menu:
  docs:
    parent: "functions"
 signature: ["cond CONTROL VAR1 VAR2"]
-aliases: [/functions/cond/]
 hugoversion: 0.27
 relatedfuncs: [default]
 toc: false
@@ -29,4 +28,4 @@ Would emit "goose" if the `$geese` array has exactly 1 item, or "geese" otherwis
 Whenever you use a `cond` function, *both* variable expressions are *always* evaluated. This means that a usage like `cond false (div 1 0) 27` will throw an error because `div 1 0` will be evaluated *even though the condition is false*.

 In other words, the `cond` function does *not* provide [short-circuit evaluation](https://en.wikipedia.org/wiki/Short-circuit_evaluation) and does *not* work like a normal [ternary operator](https://en.wikipedia.org/wiki/%3F:) that will pass over the first expression if the condition returns `false`.
-{{% /warning %}}
+{{% /warning %}}
@@ -15,7 +15,6 @@ workson: []
 hugoversion:
 relatedfuncs: []
 deprecated: false
-aliases: [/functions/countrunes/]
 ---

 In contrast with `countwords` function, which counts every word in a string, the `countrunes` function determines the number of runes in the content and excludes any whitespace. This has specific utility if you are dealing with CJK-like languages.
--- a/Show More
+++ b/Show More