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

[ci skip]
releaser: Bump versions for release of 0.49
2026-09-01 03:02:38 +00:00 · 2018-09-24 10:01:04 +00:00 · 2018-09-24 10:01:04 +00:00 · 2018-09-24 11:52:47 +02:00 · 2018-09-24 11:52:25 +02:00 · 2018-09-24 11:49:07 +02:00
305 changed files with 5639 additions and 3296 deletions
@@ -1,8 +1,9 @@
 defaults: &defaults
-  working_directory: /go/src/github.com/gohugoio
  docker:
-      - image: bepsays/ci-goreleaser:0.34.2-11
-    
+      - image: bepsays/ci-goreleaser:1.11-2
+  environment:
+    CGO_ENABLED: "0"
+
 version: 2
 jobs:
  build:
@@ -12,11 +13,11 @@ jobs:
          path: hugo
      - run:
            command: |
-                go get -d github.com/magefile/mage/...
                git clone git@github.com:gohugoio/hugoDocs.git
                cd hugo
-                mage vendor
-                mage check
+                go mod download
+                sleep 5
+                go test -p 1 ./...
      - persist_to_workspace:
          root: .
          paths: .
@@ -24,7 +25,7 @@ jobs:
    <<: *defaults
    steps:
      - attach_workspace:
-          at: /go/src/github.com/gohugoio
+          at: /root/project
      - run:
            command: |
                    cd hugo
@@ -6,8 +6,7 @@ env:
 git:
  depth: false
 go:
-  - 1.9.7
-  - "1.10.3"
+  - 1.11
  - tip
 os:
  - linux
@@ -17,14 +16,18 @@ matrix:
    - go: tip
  fast_finish: true
 install:
+  - mkdir -p $HOME/src
+  - mv $HOME/gopath/src/github.com/gohugoio/hugo $HOME/src
+  - export TRAVIS_BUILD_DIR=$HOME/src/hugo
+  - cd $HOME/src/hugo
  - go get github.com/magefile/mage
-  - mage -v vendor
 script:
-  - mage -v test
-  - mage -v check
-  - mage -v hugo
-  - ./hugo -s docs/
-  - ./hugo --renderToMemory -s docs/
+- go mod download
+- mage -v test
+- mage -v check
+- mage -v hugo
+- ./hugo -s docs/
+- ./hugo --renderToMemory -s docs/
 before_install:
  - gem install asciidoctor
  - type asciidoctor
@@ -106,30 +106,23 @@ Fixes #1949

 ###  Fetching the Sources From GitHub

-Due to the way Go handles package imports, the best approach for working on a
-Hugo fork is to use Git Remotes.  Here's a simple walk-through for getting
-started:
+Since Hugo 0.48, Hugo uses the Go Modules support built into Go 1.11 to build. The easiest is is to clone Hugo in a directory outside of `GOPATH`, as in the following example:

-1. Get the Hugo source:
+```bash
+mkdir $HOME/src
+cd $HOME/src
+git clone https://github.com/gohugoio/hugo.git
+cd hugo
+go install
+```

-    ```bash
-    go get -u -v -d github.com/gohugoio/hugo
-    ```
+For some convenient build and test targets, you also will want to install Mage:

-1. Install Mage:
+```bash
+go get github.com/magefile/mage
+```

-    ```bash
-    go get github.com/magefile/mage
-    ```
-
-1. Change to the Hugo source directory and fetch the dependencies:
-
-    ```bash
-    cd $HOME/go/src/github.com/gohugoio/hugo
-    mage vendor
-    ```
-
-    Note that Hugo uses [Go Dep](https://github.com/golang/dep) to vendor dependencies, rather than a simple `go get`. We don't commit the vendored packages themselves to the Hugo git repository. The call to `mage vendor` takes care of all this for you.
+Now, to make a change to Hugos's source:

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

@@ -2,19 +2,18 @@
 # Twitter:      https://twitter.com/gohugoio
 # Website:      https://gohugo.io/

-FROM golang:1.10.3-alpine3.7 AS build
+FROM golang:1.11-alpine3.7 AS build

 ENV CGO_ENABLED=0
 ENV GOOS=linux
+ENV GO111MODULE=on

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

 # ---

@@ -1,714 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  digest = "1:f6a10073544cc0bd1eb9fd9f8d9bf4644971910a0f8393d51b5b4d286e554849"
-  name = "github.com/BurntSushi/locker"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
-
-[[projects]]
-  branch = "master"
-  digest = "1:af3600b068c8dd0e004122f154de7ece06b0b13376f79e976701aab4834c860a"
-  name = "github.com/BurntSushi/toml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
-
-[[projects]]
-  digest = "1:1080c443bebc98b1c25665b46b321dc02f8a4d384fe544379dcba1e651f59321"
-  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:60d5ffa86fb76749180841154b3714cde4771723b7e52329fb97ec916a6a68a6"
-  name = "github.com/alecthomas/assert"
-  packages = ["."]
-  pruneopts = ""
-  revision = "405dbfeb8e38effee6e723317226e93fff912d06"
-
-[[projects]]
-  digest = "1:2d78d7ffff1988e613e4946d6a6914190db0b38d533e392208797d2f557c92b6"
-  name = "github.com/alecthomas/chroma"
-  packages = [
-    ".",
-    "formatters",
-    "formatters/html",
-    "lexers",
-    "lexers/a",
-    "lexers/b",
-    "lexers/c",
-    "lexers/circular",
-    "lexers/d",
-    "lexers/e",
-    "lexers/f",
-    "lexers/g",
-    "lexers/h",
-    "lexers/i",
-    "lexers/internal",
-    "lexers/j",
-    "lexers/k",
-    "lexers/l",
-    "lexers/m",
-    "lexers/n",
-    "lexers/o",
-    "lexers/p",
-    "lexers/q",
-    "lexers/r",
-    "lexers/s",
-    "lexers/t",
-    "lexers/v",
-    "lexers/w",
-    "lexers/x",
-    "lexers/y",
-    "styles",
-  ]
-  pruneopts = ""
-  revision = "1b755a90bd109f170385cb3964f0abdfd3451145"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ba0a389824c3c3d378f5f334370524b7d04b5a5ccedce7dd2da05ae8d3868609"
-  name = "github.com/alecthomas/colour"
-  packages = ["."]
-  pruneopts = ""
-  revision = "60882d9e27213e8552dcff6328914fe4c2b44bc9"
-
-[[projects]]
-  branch = "master"
-  digest = "1:5723237c9114bb92b4571532d9580dd0ed885ec3eb371d58085c074895c04a51"
-  name = "github.com/alecthomas/repr"
-  packages = ["."]
-  pruneopts = ""
-  revision = "f49988b46e025398b9f834f7c726afe001ec481f"
-
-[[projects]]
-  digest = "1:05d0e4ae6b8d0273647964fe26762e3345d5d196aaeb858838e75336703451ba"
-  name = "github.com/bep/debounce"
-  packages = ["."]
-  pruneopts = ""
-  revision = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"
-  version = "v1.1.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:88b2a2ccfbcf8aa697ec140e196c524f40bbdc8e6f6d03ff79354bc694cb677d"
-  name = "github.com/bep/gitmap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "012701e8669671499fc43e9792335a1dcbfe2afb"
-
-[[projects]]
-  branch = "master"
-  digest = "1:7337271448975bc9cf3deae77bb2d7f7fc937c60c59b606ffcd25bfc754dd2ec"
-  name = "github.com/bep/go-tocss"
-  packages = [
-    "scss",
-    "scss/libsass",
-    "tocss",
-  ]
-  pruneopts = ""
-  revision = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"
-
-[[projects]]
-  digest = "1:e5ad472b763adca2591568384b8f07974d2da4a98b55ffb360e2cecc2a216bae"
-  name = "github.com/chaseadamsio/goorgeous"
-  packages = ["."]
-  pruneopts = ""
-  revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:f30036d9c6eb2b9262edac69b5f6b59e25b25310ffee3035ab0e7c4b722a8552"
-  name = "github.com/cpuguy83/go-md2man"
-  packages = ["md2man"]
-  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:0a39ec8bf5629610a4bc7873a92039ee509246da3cef1a0ea60f1ed7e5f9cea5"
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  pruneopts = ""
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:8dc164acd41f84c9f704362d061f90cf45014c3b7eb3fead126efb7d152e2efc"
-  name = "github.com/disintegration/imaging"
-  packages = ["."]
-  pruneopts = ""
-  revision = "dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
-  version = "v1.2.4"
-
-[[projects]]
-  digest = "1:536d2bdf1cdef7ec49e1cb4a8a083ae639159f0fd11a5829fe4d35ecb8cc3a1a"
-  name = "github.com/dlclark/regexp2"
-  packages = [
-    ".",
-    "syntax",
-  ]
-  pruneopts = ""
-  revision = "487489b64fb796de2e55f4e8a4ad1e145f80e957"
-  version = "v1.1.6"
-
-[[projects]]
-  branch = "master"
-  digest = "1:fbbae68d476d61afb78178dd4c5532dbfff154e2fea72d1312138bf35c613ec1"
-  name = "github.com/eknkc/amber"
-  packages = [
-    ".",
-    "parser",
-  ]
-  pruneopts = ""
-  revision = "cdade1c073850f4ffc70a829e31235ea6892853b"
-
-[[projects]]
-  digest = "1:e5c807ac3b60699ccec9263f6eec756251b17e78582eb149f90ac345d9e58327"
-  name = "github.com/fortytw2/leaktest"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:b2106f1668ea5efc1ecc480f7e922a093adb9563fd9ce58585292871f0d0f229"
-  name = "github.com/fsnotify/fsnotify"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  version = "v1.4.7"
-
-[[projects]]
-  digest = "1:b7a7e17513aeee6492d93015c7bf29c86a0c1c91210ea56b21e36c1a40958cba"
-  name = "github.com/gobwas/glob"
-  packages = [
-    ".",
-    "compiler",
-    "match",
-    "syntax",
-    "syntax/ast",
-    "syntax/lexer",
-    "util/runes",
-    "util/strings",
-  ]
-  pruneopts = ""
-  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
-  version = "v0.2.3"
-
-[[projects]]
-  digest = "1:fe1b4d4cbe48c0d55507c55f8663aa4185576cc58fa0c8be03bb8f19dfe17a9c"
-  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:ccfc44438ba7fc24effffbe9c7b75bbbb51e7a275e361e62a4dbffbc9e8e43d9"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/printer",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token",
-  ]
-  pruneopts = ""
-  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-
-[[projects]]
-  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
-  name = "github.com/inconshreveable/mousetrap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-  version = "v1.0"
-
-[[projects]]
-  digest = "1:3b82a4308adc7319d0c7efbad106e966cbbf70e47f16fb5f7aca131b01f6f9b1"
-  name = "github.com/jdkato/prose"
-  packages = [
-    "internal/util",
-    "transform",
-  ]
-  pruneopts = ""
-  revision = "20d3663d4bc9dd10d75abcde9d92e04b4861c674"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:f72872791669f287262777a6a635c7aaebbdd9919cffacea802f8f9c1dc2e6f6"
-  name = "github.com/kyokomi/emoji"
-  packages = ["."]
-  pruneopts = ""
-  revision = "7e06b236c489543f53868841f188a294e3383eab"
-  version = "v1.5"
-
-[[projects]]
-  digest = "1:3ee69edc976a8e66debd179073163cbbef426faa7c0ef2d8ff8e3be159699d2e"
-  name = "github.com/magefile/mage"
-  packages = [
-    "mg",
-    "sh",
-  ]
-  pruneopts = ""
-  revision = "2f974307b636f59c13b88704cf350a4772fef271"
-  version = "v1.0.2"
-
-[[projects]]
-  digest = "1:093cd7ebfdecf5692c66f0b0f7a1877d796c89d9940f5769439c53dc65264036"
-  name = "github.com/magiconair/properties"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
-  version = "v1.7.6"
-
-[[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:6066f4c384723dd468c96adc13bfe4d977f182c2305e1a82c94bb50e1507d528"
-  name = "github.com/miekg/mmark"
-  packages = ["."]
-  pruneopts = ""
-  revision = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
-  version = "v1.3.6"
-
-[[projects]]
-  branch = "master"
-  digest = "1:0de0f377aeccd41384e883c59c6f184c9db01c96db33a2724a1eaadd60f92629"
-  name = "github.com/mitchellh/hashstructure"
-  packages = ["."]
-  pruneopts = ""
-  revision = "2bca23e0e452137f789efbc8610126fd8b94f73b"
-
-[[projects]]
-  branch = "master"
-  digest = "1:59fa50d593e5673a0dfffa1852b66fd700c05b35e368680b4b89a68fdb2c1379"
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  pruneopts = ""
-  revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
-
-[[projects]]
-  branch = "master"
-  digest = "1:08b8db6381176e5472815f67f29b2b8b21d5bf3adaba4de3e5416faaf26f3689"
-  name = "github.com/muesli/smartcrop"
-  packages = [
-    ".",
-    "options",
-  ]
-  pruneopts = ""
-  revision = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"
-
-[[projects]]
-  digest = "1:34afc91b88b56c71639e275ff3ea8179a8f094ddc86df96e26074000cade42fe"
-  name = "github.com/nicksnyder/go-i18n"
-  packages = [
-    "i18n/bundle",
-    "i18n/language",
-    "i18n/translation",
-  ]
-  pruneopts = ""
-  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
-  version = "v1.10.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:2656200f82783893859c77903afc794d97c1f5054e2b57f7021e33a6047e7b1e"
-  name = "github.com/olekukonko/tablewriter"
-  packages = ["."]
-  pruneopts = ""
-  revision = "b8a9be070da40449e501c3c4730a889e42d87a9e"
-
-[[projects]]
-  digest = "1:fef37519c971ab3c464318a0c9da6a7fb9c21439aa587e61bf10af651e6119b9"
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
-  version = "v1.1.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:10bc894f31df5ca3366a50122ee2ade6b56f3f5531c523a8a551748a0663aa1b"
-  name = "github.com/russross/blackfriday"
-  packages = ["."]
-  pruneopts = ""
-  revision = "11635eb403ff09dbc3a6b5a007ab5ab09151c229"
-
-[[projects]]
-  digest = "1:afa9b7bb3d9e633ef32e46ab4b6a87b5376271e3d86b09a379029bbb10e26fa0"
-  name = "github.com/sanity-io/litter"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ae543b7ba8fd6af63e4976198f146e1348ae53c1"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:1ebe873a8dc99e3316c30fea2e211038c4d1fcb605eee17e00a5e91b8817925e"
-  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:3d6c88f060fdaac3291f3d18f58eb542fe3a2b330609b269962d26d0c99104be"
-  name = "github.com/spf13/afero"
-  packages = [
-    ".",
-    "mem",
-  ]
-  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:9e14345bfb9aa30952b41ffceaa2acd559933cfe3d17bd87b7f6e54b6c618492"
-  name = "github.com/spf13/cobra"
-  packages = [
-    ".",
-    "doc",
-  ]
-  pruneopts = ""
-  revision = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"
-  version = "v0.0.2"
-
-[[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:261bc565833ef4f02121450d74eb88d5ae4bd74bfe5d0e862cddb8550ec35000"
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  pruneopts = ""
-  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:79af66c513727a0ed32fb4137ad7d0613b01e8e2f5ce9479724e26e2c9068011"
-  name = "github.com/spf13/viper"
-  packages = ["."]
-  pruneopts = ""
-  revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
-  version = "v1.0.2"
-
-[[projects]]
-  digest = "1:a70d585d45f695f2e8e6782569bdf181419667a35e6035ceb086706b495aa21a"
-  name = "github.com/stretchr/testify"
-  packages = [
-    "assert",
-    "require",
-  ]
-  pruneopts = ""
-  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
-  version = "v1.2.1"
-
-[[projects]]
-  digest = "1:54b1c3f97e0d74b571055cc17af4a978b6160e6ccfda73608aba048e404319c1"
-  name = "github.com/tdewolff/minify"
-  packages = [
-    ".",
-    "css",
-    "html",
-    "js",
-    "json",
-    "svg",
-    "xml",
-  ]
-  pruneopts = ""
-  revision = "8d72a4127ae33b755e95bffede9b92e396267ce2"
-  version = "v2.3.5"
-
-[[projects]]
-  digest = "1:33d327ae34260328b00ed15f89961446d805797a96de8643a983020825bb51ae"
-  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:12e69a2969bdcdf2928607e51966a868482c2a450f1c97c5dde004257c8369ff"
-  name = "github.com/wellington/go-libsass"
-  packages = ["libs"]
-  pruneopts = ""
-  revision = "615eaa47ef794d037c1906a0eb7bf85375a5decf"
-
-[[projects]]
-  digest = "1:b1e5dc66cd8ad9712eb8fd4dfaecac6ae45cbcde94476c5b64d905c5d789eef7"
-  name = "github.com/yosssi/ace"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
-  version = "v0.0.5"
-
-[[projects]]
-  branch = "master"
-  digest = "1:4525c51a65e4974007814da8e2621343840d769d80b2b2ab79e6958342726587"
-  name = "golang.org/x/image"
-  packages = [
-    "bmp",
-    "draw",
-    "math/f64",
-    "riff",
-    "tiff",
-    "tiff/lzw",
-    "vp8",
-    "vp8l",
-    "webp",
-  ]
-  pruneopts = ""
-  revision = "f315e440302883054d0c2bd85486878cb4f8572c"
-
-[[projects]]
-  branch = "master"
-  digest = "1:8bb19e8d6e1321626d3f58ffee75699e86940c79d959b30fcf632883d7c4d303"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "idna",
-  ]
-  pruneopts = ""
-  revision = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"
-
-[[projects]]
-  branch = "master"
-  digest = "1:d84d0f563cc649de4c9a8272a0395f75b11952202d18d4d927e933cc91493062"
-  name = "golang.org/x/sync"
-  packages = ["errgroup"]
-  pruneopts = ""
-  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
-
-[[projects]]
-  branch = "master"
-  digest = "1:137a530894d869c2fb09e135e6bb7a5d701347ba273471eaa2483053f8fbeb35"
-  name = "golang.org/x/sys"
-  packages = ["unix"]
-  pruneopts = ""
-  revision = "3b87a42e500a6dc65dae1a55d0b641295971163e"
-
-[[projects]]
-  branch = "master"
-  digest = "1:4cf01dae652ef4428cf9d354bdec79467e436ecfa92d943b1ada8184e1a938b6"
-  name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "internal/colltab",
-    "internal/gen",
-    "internal/language",
-    "internal/language/compact",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable",
-    "width",
-  ]
-  pruneopts = ""
-  revision = "2cb43934f0eece38629746959acc633cba083fe4"
-
-[[projects]]
-  branch = "v2"
-  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  pruneopts = ""
-  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  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
@@ -1,171 +0,0 @@
-
-
-[[constraint]]
-  name = "github.com/BurntSushi/toml"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/PuerkitoBio/purell"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/alecthomas/chroma"
-  revision = "1b755a90bd109f170385cb3964f0abdfd3451145"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/bep/gitmap"
-  
-[[constraint]]
-   branch = "master"
-   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"
-
-[[constraint]]
- name = "github.com/disintegration/imaging"
- version = "~v1.2.4"
-
-[[constraint]]
-  name = "github.com/magefile/mage"
-  version = "v1"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/eknkc/amber"
-
-[[constraint]]
-  name = "github.com/fortytw2/leaktest"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/fsnotify/fsnotify"
-  version = "^1.4.0"
-
-[[constraint]]
-  name = "github.com/gorilla/websocket"
-  version = "1.2.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/hashicorp/go-immutable-radix"
-
-[[constraint]]
-  name = "github.com/jdkato/prose"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/kyokomi/emoji"
-  version = "1.5.0"
-
-[[constraint]]
-  name = "github.com/markbates/inflect"
-  revision = "a12c3aec81a6a938bf584a4bac567afed9256586"
-
-[[constraint]]
-  name = "github.com/miekg/mmark"
-  version = "^1.3.6"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/mitchellh/mapstructure"
-
-[[constraint]]
-  name = "github.com/nicksnyder/go-i18n"
-  version = "^1.10.0"
-
-[[constraint]]
-  name = "github.com/russross/blackfriday"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/spf13/afero"
-  version = "^1.1.0"
-
-[[constraint]]
-  name = "github.com/spf13/cast"
-  version = "^1.1.0"
-
-[[constraint]]
-  version = "^0.0.1"
-  name = "github.com/spf13/cobra"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spf13/fsync"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spf13/jwalterweatherman"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spf13/nitro"
-
-[[constraint]]
-  name = "github.com/spf13/pflag"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/spf13/viper"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.1.4"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/olekukonko/tablewriter"
-
-[[constraint]]
-  name = "github.com/yosssi/ace"
-  version = "^0.0.5"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/image"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/text"
-
-[[constraint]]
-  branch = "v2"
-  name = "gopkg.in/yaml.v2"
-
-[[constraint]]
-  name = "github.com/gobwas/glob"
-  version = "0.2.2"
-
-
-[[constraint]]
-  name = "github.com/muesli/smartcrop"
-  branch = "master"
-
-
-[[constraint]]
-  name = "github.com/sanity-io/litter"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/bep/debounce"
-  version = "^1.1.0"
-
-[[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,23 +56,19 @@ Use the [installation instructions in the Hugo documentation](https://gohugo.io/

 #### Prerequisite Tools

-* [Git](http://git-scm.com/)
-* [Go (latest or previous version)](https://golang.org/dl/)
-
-#### Vendored Dependencies
-
-Hugo uses [dep](https://github.com/golang/dep) to vendor dependencies, but we don't commit the vendored packages themselves to the Hugo git repository. Therefore, a simple `go get` is _not_ supported because the command is not vendor aware.
-
-The simplest way is to use [mage](https://github.com/magefile/mage) (a Make alternative for Go projects.)
+* [Git](https://git-scm.com/)
+* [Go (at least Go 1.11)](https://golang.org/dl/)

 #### Fetch from GitHub

+Since Hugo 0.48, Hugo uses the Go Modules support built into Go 1.11 to build. The easiest is is to clone Hugo in a directory outside of `GOPATH`, as in the following example:
+
 ```bash
-go get github.com/magefile/mage
-go get -d github.com/gohugoio/hugo
-cd ${GOPATH:-$HOME/go}/src/github.com/gohugoio/hugo
-mage vendor
-mage install
+mkdir $HOME/src
+cd $HOME/src
+git clone https://github.com/gohugoio/hugo.git
+cd hugo
+go install
 ```

 **If you are a Windows user, substitute the `$HOME` environment variable above with `%USERPROFILE%`.**
@@ -6,11 +6,10 @@ init:
  - 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
+clone_folder: C:\hugo

 install:
 #  - gem install asciidoctor
@@ -18,7 +17,8 @@ install:
  - go get github.com/magefile/mage

 build_script:
-  - mage vendor hugoRace
+  - go mod download
+  - mage hugoRace
  - mage -v check
  - hugo -s docs/
  - hugo --renderToMemory -s docs/
@@ -17,6 +17,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 	"sync"
 	"time"

@@ -70,6 +71,7 @@ type commandeer struct {
 	languages           langs.Languages

 	configured bool
+	paused     bool
 }

 func (c *commandeer) Set(key string, value interface{}) {
@@ -324,11 +326,12 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
 		}
 	}

-	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
@@ -177,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{})
@@ -219,8 +220,6 @@ func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("destination", "d", "", "filesystem path to write files to")
 	cmd.Flags().StringP("theme", "t", "", "theme to use (located in /themes/THEMENAME/)")
 	cmd.Flags().StringP("themesDir", "", "", "filesystem path to themes directory")
-	cmd.Flags().Bool("uglyURLs", false, "(deprecated) if true, use /filename.html instead of /filename/")
-	cmd.Flags().Bool("canonifyURLs", false, "(deprecated) if true, all relative URLs will be canonicalized using baseURL")
 	cmd.Flags().StringVarP(&cc.baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. http://spf13.com/")
 	cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date and author info to the pages")
 	cmd.Flags().BoolVar(&cc.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
@@ -228,8 +227,6 @@ func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&nitro.AnalysisOn, "stepAnalysis", false, "display memory and timing of different steps of the program")
 	cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions")
 	cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics")
-	cmd.Flags().Bool("pluralizeListTitles", true, "(deprecated) pluralize titles in lists using inflect")
-	cmd.Flags().Bool("preserveTaxonomyNames", false, `(deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")`)
 	cmd.Flags().BoolP("forceSyncStatic", "", false, "copy all files when static is changed.")
 	cmd.Flags().BoolP("noTimes", "", false, "don't sync modification time of files")
 	cmd.Flags().BoolP("noChmod", "", false, "don't sync permission mode of files")
@@ -72,7 +72,7 @@ func TestCommandsPersistentFlags(t *testing.T) {
 		"--port=1366",
 		"--renderToDisk",
 		"--source=mysource",
-		"--uglyURLs"}, func(commands []cmder) {
+	}, func(commands []cmder) {
 		var sc *serverCmd
 		for _, command := range commands {
 			if b, ok := command.(commandsBuilderGetter); ok {
@@ -105,7 +105,6 @@ func TestCommandsPersistentFlags(t *testing.T) {

 		assert.Equal([]string{"page", "home"}, cfg.Get("disableKinds"))

-		assert.True(cfg.GetBool("uglyURLs"))
 		assert.True(cfg.GetBool("gc"))

 		// The flag is named i18n-warnings
@@ -62,6 +62,8 @@ type Response struct {
 	Cmd *cobra.Command
 }

+// IsUserError returns true is the Response error is a user error rather than a
+// system error.
 func (r Response) IsUserError() bool {
 	return r.Err != nil && isUserError(r.Err)
 }
@@ -209,35 +211,31 @@ 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)

 }

-var deprecatedFlags = map[string]bool{
-	strings.ToLower("uglyURLs"):              true,
-	strings.ToLower("pluralizeListTitles"):   true,
-	strings.ToLower("preserveTaxonomyNames"): true,
-	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 _, deprecated := deprecatedFlags[strings.ToLower(key)]; deprecated {
-			msg := fmt.Sprintf(`Set "%s = true" in your config.toml.
-If you need to set this configuration value from the command line, set it via an OS environment variable: "HUGO_%s=true hugo"`, key, strings.ToUpper(key))
-			// Remove in Hugo 0.38
-			helpers.Deprecated("hugo", "--"+key+" flag", msg, true)
-		}
+	if (force && flags.Lookup(key) != nil) || flags.Changed(key) {
 		f := flags.Lookup(key)
 		configKey := key
 		if targetKey != "" {
@@ -637,12 +635,21 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {

 func (c *commandeer) fullRebuild() {
 	c.commandeerHugoState = &commandeerHugoState{}
-	if err := c.loadConfig(true, true); err != nil {
+	err := c.loadConfig(true, true)
+	if err != nil {
 		jww.ERROR.Println("Failed to reload config:", err)
-	} else if err := c.buildSites(); 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()
+		}
 	}
 }

@@ -682,6 +689,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.
@@ -697,15 +733,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 {
@@ -936,7 +963,7 @@ func pickOneWriteOrCreatePath(events []fsnotify.Event) string {

 // isThemeVsHugoVersionMismatch returns whether the current Hugo version is
 // less than any of the themes' min_version.
-func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (mismatch bool, requiredMinVersion string) {
+func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (dir string, mismatch bool, requiredMinVersion string) {
 	if !c.hugo.PathSpec.ThemeSet() {
 		return
 	}
@@ -961,7 +988,7 @@ func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (mismatch bool, r

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

@@ -73,23 +73,23 @@ Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root
 func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {

 	if len(args) < 2 {
-		return newUserError(`Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.")
+		return newUserError(`import from jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.")
 	}

 	jekyllRoot, err := filepath.Abs(filepath.Clean(args[0]))
 	if err != nil {
-		return newUserError("Path error:", args[0])
+		return newUserError("path error:", args[0])
 	}

 	targetDir, err := filepath.Abs(filepath.Clean(args[1]))
 	if err != nil {
-		return newUserError("Path error:", args[1])
+		return newUserError("path error:", args[1])
 	}

 	jww.INFO.Println("Import Jekyll from:", jekyllRoot, "to:", targetDir)

 	if strings.HasPrefix(filepath.Dir(targetDir), jekyllRoot) {
-		return newUserError("Target path should not be inside the Jekyll root, aborting.")
+		return newUserError("abort: target path should not be inside the Jekyll root")
 	}

 	forceImport, _ := cmd.Flags().GetBool("force")
@@ -97,7 +97,7 @@ func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {
 	fs := afero.NewOsFs()
 	jekyllPostDirs, hasAnyPost := i.getJekyllDirInfo(fs, jekyllRoot)
 	if !hasAnyPost {
-		return errors.New("Your Jekyll root contains neither posts nor drafts, aborting.")
+		return errors.New("abort: jekyll root contains neither posts nor drafts")
 	}

 	site, err := i.createSiteFromJekyll(jekyllRoot, targetDir, jekyllPostDirs, forceImport)
@@ -120,7 +120,7 @@ func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {

 		relPath, err := filepath.Rel(jekyllRoot, path)
 		if err != nil {
-			return newUserError("Get rel path error:", path)
+			return newUserError("get rel path error:", path)
 		}

 		relPath = filepath.ToSlash(relPath)
@@ -204,13 +204,13 @@ func (i *importCmd) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPos
 	fs := s.Fs.Source
 	if exists, _ := helpers.Exists(targetDir, fs); exists {
 		if isDir, _ := helpers.IsDir(targetDir, fs); !isDir {
-			return nil, errors.New("Target path \"" + targetDir + "\" already exists but not a directory")
+			return nil, errors.New("target path \"" + targetDir + "\" exists but is not a directory")
 		}

 		isEmpty, _ := helpers.IsEmpty(targetDir, fs)

 		if !isEmpty && !force {
-			return nil, errors.New("Target path \"" + targetDir + "\" already exists and is not empty")
+			return nil, errors.New("target path \"" + targetDir + "\" exists and is not empty")
 		}
 	}

@@ -85,45 +85,13 @@ func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {

 	var kind string

-	createPath, kind = newContentPathSection(createPath)
+	createPath, kind = newContentPathSection(c.hugo, createPath)

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

-	cfg := c.DepsCfg
-
-	ps, err := helpers.NewPathSpec(cfg.Fs, cfg.Cfg)
-	if err != nil {
-		return err
-	}
-
-	// If a site isn't in use in the archetype template, we can skip the build.
-	siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
-		if !siteUsed {
-			return hugolib.NewSite(*cfg)
-		}
-		var s *hugolib.Site
-
-		if err := c.hugo.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-			return nil, err
-		}
-
-		s = c.hugo.Sites[0]
-
-		if len(c.hugo.Sites) > 1 {
-			// Find the best match.
-			for _, ss := range c.hugo.Sites {
-				if strings.Contains(createPath, "."+ss.Language.Lang) {
-					s = ss
-					break
-				}
-			}
-		}
-		return s, nil
-	}
-
-	return create.NewContent(ps, siteFactory, kind, createPath)
+	return create.NewContent(c.hugo, kind, createPath)
 }

 func mkdir(x ...string) {
@@ -144,10 +112,17 @@ func touchFile(fs afero.Fs, x ...string) {
 	}
 }

-func newContentPathSection(path string) (string, string) {
+func newContentPathSection(h *hugolib.HugoSites, path string) (string, string) {
 	// Forward slashes is used in all examples. Convert if needed.
 	// Issue #1133
 	createpath := filepath.FromSlash(path)
+
+	if h != nil {
+		for _, s := range h.Sites {
+			createpath = strings.TrimPrefix(createpath, s.PathSpec.ContentDir)
+		}
+	}
+
 	var section string
 	// assume the first directory is the section (kind)
 	if strings.Contains(createpath[1:], helpers.FilePathSeparator) {
@@ -25,7 +25,7 @@ import (

 // Issue #1133
 func TestNewContentPathSectionWithForwardSlashes(t *testing.T) {
-	p, s := newContentPathSection("/post/new.md")
+	p, s := newContentPathSection(nil, "/post/new.md")
 	assert.Equal(t, filepath.FromSlash("/post/new.md"), p)
 	assert.Equal(t, "post", s)
 }
@@ -122,27 +122,27 @@ func (f noDirFile) Readdir(count int) ([]os.FileInfo, error) {

 var serverPorts []int

-func (s *serverCmd) server(cmd *cobra.Command, args []string) error {
+func (sc *serverCmd) server(cmd *cobra.Command, args []string) error {
 	// If a Destination is provided via flag write to disk
 	destination, _ := cmd.Flags().GetString("destination")
 	if destination != "" {
-		s.renderToDisk = true
+		sc.renderToDisk = true
 	}

 	var serverCfgInit sync.Once

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

@@ -158,25 +158,25 @@ func (s *serverCmd) server(cmd *cobra.Command, args []string) error {
 			serverPorts = make([]int, 1)

 			if c.languages.IsMultihost() {
-				if !s.serverAppend {
+				if !sc.serverAppend {
 					err = newSystemError("--appendPort=false not supported when in multihost mode")
 				}
 				serverPorts = make([]int, len(c.languages))
 			}

-			currentServerPort := s.serverPort
+			currentServerPort := sc.serverPort

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

 		c.serverPorts = serverPorts

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

-			baseURL, err := s.fixURL(language, s.baseURL, serverPort)
+			baseURL, err := sc.fixURL(language, sc.baseURL, serverPort)
 			if err != nil {
 				return nil
 			}
@@ -226,7 +226,7 @@ func (s *serverCmd) server(cmd *cobra.Command, args []string) error {
 		jww.ERROR.Println("memstats error:", err)
 	}

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

 	// Watch runs its own server as part of the routine
-	if s.serverWatch {
+	if sc.serverWatch {

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

 	}

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

 }

@@ -0,0 +1,28 @@
+// 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 collections contains common Hugo functionality related to collection
+// handling.
+package collections
+
+// Grouper defines a very generic way to group items by a given key.
+type Grouper interface {
+	Group(key interface{}, items interface{}) (interface{}, error)
+}
+
+// Slicer definse a very generic way to create a typed slice. This is used
+// in collections.Slice template func to get types such as Pages, PageGroups etc.
+// instead of the less useful []interface{}.
+type Slicer interface {
+	Slice(items interface{}) (interface{}, error)
+}
@@ -18,6 +18,8 @@ import (
 	"errors"
 )

+// ErrFeatureNotAvailable denotes that a feature is unavailable.
+//
 // 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")
+var ErrFeatureNotAvailable = errors.New("this feature is not available in your current Hugo version")
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package resource
+package hugio

 import (
 	"io"
@@ -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}
+}
@@ -73,7 +73,7 @@ func (c *Scratch) Set(key string, value interface{}) string {
 	return ""
 }

-// Reset deletes the given key
+// Delete deletes the given key.
 func (c *Scratch) Delete(key string) string {
 	c.mu.Lock()
 	delete(c.values, key)
@@ -81,7 +81,7 @@ func (c *Scratch) Delete(key string) string {
 	return ""
 }

-// Get returns a value previously set by Add or Set
+// Get returns a value previously set by Add or Set.
 func (c *Scratch) Get(key string) interface{} {
 	c.mu.RLock()
 	val := c.values[key]
@@ -104,7 +104,7 @@ func (c *Scratch) SetInMap(key string, mapKey string, value interface{}) string
 	return ""
 }

-// GetSortedMapValues returns a sorted map previously filled with SetInMap
+// GetSortedMapValues returns a sorted map previously filled with SetInMap.
 func (c *Scratch) GetSortedMapValues(key string) interface{} {
 	c.mu.RLock()

@@ -130,6 +130,7 @@ func (c *Scratch) GetSortedMapValues(key string) interface{} {
 	return sortedArray
 }

+// NewScratch returns a new instance Scratch.
 func NewScratch() *Scratch {
 	return &Scratch{values: make(map[string]interface{})}
 }
@@ -1,4 +1,4 @@
-// Copyright 2017-present 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.
@@ -41,6 +41,8 @@ func (k KeyValues) String() string {
 	return fmt.Sprintf("%v: %v", k.Key, k.Values)
 }

+// NewKeyValuesStrings takes a given key and slice of values and returns a new
+// KeyValues struct.
 func NewKeyValuesStrings(key string, values ...string) KeyValues {
 	iv := make([]interface{}, len(values))
 	for i := 0; i < len(values); i++ {
@@ -51,7 +51,6 @@ 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)
 	}
+	return cast.ToStringSlice(sd)
 }
@@ -96,6 +96,7 @@ type YouTube struct {
 	PrivacyEnhanced bool
 }

+// DecodeConfig creates a privacy Config from a given Hugo configuration.
 func DecodeConfig(cfg config.Provider) (pc Config, err error) {
 	if !cfg.IsSet(privacyConfigKey) {
 		return
@@ -61,6 +61,7 @@ type Twitter struct {
 	DisableInlineCSS bool
 }

+// DecodeConfig creates a services Config from a given Hugo configuration.
 func DecodeConfig(cfg config.Provider) (c Config, err error) {
 	m := cfg.GetStringMap(servicesConfigKey)

@@ -17,71 +17,76 @@ package create
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
+
+	"github.com/gohugoio/hugo/hugofs"

 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugolib"
+	"github.com/spf13/afero"
 	jww "github.com/spf13/jwalterweatherman"
 )

 // NewContent creates a new content file in the content directory based upon the
 // given kind, which is used to lookup an archetype.
 func NewContent(
-	ps *helpers.PathSpec,
-	siteFactory func(filename string, siteUsed bool) (*hugolib.Site, error), kind, targetPath string) error {
+	sites *hugolib.HugoSites, kind, targetPath string) error {
+	targetPath = filepath.Clean(targetPath)
 	ext := helpers.Ext(targetPath)
-	fs := ps.BaseFs.SourceFilesystems.Archetypes.Fs
+	ps := sites.PathSpec
+	archetypeFs := ps.BaseFs.SourceFilesystems.Archetypes.Fs
+	sourceFs := ps.Fs.Source

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

-	archetypeFilename := findArchetype(ps, kind, ext)
+	archetypeFilename, isDir := findArchetype(ps, kind, ext)
+	contentPath, s := resolveContentPath(sites, sourceFs, targetPath)
+
+	if isDir {
+
+		langFs := hugofs.NewLanguageFs(s.Language.Lang, sites.LanguageSet(), archetypeFs)
+
+		cm, err := mapArcheTypeDir(ps, langFs, archetypeFilename)
+		if err != nil {
+			return err
+		}
+
+		if cm.siteUsed {
+			if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+				return err
+			}
+		}
+
+		name := filepath.Base(targetPath)
+		return newContentFromDir(archetypeFilename, sites, archetypeFs, sourceFs, cm, name, contentPath)
+	}

 	// Building the sites can be expensive, so only do it if really needed.
 	siteUsed := false

 	if archetypeFilename != "" {
-		f, err := fs.Open(archetypeFilename)
+		var err error
+		siteUsed, err = usesSiteVar(archetypeFs, archetypeFilename)
 		if err != nil {
-			return fmt.Errorf("failed to open archetype file: %s", err)
-		}
-		defer f.Close()
-
-		if helpers.ReaderContains(f, []byte(".Site")) {
-			siteUsed = true
+			return err
 		}
 	}

-	s, err := siteFactory(targetPath, siteUsed)
+	if siteUsed {
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return err
+		}
+	}
+
+	content, err := executeArcheTypeAsTemplate(s, "", kind, targetPath, archetypeFilename)
 	if err != nil {
 		return err
 	}

-	var content []byte
-
-	content, err = executeArcheTypeAsTemplate(s, kind, targetPath, archetypeFilename)
-	if err != nil {
-		return err
-	}
-
-	// The site may have multiple content dirs, and we currently do not know which contentDir the
-	// user wants to create this content in. We should improve on this, but we start by testing if the
-	// provided path points to an existing dir. If so, use it as is.
-	var contentPath string
-	var exists bool
-	targetDir := filepath.Dir(targetPath)
-
-	if targetDir != "" && targetDir != "." {
-		exists, _ = helpers.Exists(targetDir, fs)
-	}
-
-	if exists {
-		contentPath = targetPath
-	} else {
-		contentPath = s.PathSpec.AbsPathify(filepath.Join(s.Cfg.GetString("contentDir"), targetPath))
-	}
-
 	if err := helpers.SafeWriteToDisk(contentPath, bytes.NewReader(content), s.Fs.Source); err != nil {
 		return err
 	}
@@ -103,29 +108,199 @@ func NewContent(
 	return nil
 }

+func targetSite(sites *hugolib.HugoSites, fi *hugofs.LanguageFileInfo) *hugolib.Site {
+	for _, s := range sites.Sites {
+		if fi.Lang() == s.Language.Lang {
+			return s
+		}
+	}
+	return sites.Sites[0]
+}
+
+func newContentFromDir(
+	archetypeDir string,
+	sites *hugolib.HugoSites,
+	sourceFs, targetFs afero.Fs,
+	cm archetypeMap, name, targetPath string) error {
+
+	for _, f := range cm.otherFiles {
+		filename := f.Filename()
+		// Just copy the file to destination.
+		in, err := sourceFs.Open(filename)
+		if err != nil {
+			return err
+		}
+
+		targetFilename := filepath.Join(targetPath, strings.TrimPrefix(filename, archetypeDir))
+
+		targetDir := filepath.Dir(targetFilename)
+		if err := targetFs.MkdirAll(targetDir, 0777); err != nil && !os.IsExist(err) {
+			return fmt.Errorf("failed to create target directory for %s: %s", targetDir, err)
+		}
+
+		out, err := targetFs.Create(targetFilename)
+
+		_, err = io.Copy(out, in)
+		if err != nil {
+			return err
+		}
+
+		in.Close()
+		out.Close()
+	}
+
+	for _, f := range cm.contentFiles {
+		filename := f.Filename()
+		s := targetSite(sites, f)
+		targetFilename := filepath.Join(targetPath, strings.TrimPrefix(filename, archetypeDir))
+
+		content, err := executeArcheTypeAsTemplate(s, name, archetypeDir, targetFilename, filename)
+		if err != nil {
+			return err
+		}
+
+		if err := helpers.SafeWriteToDisk(targetFilename, bytes.NewReader(content), targetFs); err != nil {
+			return err
+		}
+	}
+
+	jww.FEEDBACK.Println(targetPath, "created")
+
+	return nil
+}
+
+type archetypeMap struct {
+	// These needs to be parsed and executed as Go templates.
+	contentFiles []*hugofs.LanguageFileInfo
+	// These are just copied to destination.
+	otherFiles []*hugofs.LanguageFileInfo
+	// If the templates needs a fully built site. This can potentially be
+	// expensive, so only do when needed.
+	siteUsed bool
+}
+
+func mapArcheTypeDir(
+	ps *helpers.PathSpec,
+	fs afero.Fs,
+	archetypeDir string) (archetypeMap, error) {
+
+	var m archetypeMap
+
+	walkFn := func(filename string, fi os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if fi.IsDir() {
+			return nil
+		}
+
+		fil := fi.(*hugofs.LanguageFileInfo)
+
+		if hugolib.IsContentFile(filename) {
+			m.contentFiles = append(m.contentFiles, fil)
+			if !m.siteUsed {
+				m.siteUsed, err = usesSiteVar(fs, filename)
+				if err != nil {
+					return err
+				}
+			}
+			return nil
+		}
+
+		m.otherFiles = append(m.otherFiles, fil)
+
+		return nil
+	}
+
+	if err := helpers.SymbolicWalk(fs, archetypeDir, walkFn); err != nil {
+		return m, err
+	}
+
+	return m, nil
+}
+
+func usesSiteVar(fs afero.Fs, filename string) (bool, error) {
+	f, err := fs.Open(filename)
+	if err != nil {
+		return false, fmt.Errorf("failed to open archetype file: %s", err)
+	}
+	defer f.Close()
+	return helpers.ReaderContains(f, []byte(".Site")), nil
+}
+
+// Resolve the target content path.
+func resolveContentPath(sites *hugolib.HugoSites, fs afero.Fs, targetPath string) (string, *hugolib.Site) {
+	targetDir := filepath.Dir(targetPath)
+	first := sites.Sites[0]
+
+	var (
+		s              *hugolib.Site
+		siteContentDir string
+	)
+
+	// Try the filename: my-post.en.md
+	for _, ss := range sites.Sites {
+		if strings.Contains(targetPath, "."+ss.Language.Lang+".") {
+			s = ss
+			break
+		}
+	}
+
+	for _, ss := range sites.Sites {
+		contentDir := ss.PathSpec.ContentDir
+		if !strings.HasSuffix(contentDir, helpers.FilePathSeparator) {
+			contentDir += helpers.FilePathSeparator
+		}
+		if strings.HasPrefix(targetPath, contentDir) {
+			siteContentDir = ss.PathSpec.ContentDir
+			if s == nil {
+				s = ss
+			}
+			break
+		}
+	}
+
+	if s == nil {
+		s = first
+	}
+
+	if targetDir != "" && targetDir != "." {
+		exists, _ := helpers.Exists(targetDir, fs)
+
+		if exists {
+			return targetPath, s
+		}
+	}
+
+	if siteContentDir != "" {
+		pp := filepath.Join(siteContentDir, strings.TrimPrefix(targetPath, siteContentDir))
+		return s.PathSpec.AbsPathify(pp), s
+
+	} else {
+		return s.PathSpec.AbsPathify(filepath.Join(first.PathSpec.ContentDir, targetPath)), s
+	}
+
+}
+
 // 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) {
+func findArchetype(ps *helpers.PathSpec, kind, ext string) (outpath string, isDir bool) {
 	fs := ps.BaseFs.Archetypes.Fs

-	// 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"}
+	var pathsToCheck []string

-	if ext != "" {
-		if kind != "" {
-			pathsToCheck = append([]string{kind + ext, "default" + ext}, pathsToCheck...)
-		} else {
-			pathsToCheck = append([]string{"default" + ext}, pathsToCheck...)
-		}
+	if kind != "" {
+		pathsToCheck = append(pathsToCheck, kind+ext)
 	}
+	pathsToCheck = append(pathsToCheck, "default"+ext, "default")

 	for _, p := range pathsToCheck {
-		if exists, _ := helpers.Exists(p, fs); exists {
-			return p
+		fi, err := fs.Stat(p)
+		if err == nil {
+			return p, fi.IsDir()
 		}
 	}

-	return ""
+	return "", false
 }
@@ -80,7 +80,7 @@ var (
 		"%}x}", "%}}")
 )

-func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFilename string) ([]byte, error) {
+func executeArcheTypeAsTemplate(s *hugolib.Site, name, kind, targetPath, archetypeFilename string) ([]byte, error) {

 	var (
 		archetypeContent  []byte
@@ -88,20 +88,16 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 		err               error
 	)

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

-	f := sp.NewFileInfo("", targetPath, false, nil)
+	if name == "" {
+		name = f.TranslationBaseName()

-	name := f.TranslationBaseName()
-
-	if name == "index" || name == "_index" {
-		// Page bundles; the directory name will hopefully have a better name.
-		dir := strings.TrimSuffix(f.Dir(), helpers.FilePathSeparator)
-		_, name = filepath.Split(dir)
+		if name == "index" || name == "_index" {
+			// Page bundles; the directory name will hopefully have a better name.
+			dir := strings.TrimSuffix(f.Dir(), helpers.FilePathSeparator)
+			_, name = filepath.Split(dir)
+		}
 	}

 	data := ArchetypeFileData{
@@ -35,8 +35,7 @@ import (
 )

 func TestNewContent(t *testing.T) {
-	v := viper.New()
-	initViper(v)
+	assert := require.New(t)

 	cases := []struct {
 		kind     string
@@ -49,6 +48,14 @@ func TestNewContent(t *testing.T) {
 		{"stump", "stump/sample-2.md", []string{`title: "Sample 2"`}},      // no archetype file
 		{"", "sample-3.md", []string{`title: "Sample 3"`}},                 // no archetype
 		{"product", "product/sample-4.md", []string{`title = "SAMPLE-4"`}}, // empty archetype front matter
+		{"lang", "post/lang-1.md", []string{`Site Lang: en|Name: Lang 1|i18n: Hugo Rocks!`}},
+		{"lang", "post/lang-2.en.md", []string{`Site Lang: en|Name: Lang 2|i18n: Hugo Rocks!`}},
+		{"lang", "post/lang-3.nn.md", []string{`Site Lang: nn|Name: Lang 3|i18n: Hugo Rokkar!`}},
+		{"lang", "content_nn/post/lang-4.md", []string{`Site Lang: nn|Name: Lang 4|i18n: Hugo Rokkar!`}},
+		{"lang", "content_nn/post/lang-5.en.md", []string{`Site Lang: en|Name: Lang 5|i18n: Hugo Rocks!`}},
+		{"lang", "post/my-bundle/index.md", []string{`Site Lang: en|Name: My Bundle|i18n: Hugo Rocks!`}},
+		{"lang", "post/my-bundle/index.en.md", []string{`Site Lang: en|Name: My Bundle|i18n: Hugo Rocks!`}},
+		{"lang", "post/my-bundle/index.nn.md", []string{`Site Lang: nn|Name: My Bundle|i18n: Hugo Rokkar!`}},
 		{"shortcodes", "shortcodes/go.md", []string{
 			`title = "GO"`,
 			"{{< myshortcode >}}",
@@ -56,21 +63,20 @@ func TestNewContent(t *testing.T) {
 			"{{</* comment */>}}\n{{%/* comment */%}}"}}, // shortcodes
 	}

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

-		siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
-			return h.Sites[0], nil
+		assert.NoError(create.NewContent(h, c.kind, c.path))
+
+		fname := filepath.FromSlash(c.path)
+		if !strings.HasPrefix(fname, "content") {
+			fname = filepath.Join("content", fname)
 		}
-
-		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)
-		for i, v := range c.expected {
+		for _, v := range c.expected {
 			found := strings.Contains(content, v)
 			if !found {
 				t.Fatalf("[%d] %q missing from output:\n%q", i, v, content)
@@ -79,17 +85,44 @@ func TestNewContent(t *testing.T) {
 	}
 }

-func initViper(v *viper.Viper) {
-	v.Set("metaDataFormat", "toml")
-	v.Set("archetypeDir", "archetypes")
-	v.Set("contentDir", "content")
-	v.Set("themesDir", "themes")
-	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 TestNewContentFromDir(t *testing.T) {
+	assert := require.New(t)
+	cfg, fs := newTestCfg(assert)
+	assert.NoError(initFs(fs))
+
+	archetypeDir := filepath.Join("archetypes", "my-bundle")
+	assert.NoError(fs.Source.Mkdir(archetypeDir, 0755))
+
+	contentFile := `
+File: %s
+Site Lang: {{ .Site.Language.Lang  }} 	
+Name: {{ replace .Name "-" " " | title }}
+i18n: {{ T "hugo" }}
+`
+
+	assert.NoError(afero.WriteFile(fs.Source, filepath.Join(archetypeDir, "index.md"), []byte(fmt.Sprintf(contentFile, "index.md")), 0755))
+	assert.NoError(afero.WriteFile(fs.Source, filepath.Join(archetypeDir, "index.nn.md"), []byte(fmt.Sprintf(contentFile, "index.nn.md")), 0755))
+
+	assert.NoError(afero.WriteFile(fs.Source, filepath.Join(archetypeDir, "pages", "bio.md"), []byte(fmt.Sprintf(contentFile, "bio.md")), 0755))
+	assert.NoError(afero.WriteFile(fs.Source, filepath.Join(archetypeDir, "resources", "hugo1.json"), []byte(`hugo1: {{ printf "no template handling in here" }}`), 0755))
+	assert.NoError(afero.WriteFile(fs.Source, filepath.Join(archetypeDir, "resources", "hugo2.xml"), []byte(`hugo2: {{ printf "no template handling in here" }}`), 0755))
+
+	h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
+	assert.NoError(err)
+	assert.Equal(2, len(h.Sites))
+
+	assert.NoError(create.NewContent(h, "my-bundle", "post/my-post"))
+
+	assertContains(assert, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/resources/hugo1.json")), `hugo1: {{ printf "no template handling in here" }}`)
+	assertContains(assert, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/resources/hugo2.xml")), `hugo2: {{ printf "no template handling in here" }}`)
+
+	// Content files should get the correct site context.
+	// TODO(bep) archetype check i18n
+	assertContains(assert, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/index.md")), `File: index.md`, `Site Lang: en`, `Name: My Post`, `i18n: Hugo Rocks!`)
+	assertContains(assert, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/index.nn.md")), `File: index.nn.md`, `Site Lang: nn`, `Name: My Post`, `i18n: Hugo Rokkar!`)
+
+	assertContains(assert, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/pages/bio.md")), `File: bio.md`, `Site Lang: en`, `Name: My Post`)
+
 }

 func initFs(fs *hugofs.Fs) error {
@@ -132,6 +165,10 @@ title = "{{ .BaseFileName  | upper }}"
 			path:    filepath.Join("archetypes", "emptydate.md"),
 			content: "+++\ndate =\"\"\ntitle = \"Empty Date Arch title\"\ntest = \"test1\"\n+++\n",
 		},
+		{
+			path:    filepath.Join("archetypes", "lang.md"),
+			content: `Site Lang: {{ .Site.Language.Lang  }}|Name: {{ replace .Name "-" " " | title }}|i18n: {{ T "hugo" }}`,
+		},
 		// #3623x
 		{
 			path: filepath.Join("archetypes", "shortcodes.md"),
@@ -166,6 +203,12 @@ Some text.
 	return nil
 }

+func assertContains(assert *require.Assertions, v interface{}, matches ...string) {
+	for _, m := range matches {
+		assert.Contains(v, m)
+	}
+}
+
 // TODO(bep) extract common testing package with this and some others
 func readFileFromFs(t *testing.T, fs afero.Fs, filename string) string {
 	filename = filepath.FromSlash(filename)
@@ -185,22 +228,33 @@ func readFileFromFs(t *testing.T, fs afero.Fs, filename string) string {
 	return string(b)
 }

-func newTestCfg() (*viper.Viper, *hugofs.Fs) {
+func newTestCfg(assert *require.Assertions) (*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")
+	cfg := `
+	
+[languages]
+[languages.en]
+weight = 1
+languageName = "English"
+[languages.nn]
+weight = 2
+languageName = "Nynorsk"
+contentDir = "content_nn"

-	fs := hugofs.NewMem(v)
+`

-	v.SetFs(fs.Source)
+	mm := afero.NewMemMapFs()

-	initViper(v)
+	assert.NoError(afero.WriteFile(mm, filepath.Join("i18n", "en.toml"), []byte(`[hugo]
+other = "Hugo Rocks!"`), 0755))
+	assert.NoError(afero.WriteFile(mm, filepath.Join("i18n", "nn.toml"), []byte(`[hugo]
+other = "Hugo Rokkar!"`), 0755))

-	return v, fs
+	assert.NoError(afero.WriteFile(mm, "config.toml", []byte(cfg), 0755))
+
+	v, _, err := hugolib.LoadConfig(hugolib.ConfigSourceDescriptor{Fs: mm, Filename: "config.toml"})
+	assert.NoError(err)
+
+	return v, hugofs.NewFrom(mm, v)

 }
@@ -76,6 +76,7 @@ type Deps struct {
 	BuildStartListeners *Listeners
 }

+// Listeners represents an event listener.
 type Listeners struct {
 	sync.Mutex

@@ -83,12 +84,14 @@ type Listeners struct {
 	listeners []func()
 }

+// Add adds a function to a Listeners instance.
 func (b *Listeners) Add(f func()) {
 	b.Lock()
 	defer b.Unlock()
 	b.listeners = append(b.listeners, f)
 }

+// Notify executes all listener functions.
 func (b *Listeners) Notify() {
 	b.Lock()
 	defer b.Unlock()
@@ -162,7 +165,7 @@ func New(cfg DepsCfg) (*Deps, error) {
 		return nil, err
 	}

-	resourceSpec, err := resource.NewSpec(ps, logger, cfg.MediaTypes)
+	resourceSpec, err := resource.NewSpec(ps, logger, cfg.OutputFormats, cfg.MediaTypes)
 	if err != nil {
 		return nil, err
 	}
@@ -221,10 +224,14 @@ func (d Deps) ForLanguage(cfg DepsCfg) (*Deps, error) {
 		return nil, err
 	}

-	d.ResourceSpec, err = resource.NewSpec(d.PathSpec, d.Log, cfg.MediaTypes)
+	// 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
@@ -263,6 +270,9 @@ type DepsCfg struct {
 	// The media types configured.
 	MediaTypes media.Types

+	// The output formats configured.
+	OutputFormats output.Formats
+
 	// Template handling.
 	TemplateProvider ResourceProvider
 	WithTemplate     func(templ tpl.TemplateHandler) error
@@ -69,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.45"
+  release = "0.49"
  ## Setting this to true will add a "noindex" to *EVERY* page on the site
  removefromexternalsearch = false
  ## Gh repo for site footer (include trailing slash)
@@ -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/
@@ -28,6 +28,7 @@ toc: true
 Note that:

 * These settings have their defaults setting set to _off_, i.e. how it worked before Hugo `0.41`. You must do your own evaluation of your site and apply the appropriate settings.
+ * These settings work with the [internal templates](/templates/internal/). Some theme may contain custom templates for embedding services like Google Analytics. In that case these options have no effect.
 * We will continue this work and improve this further in future Hugo versions.

 ## All Privacy Settings
@@ -44,7 +44,7 @@ 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]: https://aws.amazon.com/s3/
-[Azure]: https://blogs.msdn.microsoft.com/acoat/2016/01/28/publish-a-static-web-site-using-azure-web-apps/
+[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"
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 title: "hugo"
 slug: hugo
 url: /commands/hugo/
@@ -24,43 +24,40 @@ 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/
+      --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
+      --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
+  -v, --verbose                verbose output
+      --verboseLog             verbose logging
+  -w, --watch                  watch filesystem for changes and recreate as needed
 ```

 ### SEE ALSO
@@ -77,4 +74,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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 title: "hugo benchmark"
 slug: hugo_benchmark
 url: /commands/hugo_benchmark/
@@ -20,38 +20,34 @@ 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/
+      --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
+      --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
 ```

 ### Options inherited from parent commands
@@ -70,4 +66,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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 title: "hugo server"
 slug: hugo_server
 url: /commands/hugo_server/
@@ -30,46 +30,42 @@ 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/
+      --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
+  -p, --port int               port on which the server will listen (default 1313)
+      --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
+  -w, --watch                  watch filesystem for changes and recreate as needed (default true)
 ```

 ### Options inherited from parent commands
@@ -88,4 +84,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 24-Sep-2018
@@ -1,5 +1,5 @@
 ---
-date: 2018-04-16
+date: 2018-09-24
 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 24-Sep-2018
@@ -35,7 +35,7 @@ The above will create a new content file in `content/posts/my-first-post.md` usi
 3. `themes/my-theme/archetypes/posts.md`
 4. `themes/my-theme/archetypes/default.md`

-The last two list items is only applicable if you use a theme and it uses the `my-theme` theme name as an example.
+The last two list items are only applicable if you use a theme and it uses the `my-theme` theme name as an example.

 ## Create a New Archetype Template

@@ -70,6 +70,28 @@ It will create a new newsletter type of content file based on the archetype temp
 The above _newsletter type archetype_ illustrates the possibilities: The full Hugo `.Site` and all of Hugo&#39;s template funcs can be used in the archetype file.


+## Directory based archetypes
+
+Since Hugo `0.49` you can use complete directories as archetype templates. Given this archetype directory:
+
+```bash
+archetypes
+├── default.md
+└── post-bundle
+    ├── bio.md
+    ├── images
+    │   └── featured.jpg
+    └── index.md
+```
+
+```bash
+hugo new --kind post-bundle post/my-post
+```
+
+Will create a new folder in `/content/post/my-post` with the same set of files as in the `post-bundle` archetypes folder. All content files (`index.md` etc.) can contain template logic, and will receive the correct `.Site` for the content's language.
+
+
+
 [archetypes directory]: /getting-started/directory-structure/
 [content types]: /content-management/types/
 [front matter]: /content-management/front-matter/
@@ -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

@@ -55,7 +59,8 @@ There are a few alternatives to commenting on static sites for those who do not
 * [Muut](http://muut.com/)
 * [isso](http://posativ.org/isso/) (Self-hosted, Python)
    * [Tutorial on Implementing Isso with Hugo][issotutorial]
-
+* [Utterances](https://utteranc.es/) (Open source, Github comments widget built on Github issues)
+* [Remark](https://github.com/umputun/remark) (Open source, Golang, Easy to run docker)

 <!-- I don't think this is worth including in the documentation since it seems that Steve is no longer supporting or developing this project. rdwatters - 2017-02-29.-->
 <!-- * [Kaiju](https://github.com/spf13/kaiju) -->
@@ -240,7 +240,7 @@ Markdown syntax is simple enough to learn in a single sitting. The following are
 [mdcheatsheet]: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
 [mdguide]: https://www.markdownguide.org/
 [mdtutorial]: http://www.markdowntutorial.com/
-[Miek Gieben's website]: https://miek.nl/2016/March/05/mmark-syntax-document/
+[Miek Gieben's website]: https://miek.nl/2016/march/05/mmark-syntax-document/
 [mmark]: https://github.com/miekg/mmark
 [mmarkgh]: https://github.com/miekg/mmark/wiki/Syntax
 [org]: http://orgmode.org/
@@ -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
@@ -80,7 +80,7 @@ You can also add entries to menus that aren’t attached to a piece of content.

 Here’s an example snippet pulled from a configuration file:

-{{< code-toggle file="config.toml" >}}
+{{< code-toggle file="config" >}}
 [[menu.main]]
    name = "about hugo"
    pre = "<i class='fa fa-heart'></i>"
@@ -90,6 +90,7 @@ Here’s an example snippet pulled from a configuration file:
 [[menu.main]]
    name = "getting started"
    pre = "<i class='fa fa-road'></i>"
+    post = "<span class='alert'>New!</span>"
    weight = -100
    url = "/getting-started/"
 {{< /code-toggle >}}
@@ -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:
@@ -231,7 +233,7 @@ By setting the `translationKey` front matter param to `about` in all three pages

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

@@ -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.
@@ -14,13 +14,13 @@ aliases: [/content/related/,/related/]
 toc: true
 ---

-{{% note %}}
-We currently do not index **Page content**. We thought we would release something that will make most people happy before we start solving [Sherlock's last case](https://github.com/joearms/sherlock).
-{{% /note %}}
+
+Hugo uses a set of factors to identify a page's related content based on Front Matter parameters. This can be tuned to the desired set of indices and parameters or left to Hugo's default [Related Content configuration](#configure-related-content). 

 ## List Related Content

-To list up to 5 related pages is as simple as including something similar to this partial in your single page template:
+
+To list up to 5 related pages (which share the same _date_ or _keyword_ parameters) is as simple as including something similar to this partial in your single page template: 

 {{< code file="layouts/partials/related.html" >}}
 {{ $related := .Site.RegularPages.Related . | first 5 }}
@@ -34,67 +34,62 @@ To list up to 5 related pages is as simple as including something similar to thi
 {{ end }}
 {{< /code >}}

+### Methods
+
+Here is the list of "Related" methods available on a page collection such `.RegularPages`.
+
+#### .Related PAGE
+Returns a collection of pages related the given one.
+
+```
+{{ $related := .RegularPages.Related . }}
+```
+
+#### .RelatedIndices PAGE INDICE1 [INDICE2 ...]
+Returns a collection of pages related to a given one restricted to a list of indices.
+
+```
+{{ $related := .RegularPages.RelatedIndices . "tags" "date" }}
+```
+
+#### .RelatedTo KEYVALS [KEYVALS2 ...]
+Returns a collection of pages related together by a set of indices and their match. 
+
+In order to build those set and pass them as argument, one must use the `keyVals` function where the first agrument would be the `indice` and the consective ones its potential `matches`.
+
+```
+{{ $related := .RegularPages.RelatedTo ( keyVals "tags" "hugo" "rocks")  ( keyVals "date" .Date ) }}
+```

 {{% note %}}
 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 be seen in this Go interface:
-
-```go
-// A PageGenealogist finds related pages in a page collection. This interface is implemented
-// by Pages and PageGroup, which makes it available as `{{ .RegularPages.Related . }}` etc.
-type PageGenealogist interface {
-
-	// Template example:
-	// {{ $related := .RegularPages.Related . }}
-	Related(doc related.Document) (Pages, error)
-
-	// Template example:
-	// {{ $related := .RegularPages.RelatedIndices . "tags" "date" }}
-	RelatedIndices(doc related.Document, indices ...interface{}) (Pages, error)
-
-	// Template example:
-	// {{ $related := .RegularPages.RelatedTo ( keyVals "tags" "hugo" "rocks")  ( keyVals "date" .Date ) }}
-	RelatedTo(args ...types.KeyValues) (Pages, error)
-}
-```
 ## Configure Related Content
 Hugo provides a sensible default configuration of Related Content, but you can fine-tune this in your configuration, on the global or language level if needed.

+### Default configuration
+
+Without any `related` configuration set on the project, Hugo's Related Content methods will use the following.
+
+```yaml
+related:
+  threshold: 80
+  includeNewer: false
+  toLower: false
+  indices:
+  - name: keywords
+    weight: 100
+  - name: date
+    weight: 10
+```
+
+Custom configuration should be set using the same syntax.
+
 {{% note %}}
 If you add a `related` config section, you need to add a complete configuration. It is not possible to just set, say, `includeNewer` and use the rest  from the Hugo defaults.
 {{% /note %}}

-Below is a sample `config.toml` section:
-
-```
-[related]
-
-# Only include matches with rank >= threshold. This is a normalized rank between 0 and 100.
-threshold = 80
-
-# To get stable "See also" sections we, by default, exclude newer related pages.
-includeNewer = false
-
-# Will lower case keywords in both queries and in the indexes.
-toLower = false
-
-[[related.indices]]
-name = "keywords"
-weight = 150
-[[related.indices]]
-name  = "author"
-toLower = true
-weight = 30
-[[related.indices]]
-name  = "tags"
-weight = 100
-[[related.indices]]
-name  = "date"
-weight = 10
-pattern = "2006"
-```
 ### Top Level Config Options

 threshold
@@ -135,9 +130,6 @@ He should now be able to add an improved version of that "Related Content" secti
 * If you don't use any of the `Related` methods, you will not use the Relate Content feature, and performance will be the same as before.
 * Calling `.RegularPages.Related` etc. will create one inverted index, also sometimes named posting list, that will be reused for any lookups in that same page collection. Doing that in addition to, as an example, calling `.Pages.Related` will work as expected, but will create one additional inverted index. This should still be very fast, but worth having in mind, especially for bigger sites.

-
-
-
-
-
-
+{{% note %}}
+We currently do not index **Page content**. We thought we would release something that will make most people happy before we start solving [Sherlock's last case](https://github.com/joearms/sherlock).
+{{% /note %}}
@@ -21,32 +21,40 @@ With the use of the `.Summary` [page variable][pagevariables], Hugo generates su

 ## Summary Splitting Options

-* Hugo-defined Summary Split
-* User-defined Summary Split
+* Automatic Summary Split
+* Manual Summary Split

 It is natural to accompany the summary with links to the original content, and a common design pattern is to see this link in the form of a "Read More ..." button. See the `.RelPermalink`, `.Permalink`, and `.Truncated` [page variables][pagevariables].

-### Hugo-defined: Automatic Summary Splitting
+### Automatic Summary Splitting

-By default, Hugo automatically takes the first 70 words of your content as its summary and stores it into the `.Summary` page variable for use in your templates. Taking the Hugo-defined approach to summaries may save time, but it has pros and cons:
-
-* **Pros:** Automatic, no additional work on your part.
-* **Cons:** All HTML tags are stripped from the summary, and the first 70 words, whether they belong to a heading or to different paragraphs, are all put into one paragraph.
+By default, Hugo automatically takes the first 70 words of your content as its summary and stores it into the `.Summary` page variable for use in your templates. You may customize the summary length by setting `summaryLength` in your [site configuration](/getting-started/configuration/).

 {{% note %}}
-The Hugo-defined summaries are set to use word count calculated by splitting the text by one or more consecutive white space characters. If you are creating content in a `CJK` language and want to use Hugo's automatic summary splitting, set `hasCJKLanguage` to `true` in you [site configuration](/getting-started/configuration/).
+You can customize how HTML tags in the summary are loaded using functions such as `plainify` and `safeHTML`.
 {{% /note %}}

-### User-defined: Manual Summary Splitting
+{{% note %}}
+The Hugo-defined summaries are set to use word count calculated by splitting the text by one or more consecutive whitespace characters. If you are creating content in a `CJK` language and want to use Hugo's automatic summary splitting, set `hasCJKLanguage` to `true` in your [site configuration](/getting-started/configuration/).
+{{% /note %}}

-Alternatively, you may add the <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> summary divider where you want to split the article. For [org content][org], use `# more` where you want to split the article. Content that comes before the summary divider will be used as that content's summary and stored in the `.Summary` page variable with all HTML formatting intact.
+### Manual Summary Splitting
+
+Alternatively, you may add the <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> summary divider where you want to split the article. 
+
+For [Org mode content][org], use `# more` where you want to split the article. 
+
+Content that comes before the summary divider will be used as that content's summary and stored in the `.Summary` page variable with all HTML formatting intact.

 {{% note "Summary Divider"%}}
 The concept of a *summary divider* is not unique to Hugo. It is also called the "more tag" or "excerpt separator" in other literature.
 {{% /note %}}

-* Pros: Freedom, precision, and improved rendering.  All HTML tags and formatting are preserved.
-* Cons: Extra work for content authors, since they need to remember to type <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> (or `# more` for [org content][org]) in each content file. This can be automated by adding the summary divider below the front matter of an [archetype](/content-management/archetypes/).
+Pros
+: Freedom, precision, and improved rendering.  All HTML tags and formatting are preserved.
+
+Cons
+: Extra work for content authors, since they need to remember to type <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> (or `# more` for [org content][org]) in each content file. This can be automated by adding the summary divider below the front matter of an [archetype](/content-management/archetypes/).

 {{% warning "Be Precise with the Summary Divider" %}}
 Be careful to enter <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> exactly; i.e., all lowercase and with no whitespace.
@@ -139,7 +139,7 @@ If you want to disable all taxonomies altogether, see the use of `disableKinds`

 By default, taxonomy names are normalized.

-Therefore, if you want to have a taxonomy term with special characters such as `Gérard Depardieu` instead of `Gerard Depardieu`, set the value for `preserveTaxonomyNames` to `true` in your [site config][config]. Hugo will then preserve special characters in taxonomy values but will still title-ize the values for titles and normalize them in URLs.
+Therefore, if you want to have a taxonomy term with special characters such as `Gérard Depardieu` instead of `Gerard Depardieu`, set the value for `preserveTaxonomyNames` to `true` in your [site config][config]. Hugo will then preserve special characters in taxonomy values but will still normalize them in URLs.

 Note that if you use `preserveTaxonomyNames` and intend to manually construct URLs to the archive pages, you will need to pass the taxonomy values through the [`urlize` template function][].

@@ -149,6 +149,12 @@ You can add content and front matter to your taxonomy list and taxonomy terms pa
 Much like regular pages, taxonomy list [permalinks](/content-management/urls/) are configurable, but taxonomy term page permalinks are not.
 {{% /note %}}

+{{% warning "`preserveTaxonomyNames` behaviour change" %}}
+Before 0.49, Hugo would make the first character upper case for the taxonomy values for titles even if `preserveTaxonomyNames` was active. This no longer the case, which (for instance) makes it possible to have fully lower-case values.
+
+If you actually need to title-ize these values, you can do so using the `strings.FirstUpper` template function.
+{{% /warning %}}
+
 ## Add Taxonomies to Content

 Once a taxonomy is defined at the site level, any piece of content can be assigned to it, regardless of [content type][] or [content section][].
@@ -13,7 +13,7 @@ menu:
    weight: 130
 weight: 130	#rem
 draft: false
-aliases: [/extras/toc/,/content-management/toc/]
+aliases: [/extras/toc/]
 toc: true
 ---

@@ -15,7 +15,6 @@ menu:
 weight: 10
 sections_weight: 10
 draft: false
-aliases: [/contribute/development/]
 toc: true
 ---

@@ -94,15 +94,15 @@ Code blocks are crucial for providing examples of Hugo's new features to end use

 ### Standard Syntax

-Across all pages on the Hugo docs, the typical triple-back-tick markdown syntax is used. If you do not want to take the extra time to implement the following code block shortcodes, please use standard GitHub-flavored markdown. The Hugo docs use a version of [highlight.js](https://highlightjs.org/) with a specific set of languages.
+Across many pages on the Hugo docs, the typical triple-back-tick markdown syntax (```` ``` ````) is used. If you do not want to take the extra time to implement the following code block shortcodes, please use standard GitHub-flavored markdown. The Hugo docs use a version of [highlight.js](https://highlightjs.org/) with a specific set of languages.

 Your options for languages are `xml`/`html`, `go`/`golang`, `md`/`markdown`/`mkd`, `handlebars`, `apache`, `toml`, `yaml`, `json`, `css`, `asciidoc`, `ruby`, `powershell`/`ps`, `scss`, `sh`/`zsh`/`bash`/`git`, `http`/`https`, and `javascript`/`js`.

-```
+````
 ```
 <h1>Hello world!</h1>
 ```
-```
+````

 ### Code Block Shortcode

@@ -118,14 +118,13 @@ With the `code` shortcodes, *you must include triple back ticks and a language d

 ```
 {{%/* code file="smart/file/name/with/path.html" download="download.html" copy="true" */%}}
-```
 A whole bunch of coding going on up in here!
-```
 {{%/* /code */%}}
 ```

 The following are the arguments passed into `code`:

+
 ***`file`***
 : the only *required* argument. `file` is needed for styling but also plays an important role in helping users create a mental model around Hugo's directory structure. Visually, this will be displayed as text in the top left of the code block.

@@ -194,10 +193,8 @@ The `output` shortcode is almost identical to the `code` shortcode but only take

 ```
 {{%/* output file="post/my-first-post/index.html" */%}}
-```
 <h1>This is my First Hugo Blog Post</h1>
 <p>I am excited to be using Hugo.</p>
-```
 {{%/* /output */%}}
 ```

@@ -31,7 +31,7 @@ aliases: []

 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.

-To fund a regular page in the blog section::
+To find a regular page in the blog section::

 ```go-html-template
 {{ with .Site.GetPage "/blog/my-post.md" }}{{ .Title }}{{ end }}
@@ -0,0 +1,38 @@
+---
+title: append
+description: "`append` appends one or more values to a slice and returns the resulting slice."
+date: 2018-09-14
+categories: [functions]
+menu:
+  docs:
+    parent: "functions"
+keywords: [collections]
+signature: ["COLLECTION | append VALUE [VALUE]...", "COLLECTION | append COLLECTION"]
+workson: []
+hugoversion: "0.49"
+relatedfuncs: [last,first,where,slice]
+aliases: []
+---
+
+An example appending single values:
+
+```go-html-template
+{{ $s := slice "a" "b" "c" }}
+{{ $s = $s | append "d" "e" }}
+{{/* $s now contains a []string with elements "a", "b", "c", "d", and "e" */}}
+
+```
+
+The same example appending a slice to a slice:
+
+
+```go-html-template
+{{ $s := slice "a" "b" "c" }}
+{{ $s = $s | append (slice "d" "e") }}
+```
+
+The `append` function works for all types, including `Pages`.
+
+
+
+
@@ -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.
@@ -15,7 +15,6 @@ workson: []
 hugoversion:
 relatedfuncs: [countrunes]
 deprecated: false
-aliases: [/functions/countwords/]
 ---

 The template function works similar to the [.WordCount page variable][pagevars].
@@ -18,11 +18,11 @@ hugoversion:
 relatedfuncs: []
 deprecated: false
 draft: false
-aliases: [/functions/default/]
+aliases: []
 needsexamples: false
 ---

-`default` checks whether a given value is set and returns a default value if it is not. *Set* in this context means different things depending on date type:
+`default` checks whether a given value is set and returns a default value if it is not. *Set* in this context means different things depending on the data type:

 * non-zero for numeric types and times
 * non-zero length for strings, arrays, slices, and maps
@@ -25,3 +25,5 @@ aliases: []
    {{ .Render "summary" }}
 {{ end }}
 ```
+
+*Note: Exclusive to `first`, LIMIT can be '0' to return an empty array.*
@@ -0,0 +1,37 @@
+---
+title: group
+description: "`group` groups a list of pages."
+date: 2018-09-14
+categories: [functions]
+menu:
+  docs:
+    parent: "functions"
+keywords: [collections]
+signature: ["PAGES | group KEY"]
+hugoversion: "0.49"
+---
+
+{{< code file="layouts/partials/groups.html" >}}
+{{ $new := .Site.RegularPages | first 10 | group "New" }}
+{{ $old := .Site.RegularPages | last 10 | group "Old" }}
+{{ $groups := slice $new $old }}
+{{ range $groups }}
+<h3>{{ .Key }}{{/* Prints "New", "Old" */}}</h3>
+<ul>
+    {{ range .Pages }}
+    <li>
+    <a href="{{ .Permalink }}">{{ .Title }}</a>
+    <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>
+    </li>
+    {{ end }}
+</ul>
+{{ end }}
+{{< /code >}}
+
+
+
+The page group you get from `group` is of the same type you get from the built-in [group methods](/templates/lists#group-content) in Hugo. The above example can even be [paginated](/templates/pagination/#list-paginator-pages).
+
+
+
+
@@ -19,27 +19,7 @@ deprecated: false
 aliases: []
 ---

-The elements supported are strings, integers, and floats (only float64).
-
-A useful example of `intersect` functionality is a "related posts" block. `isset` allows us to create a list of links to other posts that have tags that intersect with the tags in the current post.
-
-The following is an example of a "related posts" [partial template][partials] that could be added to a [single page template][single]:
-
-{{< code file="layouts/partials/related-posts.html" download="related-posts.html" >}}
-<ul>
-{{ $page_link := .Permalink }}
-{{ $tags := .Params.tags }}
-{{ range .Site.Pages }}
-    {{ $page := . }}
-    {{ $has_common_tags := intersect $tags .Params.tags | len | lt 0 }}
-    {{ if and $has_common_tags (ne $page_link $page.Permalink) }}
-        <li><a href="{{ $page.Permalink }}">{{ $page.Title }}</a></li>
-    {{ end }}
-{{ end }}
-</ul>
-{{< /code >}}
-
-This is also very useful to use as `AND` filters when combined with where:
+An useful example is to use it as `AND` filters when combined with where:

 ```
 {{ $pages := where .Site.RegularPages "Type" "not in" (slice "page" "about") }}
@@ -0,0 +1,33 @@
+---
+title: os.Stat
+description: Gets a file information of a given path.
+godocref:
+date: 2018-08-07
+publishdate: 2018-08-07
+lastmod: 2018-08-07
+categories: [functions]
+menu:
+  docs:
+    parent: "functions"
+keywords: [files]
+signature: ["os.Stat PATH"]
+workson: []
+hugoversion:
+relatedfuncs: [readDir]
+deprecated: false
+aliases: []
+---
+
+If your current project working directory has a single file named `README.txt` (30 bytes):
+```
+{{ $stat := os.Stat "README.txt" }}
+{{ $stat.Name }} → "README.txt"
+{{ $stat.Size }} → 30
+```
+
+Function [`os.Stat`][Stat] returns [`os.FileInfo`][osfileinfo].
+For further information of `os.FileInfo`, see [golang page][osfileinfo].
+
+
+[Stat]: /functions/os.Stat/
+[osfileinfo]: https://golang.org/pkg/os/#FileInfo
@@ -42,7 +42,7 @@ $scratch := newScratch
 $scratch.Set "greeting" "Hello"
 ```

-A `Scratch` is also added to both `Page` and `Shortcode`. `Sratch` have the following methods:
+A `Scratch` is also added to both `Page` and `Shortcode`. `Scratch` has the following methods:

 #### .Set

@@ -15,6 +15,10 @@ toc: true
 This is an example for the Config Toggle shortcode. 
 Its purpose is to let users choose a Config language by clicking on its corresponding tab. Upon doing so, every Code toggler on the page will be switched to the target language. Also, target language will be saved in user's `localStorage` so when they go to a different pages, Code Toggler display their last "toggled" config language.

+{{% note %}}
+The `code-toggler` shortcode is not an internal Hugo shortcode. This page's purpose is to test out a custom feature that we use throughout this site. See: https://github.com/gohugoio/gohugoioTheme/blob/master/layouts/shortcodes/code-toggle.html
+{{% /note %}}
+
 ## That Config Toggler

 {{< code-toggle file="config">}}
@@ -44,6 +44,9 @@ config file(s).
 archetypeDir ("archetypes")
 : The directory where Hugo finds archetype files (content templates).

+assetDir ("assets")
+: The directory where Hugo finds asset files used in [Hugo Pipes](/hugo-pipes/).
+
 baseURL
 : Hostname (and path) to the root, e.g. http://bep.is/

@@ -320,8 +323,8 @@ The default configuration is:

 ```toml
 [frontmatter]
-date = ["date","publishDate", "lastmod"]
-lastmod = [":git" "lastmod", "date","publishDate"]
+date = ["date", "publishDate", "lastmod"]
+lastmod = [":git", "lastmod", "date", "publishDate"]
 publishDate = ["publishDate", "date"]
 expiryDate = ["expiryDate"]
 ```
@@ -330,7 +333,7 @@ If you, as an example, have a non-standard date parameter in some of your conten

 ```toml
 [frontmatter]
-date = [ "myDate", ":default"]
+date = ["myDate", ":default"]
 ```

 The `:default` is a shortcut to the default settings. The above will set `.Date` to the date value in `myDate` if present, if not we will look in `date`,`publishDate`, `lastmod` and pick the first valid date.
@@ -347,7 +350,7 @@ An example:

 ```toml
 [frontmatter]
-lastmod = ["lastmod" ,":fileModTime", ":default"]
+lastmod = ["lastmod", ":fileModTime", ":default"]
 ```


@@ -355,7 +358,7 @@ The above will try first to extract the value for `.Lastmod` starting with the `


 `:filename`
-: Fetches the date from the content file's filename. For example, `218-02-22-mypage.md` will extract the date `218-02-22`. Also, if `slug` is not set, `mypage` will be used as the value for `.Slug`.
+: Fetches the date from the content file's filename. For example, `2018-02-22-mypage.md` will extract the date `2018-02-22`. Also, if `slug` is not set, `mypage` will be used as the value for `.Slug`.

 An example:

@@ -27,6 +27,7 @@ Running the `hugo new site` generator from the command line will create a direct
 ```
 .
 ├── archetypes
+├── assets
 ├── config.toml
 ├── content
 ├── data
@@ -44,6 +45,9 @@ The following is a high-level overview of each of the directories with links to
 : You can create new content files in Hugo using the `hugo new` command.
 By default, Hugo will create new content files with at least `date`, `title` (inferred from the file name), and `draft = true`. This saves time and promotes consistency for sites using multiple content types. You can create your own [archetypes][] with custom preconfigured front matter fields as well.

+[`assets`][]
+: Stores all the files which need be processed by [Hugo Pipes]({{< ref "/hugo-pipes" >}}). Only the files whose `.Permalink` or `.RelPermalink` are used will be published to the `public` directory.
+
 [`config.toml`](/getting-started/configuration/)
 : Every Hugo project should have a configuration file in TOML, YAML, or JSON format at the root. Many sites may need little to no configuration, but Hugo ships with a large number of [configuration directives][] for more granular directions on how you want Hugo to build your website.

@@ -58,16 +62,12 @@ used by Hugo when generating your website. You can write these files in YAML, JS
 : Stores templates in the form of `.html` files that specify how views of your content will be rendered into a static website. Templates include [list pages][lists], your [homepage][], [taxonomy templates][], [partials][], [single page templates][singles], and more.

 [`static`][]
-: Stores all the static content for your future website: images, CSS, JavaScript, etc. When Hugo builds your site, all assets inside your static directory are copied over as-is. A good example of using the `static` folder is for [verifying site ownership on Google Search Console][searchconsole], where you want Hugo to copy over a complete HTML file without modifying its content.
+: Stores all the static content: images, CSS, JavaScript, etc. When Hugo builds your site, all assets inside your static directory are copied over as-is. A good example of using the `static` folder is for [verifying site ownership on Google Search Console][searchconsole], where you want Hugo to copy over a complete HTML file without modifying its content.

 {{% note %}}
 From **Hugo 0.31** you can have multiple static directories.
 {{% /note %}}

-{{% note %}}
-Hugo does not currently ship with an asset pipeline ([#3207](https://github.com/gohugoio/hugo/issues/3207)). You can solicit support from the community in the [Hugo forums](https://discourse.gohugo.io) or check out a few of the [Hugo starter kits](/tools/starter-kits/) for examples of how Hugo developers are managing static assets.
-{{% /note %}}
-

 [archetypes]: /content-management/archetypes/
 [configuration directives]: /getting-started/configuration/#all-variables-yaml
@@ -87,3 +87,4 @@ Hugo does not currently ship with an asset pipeline ([#3207](https://github.com/
 [taxonomies]: /content-management/taxonomies/
 [taxonomy templates]: /templates/taxonomy-templates/
 [types]: /content-management/types/
+[`assets`]: {{< ref "/hugo-pipes/introduction#asset-directory" >}}
@@ -34,7 +34,7 @@ Hugo currently provides pre-built binaries for the following:
 * OpenBSD
 * FreeBSD

-Hugo may also be compiled from source wherever the Go compiler tool chain can run; e.g., on other operating systems such as DragonFly BSD, OpenBSD, Plan&nbsp;9, Solaris, and others. See <https://golang.org/doc/install/source> for the full set of supported combinations of target operating systems and compilation architectures.
+Hugo may also be compiled from source wherever the Go toolchain can run; e.g., on other operating systems such as DragonFly BSD, OpenBSD, Plan&nbsp;9, Solaris, and others. See <https://golang.org/doc/install/source> for the full set of supported combinations of target operating systems and compilation architectures.

 ## Quick Install

@@ -62,29 +62,35 @@ If you are on a Windows machine and use [Chocolatey][] for package management, y
 choco install hugo -confirm
 {{< /code >}}

+### Scoop (Windows)
+
+If you are on a Windows machine and use [Scoop][] for package management, you can install Hugo with the following one-liner:
+
+```bash
+scoop install hugo
+```
+
 ### Source

 #### Prerequisite Tools

 * [Git][installgit]
-* [Go (latest or previous version)][installgo]
-
-#### Vendored Dependencies
-
-Hugo uses [dep][] to vendor dependencies, but we don't commit the vendored packages themselves to the Hugo git repository. Therefore, a simple `go get` is *not* supported because the command is not vendor aware.
-
-The simplest way is to use [mage][] (a Make alternative for Go projects.)
+* [Go (at least Go 1.11)](https://golang.org/dl/)

 #### Fetch from GitHub

+Since Hugo 0.48, Hugo uses the Go Modules support built into Go 1.11 to build. The easiest way to get started is to clone Hugo in a directory outside of the GOPATH, as in the following example:
+
 {{< code file="from-gh.sh" >}}
-go get github.com/magefile/mage
-go get -d github.com/gohugoio/hugo
-cd ${GOPATH:-$HOME/go}/src/github.com/gohugoio/hugo
-mage vendor
-mage install
+mkdir $HOME/src
+cd $HOME/src
+git clone https://github.com/gohugoio/hugo.git
+cd hugo
+go install
 {{< /code >}}

+Remove `HUGO_BUILD_TAGS=extended` if you do not want Sass/SCSS support.
+
 {{% note %}}
 If you are a Windows user, substitute the `$HOME` environment variable above with `%USERPROFILE%`.
 {{% /note %}}
@@ -333,7 +339,7 @@ You'll need a place to store the Hugo executable, your [content][], and the gene
 3. Find the Windows files near the bottom (they're in alphabetical order, so Windows is last) – download either the 32-bit or 64-bit file depending on whether you have 32-bit or 64-bit Windows. (If you don't know, [see here](https://esupport.trendmicro.com/en-us/home/pages/technical-support/1038680.aspx).)
 4. Move the ZIP file into your `C:\Hugo\bin` folder.
 5. Double-click on the ZIP file and extract its contents. Be sure to extract the contents into the same `C:\Hugo\bin` folder – Windows will do this by default unless you tell it to extract somewhere else.
-6. You should now have three new files: hugo executable (e.g. `hugo_0.18_windows_amd64.exe`), `license.md`, and `readme.md`. (You can delete the ZIP download now.) Rename that hugo executable (`hugo_hugo-version_platform_arch.exe`) to `hugo.exe` for ease of use.
+6. You should now have three new files: The hugo executable (`hugo.exe`), `LICENSE`, and `README.md`.

 Now you need to add Hugo to your Windows PATH settings:

@@ -420,62 +426,62 @@ Directory of C:\hugo\sites\example.com

 ### Snap Package

-In any of the [Linux distributions that support snaps][snaps]:
+In any of the [Linux distributions that support snaps][snaps], you may install install the "extended" Sass/SCSS version with this command:

-```
-snap install hugo
-```
+    snap install hugo --channel=extended

-### Debian and Ubuntu
+To install the non-extended version without Sass/SCSS support:

-Debian and Ubuntu provide a `hugo` version via `apt-get`:
+    snap install hugo

-```
-sudo apt-get install hugo
-```
-
-#### Pros
-
-* Native Debian/Ubuntu package maintained by Debian Developers
-* Pre-installed bash completion script and `man` pages
-
-#### Cons
-
-* Might not be the latest version, especially if you are using an older, stable version (e.g., Ubuntu 16.04 LTS). Until backports and PPA are available, you may consider installing the Hugo snap package to get the latest version of Hugo.
+To switch between the two, use either `snap refresh hugo --channel=extended` or `snap refresh hugo --channel=stable`.

 {{% note %}}
 Hugo-as-a-snap can write only inside the user’s `$HOME` directory---and gvfs-mounted directories owned by the user---because of Snaps’ confinement and security model. More information is also available [in this related GitHub issue](https://github.com/gohugoio/hugo/issues/3143). Use ```sudo snap install hugo --classic``` to disable the default security model if you want hugo to be able to have write access in other paths besides the user’s `$HOME` directory.
 {{% /note %}}

+### Debian and Ubuntu
+
+[@anthonyfok](https://github.com/anthonyfok) and friends in the [Debian Go Packaging Team](https://go-team.pages.debian.net/) maintains an official hugo [Debian package](https://packages.debian.org/hugo) which is shared with [Ubuntu](https://packages.ubuntu.com/hugo) and is installable via `apt-get`:
+
+    sudo apt-get install hugo
+
+This installs the "extended" Sass/SCSS version.
+
 ### Arch Linux

-You can also install Hugo from the Arch Linux [community](https://www.archlinux.org/packages/community/x86_64/hugo/) repository. Applies also for derivatives such as Manjaro.
+You can also install Hugo from the Arch Linux [community](https://www.archlinux.org/packages/community/x86_64/hugo/) repository. Applies also to derivatives such as Manjaro.

 ```
 sudo pacman -Syu hugo
 ```

-### Fedora
+### Fedora, Red Hat and CentOS

-Fedora provides a package for Hugo. The installation is done with the command :
+Fedora maintains an [official package for Hugo](https://apps.fedoraproject.org/packages/hugo) which may be installed with:

-```
-sudo dnf install hugo
-```
+    sudo dnf install hugo

-### CentOS, and Red Hat
+For the latest version, the Hugo package maintained by [@daftaupe](https://github.com/daftaupe) at Fedora Copr is recommended:

 * <https://copr.fedorainfracloud.org/coprs/daftaupe/hugo/>

 See the [related discussion in the Hugo forums][redhatforum].

+### Solus
+
+Solus includes Hugo in its package repository, it may be installed with:
+
+```
+sudo eopkg install hugo
+```
+
 ## OpenBSD

-OpenBSD provides a package for Hugo via `pkg_add`: 
+OpenBSD provides a package for Hugo via `pkg_add`:
+
+    doas pkg_add hugo

-```
-doas pkg_add hugo
-```

 ## Upgrade Hugo

@@ -506,6 +512,7 @@ Now that you've installed Hugo, read the [Quick Start guide][quickstart] and exp
 [quickstart]: /getting-started/quick-start/
 [redhatforum]: https://discourse.gohugo.io/t/solved-fedora-copr-repository-out-of-service/2491
 [releases]: https://github.com/gohugoio/hugo/releases
+[Scoop]: https://scoop.sh/
 [snaps]: http://snapcraft.io/docs/core/install
 [windowsarch]: https://esupport.trendmicro.com/en-us/home/pages/technical-support/1038680.aspx
 [Windows Environment Variables Editor]: http://eveditor.com/
@@ -127,7 +127,7 @@ theme = "ananke"
 Replace the `title` above with something more personal. Also, if you already have a domain ready, set the `baseURL`. Note that this value is not needed when running the local development server. 

 {{% note %}}
-**Tip:** Make the changes to the site configuration or any other file in your site while the Hugo server is running, and you will see the changes in the browser right away.
+**Tip:** Make the changes to the site configuration or any other file in your site while the Hugo server is running, and you will see the changes in the browser right away, though you may need to [clear your cache](https://kb.iu.edu/d/ahic).
 {{% /note %}}


@@ -128,7 +128,7 @@ git push -u origin master

 ## Set Up Wercker

-To sign up for a free Wercker account, go to <https://wercker.com> and click the **Sign Up** button on the top right of the home screen.
+To sign up for a free Wercker account, go to <https://www.wercker.com> and click the **Sign Up** button on the top right of the home screen.

 ![][3]

@@ -24,7 +24,7 @@ toc: true
 ## Assumptions

 * You have an account with GitHub, GitLab, or Bitbucket.
-* You have completed the [Quick Start][] or have Hugo website you are ready to deploy and share with the world.
+* You have completed the [Quick Start][] or have a Hugo website you are ready to deploy and share with the world.
 * You do not already have a Netlify account.

 ## Create a Netlify account
@@ -59,7 +59,7 @@ Select the repo you want to use for continuous deployment. If you have a large n

 Once selected, you'll be brought to a screen for basic setup. Here you can select the branch you wanted published, your [build command][], and your publish (i.e. deploy) directory. The publish directory should mirror that of what you've set in your [site configuration][config], the default of which is `public`. The following steps assume you are publishing from the `master` branch.

-## Configure Hugo Version in Netlify 
+## Configure Hugo Version in Netlify

 You can [set Hugo version](https://www.netlify.com/blog/2017/04/11/netlify-plus-hugo-0.20-and-beyond/) for your environments in `netlify.toml` file or set `HUGO_VERSION` as a build environment variable in the Netlify console.

@@ -80,7 +80,7 @@ For testing:
 The Netlify configuration file can be a little hard to understand and get right for the different environment, and you may get some inspiration and tips from this site's `netlify.toml`:

 {{< code file="netlify.toml" nocode="true" >}}
-{{< readfile file="netlify.toml" highlight="toml" >}}   
+{{< readfile file="netlify.toml" highlight="toml" >}}
 {{< /code >}}

 ## Build and Deploy Site
@@ -43,7 +43,7 @@ For improved readability, the Hugo Pipes examples of this documentation will be
 ### Method aliases

 Each Hugo Pipes `resources` transformation method uses a __camelCased__ alias (`toCSS` for `resources.ToCSS`).
-Non-transformation methods deprived of such aliases are `resources.Get`, `resources.FromString` and `resources.ExecuteAsTemplate`.
+Non-transformation methods deprived of such aliases are `resources.Get`, `resources.FromString`, `resources.ExecuteAsTemplate` and `resources.Concat`.

 The example above can therefore also be written as follows:
 ```go-html-template
@@ -27,7 +27,9 @@ The resource will be processed using the project's or theme's own `postcss.confi
 ```

 {{% note %}}
-Hugo Pipe's PostCSS requires `postcss-cli` javascript package to be installed on the environement along with any PostCSS plugin used.
+Hugo Pipe's PostCSS requires the `postcss-cli` JavaScript package to be installed in the environment (`npm install -g postcss-cli`) along with any PostCSS plugin(s) used (e.g., `npm install -g autoprefixer`).
+
+If you are using the Hugo Snap package, PostCSS and plugin(s) need to be installed locally within your Hugo site directory, e.g., `npm install postcss-cli` without the `-g` flag.
 {{% /note %}}
 ### Options

@@ -36,7 +36,14 @@ precision [int]
 enableSourceMap [bool]
 : When enabled, a source map will be generated.

+includePaths [string slice]
+: Additional SCSS/SASS include paths. Paths must be relative to the project directory.
+
 ```go-html-template
-{{ $options := (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true) }}
+{{ $options := (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true "includePaths" (slice "node_modules/myscss")) }}
 {{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }}
-```
+```
+
+{{% note %}}
+Setting `outputStyle` to `compressed` will handle SASS/SCSS files minification better than the more generic [`resources.Minify`]({{< ref "minification">}}).
+{{% /note %}}
@@ -1,8 +1,8 @@

 ---
 date: 2018-07-22
-title: "0.45"
-description: "0.45"
+title: "Hugo 0.45: Revival of ref, relref and GetPage"
+description: "Hugo 0.45 adds relative page lookups, language support in ref/relref and several Hugo Pipes improvements."
 categories: ["Releases"]
 ---

@@ -15,7 +15,7 @@ Now you can simply do:
 {{ with .Site.GetPage "/blog/my-post.md" }}{{ .Title }}{{ end }}
 ```

-Or two get a section page:
+Or to get a section page:


 ```go-html-template
@@ -0,0 +1,26 @@
+
+---
+date: 2018-07-25
+title: "Hugo 0.45.1: Two Bug Fixes"
+description: "Hugo 0.45.1 comes with two bug fixes ... and one enhancement."
+categories: ["Releases"]
+images:
+- images/blog/hugo-bug-poster.png
+
+---
+
+	This is a bug-fix release with a couple of important fixes (and one enhancement).
+
+## Enhancements
+
+* Add Page.FirstSection [016dd4a6](https://github.com/gohugoio/hugo/commit/016dd4a69a765061bb3da8490d3cac6ec47a91eb) [@bep](https://github.com/bep) 
+
+## Fixes
+
+* Fix .Site.GetPage regression [04d4c08d](https://github.com/gohugoio/hugo/commit/04d4c08dbcac08ff7feeb88863e91799fed0937b) [@bep](https://github.com/bep) [#4989](https://github.com/gohugoio/hugo/issues/4989)
+* Fix "borrow content from another language" issue [c6b599a0](https://github.com/gohugoio/hugo/commit/c6b599a06d66b8e3c92343d25bb8043eb4f291f1) [@bep](https://github.com/bep) [#4986](https://github.com/gohugoio/hugo/issues/4986)
+
+
+
+
+
@@ -0,0 +1,49 @@
+
+---
+date: 2018-08-01
+title: "The Summer of Hugo"
+description: "Hugo 0.46: Full SCSS/SASS import inheritance support, rework of Hugo Pipes vs. multilingual, and more …"
+categories: ["Releases"]
+---
+
+	**Hugo 0.46** is the closing credits to **The Summer of Hugo**. While most people have been relaxing on the beach, Hugo has been really busy: 
+
+* **0.42, June 12, 2018**: [Theme Composition and Inheritance!](https://gohugo.io/news/0.42-relnotes/)
+* **0.43, July 9, 2018**: [Hugo Pipes!](https://gohugo.io/news/0.43-relnotes/)
+
+This was followed by some more technical follow-up releases. And today, when July has turned into August, we come with another one. It's not a big release. But with the big interest in **Hugo Pipes**, we felt that it was important to get this out there sooner rather than later.
+
+There are two main items in this release:
+
+1. We have added a custom SCSS/SASS import resolver that respects Hugo's project/themes filesystem hierarchy anywhere in `/assets`. Using the LibSass' resolver alone only made this work for the entry folder.
+2. Resources fetched via `resources.Get` and similar are now language agnostic. The thought behind the original implementation was maximum flexibility with support for `assetDir` per language. In practice, this was a bad idea, as it made some CSS imports hard to get working in multilingual setups, and you got duplication of identical content for no good reason, with added processing time.
+
+This release represents **12 contributions by 2 contributors** to the main Hugo code base.
+
+A special thanks in this release goes to [@onedrawingperday](https://github.com/onedrawingperday) for his excellent work maintaining the fast-growing [Themes Site](https://themes.gohugo.io/).
+
+Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 
+which has received **5 contributions by 3 contributors**.
+
+Hugo now has:
+
+* 27596+ [stars](https://github.com/gohugoio/hugo/stargazers)
+* 442+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
+* 245+ [themes](http://themes.gohugo.io/)
+
+## Notes
+
+* Resources fetched via `resources.Get` and similar are now considered global across languages. If you need, as an example, to create a CSS per language, you need to set the path yourself.
+
+## Enhancements
+
+* Add `templates.Exists` template function. This can be used to check if a template, e.g. a partial, exists in the project or any of the themes in use. [0ba19c57](https://github.com/gohugoio/hugo/commit/0ba19c57f180c33b41c64335ea1d1c89335d34c0) [@bep](https://github.com/bep) [#5010](https://github.com/gohugoio/hugo/issues/5010)
+* Remove superflous loop [0afa2897](https://github.com/gohugoio/hugo/commit/0afa2897a0cf90f4348929ef432202efddc183a0) [@bep](https://github.com/bep) 
+* Update Chroma [b5d13ca1](https://github.com/gohugoio/hugo/commit/b5d13ca16bf106c1bc29c2a5295cd231d1bf13fd) [@bep](https://github.com/bep) [#5019](https://github.com/gohugoio/hugo/issues/5019)
+* Make resources fetched via `resources.Get` and similar language agnostic [6b02f5c0](https://github.com/gohugoio/hugo/commit/6b02f5c0f4e0ba1730aebc5a590a111548233bd5) [@bep](https://github.com/bep) [#5017](https://github.com/gohugoio/hugo/issues/5017)
+* Improve SCSS project vs themes import resolution [f219ac09](https://github.com/gohugoio/hugo/commit/f219ac09f6b7e26d84599401512233d77c1bdb4c) [@bep](https://github.com/bep) [#5008](https://github.com/gohugoio/hugo/issues/5008)
+* Improve _ prefix handling in SCSS imports [88e447c4](https://github.com/gohugoio/hugo/commit/88e447c449608523d87c517396bde31a62f392b6) [@bep](https://github.com/bep) [#5008](https://github.com/gohugoio/hugo/issues/5008)
+
+## Fixes
+* Fix file paths for uncached transformed images [b718d743](https://github.com/gohugoio/hugo/commit/b718d743b7a2eff3bea74ced57147825294a629f) [@RJacksonm1](https://github.com/RJacksonm1) [#5012](https://github.com/gohugoio/hugo/issues/5012)
+* Fix image cache eviction for sites with subdir in baseURL [786f7230](https://github.com/gohugoio/hugo/commit/786f72302f65580ca8d1df2132a7756584539ea0) [@bep](https://github.com/bep) [#5006](https://github.com/gohugoio/hugo/issues/5006)
@@ -0,0 +1,79 @@
+
+---
+date: 2018-08-17
+title: "Output Minification, Live-Reload Fixes and More"
+description: "Hugo 0.47: Adds minification of rendered output, but is mostly a massive bug fix release."
+categories: ["Releases"]
+---
+
+Hugo `0.47` is named **Hugo Reloaded**. It adds minification support for the final rendered output (run `hugo --minify`), but it is mostly a bug fix release. And most notably, it fixes a set of issues with live-reloading/partial rebuilds when running `hugo server`. Working with bundles should now be a more pleasant experience, to pick one example.
+
+This release represents **35 contributions by 6 contributors** to the main Hugo code base.
+[@bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@satotake](https://github.com/satotake), [@anthonyfok](https://github.com/anthonyfok), and [@coliff](https://github.com/coliff) for their ongoing contributions.
+
+And a big thanks to [@digitalcraftsman](https://github.com/digitalcraftsman) and [@onedrawingperday](https://github.com/onedrawingperday)  for their relentless work on keeping the themes site in pristine condition and to [@kaushalmodi](https://github.com/kaushalmodi) for his great work on the documentation site.
+
+Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 
+which has received **21 contributions by 10 contributors**. A special thanks to [@bep](https://github.com/bep), [@aapeliv](https://github.com/aapeliv), [@regisphilibert](https://github.com/regisphilibert), and [@brentybh](https://github.com/brentybh) for their work on the documentation site.
+
+
+Hugo now has:
+
+* 27980+ [stars](https://github.com/gohugoio/hugo/stargazers)
+* 442+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
+* 251+ [themes](http://themes.gohugo.io/)
+
+## Enhancements
+
+### Templates
+
+* Suppress blank lines from opengraph internal template [c09ee78f](https://github.com/gohugoio/hugo/commit/c09ee78fd235599d3fb794110cd75c024d80cfca) [@anthonyfok](https://github.com/anthonyfok) 
+* Add MIME type to embedded JS [755d1ffe](https://github.com/gohugoio/hugo/commit/755d1ffe7a22d8ad83485240ff78cf25d501602f) [@bep](https://github.com/bep) [#5042](https://github.com/gohugoio/hugo/issues/5042)
+* Add `os.Stat` template function [d7112085](https://github.com/gohugoio/hugo/commit/d71120852a8e14d0ea4d24de269fce041ef7b666) [@satotake](https://github.com/satotake) 
+
+### Output
+
+* Add support for minification of final output [789ef8c6](https://github.com/gohugoio/hugo/commit/789ef8c639e4621abd36da530bcb5942ac9297da) [@bep](https://github.com/bep) [#1251](https://github.com/gohugoio/hugo/issues/1251)
+
+### Other
+
+* Regenerate CLI docs [4a16b5f4](https://github.com/gohugoio/hugo/commit/4a16b5f4b0adbb31fee611c378de9d5526de2f86) [@bep](https://github.com/bep) 
+* Include theme name in version mismatch error [e5052f4e](https://github.com/gohugoio/hugo/commit/e5052f4e09b6df590cddf2f8bc2c834fd3af3082) [@bep](https://github.com/bep) [#5044](https://github.com/gohugoio/hugo/issues/5044)
+* Make the JS minifier matcher less specific [c81fbf46](https://github.com/gohugoio/hugo/commit/c81fbf4625ae7cc7dd3a7a526331ddfdf5237cc6) [@bep](https://github.com/bep) [#5073](https://github.com/gohugoio/hugo/issues/5073)
+* Close file when done [f6ae436c](https://github.com/gohugoio/hugo/commit/f6ae436c5878bafeafa0bb2646a2c9b32c9b4380) [@bep](https://github.com/bep) [#5062](https://github.com/gohugoio/hugo/issues/5062)
+* https links to 3rd party sites [c2a67413](https://github.com/gohugoio/hugo/commit/c2a6741394bc609a663522b245d3d75f0ad17da4) [@coliff](https://github.com/coliff) 
+* Update alias.go [06bd0136](https://github.com/gohugoio/hugo/commit/06bd0136419ebd6727635716c7023494cc5a8257) [@coliff](https://github.com/coliff) 
+* Remove test debug [fb3cb05c](https://github.com/gohugoio/hugo/commit/fb3cb05cc3dfc50370449f622fb0130ba7e0ced2) [@bep](https://github.com/bep) 
+* Update dependencies [d07882df](https://github.com/gohugoio/hugo/commit/d07882dfb76a65cce79aaa6f27df71279cd30600) [@bep](https://github.com/bep) 
+* Update Chroma [7f535671](https://github.com/gohugoio/hugo/commit/7f5356717d14079432365974e1424fc4ff5987c9) [@bep](https://github.com/bep) [#5025](https://github.com/gohugoio/hugo/issues/5025)
+* Remove alias of os.Stat [71931b30](https://github.com/gohugoio/hugo/commit/71931b30b1813b146aaa60f5cdab16c0f9ebebdb) [@satotake](https://github.com/satotake) 
+* Renmae FileStat Stat [d40116e5](https://github.com/gohugoio/hugo/commit/d40116e5f941e4734ed3bed69dce8ffe11fc76b2) [@satotake](https://github.com/satotake) 
+* Reduce allocation in the benchmark itself [a6b1eb1e](https://github.com/gohugoio/hugo/commit/a6b1eb1e9150aa5c1c86fe7424cc4167d6f59a5a) [@bep](https://github.com/bep) 
+* Simplify the 0 transformer case [27110133](https://github.com/gohugoio/hugo/commit/27110133ffca05feae2e11a9ff28a9a00f613350) [@bep](https://github.com/bep) 
+
+## Fixes
+
+### Templates
+
+* Fix compiling Amber templates that import other templates [37438757](https://github.com/gohugoio/hugo/commit/37438757788d279c839506d54f460b2ab37db164) [@Stebalien](https://github.com/Stebalien) 
+* Reimplement the ".Params tolower" template transformer [5c538491](https://github.com/gohugoio/hugo/commit/5c5384916e8f954f3ea66148ecceb3732584588e) [@bep](https://github.com/bep) [#5068](https://github.com/gohugoio/hugo/issues/5068)
+
+### Output
+
+* Fix Resource output in multihost setups [78f8475a](https://github.com/gohugoio/hugo/commit/78f8475a054a6277d37f13329afd240b00dc9408) [@bep](https://github.com/bep) [#5058](https://github.com/gohugoio/hugo/issues/5058)
+
+### Core
+
+* Force render of any changed page, even in Fast Render Mode [22475460](https://github.com/gohugoio/hugo/commit/2247546017c00201d2ce1232dd5303295451f1cc) [@bep](https://github.com/bep) [#5083](https://github.com/gohugoio/hugo/issues/5083)
+* Add configFile(s) back to the watch list after REMOVE event [abc54080](https://github.com/gohugoio/hugo/commit/abc54080ec8c43e8989c081d934b59f0c9570c0b) [@anthonyfok](https://github.com/anthonyfok) [#4701](https://github.com/gohugoio/hugo/issues/4701)
+* Gracefully handle typos in server config when running the server [a655e00d](https://github.com/gohugoio/hugo/commit/a655e00d702dbc20b3961b131b33ab21841b043d) [@bep](https://github.com/bep) [#5081](https://github.com/gohugoio/hugo/issues/5081)
+* Fix shortcode output wrapped in p [78c99463](https://github.com/gohugoio/hugo/commit/78c99463fdd45c91af9933528d12d36a86dc6482) [@gllera](https://github.com/gllera) [#1642](https://github.com/gohugoio/hugo/issues/1642)
+* Adjust tests for shortcode p-issue [baa62d0a](https://github.com/gohugoio/hugo/commit/baa62d0abbbf24a17d0aa800a4bb217f026c49ad) [@bep](https://github.com/bep) [#1642](https://github.com/gohugoio/hugo/issues/1642)
+* Fix image cache-clearing for sub-languages [9d973004](https://github.com/gohugoio/hugo/commit/9d973004f5379cff2adda489566fe40683553c4c) [@bep](https://github.com/bep) [#5084](https://github.com/gohugoio/hugo/issues/5084)
+* Fix error when deleting a bundle in server mode [0a88741f](https://github.com/gohugoio/hugo/commit/0a88741fe85f4f7aedc02ed748dfeb8ccc073dbf) [@bep](https://github.com/bep) [#5077](https://github.com/gohugoio/hugo/issues/5077)
+* Fix Related when called from shortcode [0dd06bda](https://github.com/gohugoio/hugo/commit/0dd06bdac008aa81ec2e8f29ad8110dac0227011) [@bep](https://github.com/bep) [#5071](https://github.com/gohugoio/hugo/issues/5071)
+* Use the interface value when doing Related search [a6f199f7](https://github.com/gohugoio/hugo/commit/a6f199f7a640161333608b4a843d701f7e182829) [@bep](https://github.com/bep) [#5071](https://github.com/gohugoio/hugo/issues/5071)
+* Fix GitInfo when multiple content dirs [2182ecfd](https://github.com/gohugoio/hugo/commit/2182ecfd34a24521bf0e3c939627a55327eb1e19) [@bep](https://github.com/bep) [#5054](https://github.com/gohugoio/hugo/issues/5054)
+* Add multiple content dirs to GitInfo test site [e85833d8](https://github.com/gohugoio/hugo/commit/e85833d868a902840c5ed1c90713256153b2548b) [@bep](https://github.com/bep) [#5054](https://github.com/gohugoio/hugo/issues/5054)
+* Fix "adding a bundle" in server mode [d139a037](https://github.com/gohugoio/hugo/commit/d139a037d98e4b388687eecb7831758412247c58) [@bep](https://github.com/bep) [#5075](https://github.com/gohugoio/hugo/issues/5075)
+* Fix typo [c362634b](https://github.com/gohugoio/hugo/commit/c362634b7d8802ea81b0b4341c800a9f78f7cd7c) [@satotake](https://github.com/satotake) 
--- a/Show More
+++ b/Show More