releaser: Update /docs to 0.24 [ci skip]

[ci skip]

.gitignore

@@ -10,3 +10,9 @@ cover.out
 *.swo
 .DS_Store
 *~
+vendor/*/
+*.bench
+coverage*.out
+
+GoBuilds
+dist

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "docs"]
+	path = docs
+	url = https://github.com/gohugoio/hugoDocs.git
+	ignore = dirty

.goxc.json

@@ -0,0 +1,6 @@
+{
+	"ArtifactsDest": "GoBuilds/",
+	"OutPath": "{{.Dest}}{{.PS}}{{.AppName}}{{.PS}}{{.Version}}{{.PS}}{{.AppName}}_{{.Version}}_{{.Os}}_{{.Arch}}{{.Ext}}",
+	"BuildConstraints": "linux windows darwin freebsd netbsd openbsd dragonfly",
+	"ConfigVersion": "0.9"
+}

.travis.yml

@@ -1,12 +1,21 @@
-language: go
-go:
-  - 1.3
-  - 1.4.2
-  - tip
-script:
-  - go test ./...
-  - go build
-  - ./hugo -s docs/
-install:
-  - go get github.com/stretchr/testify
-  - go get -v ./...
+language: go
+sudo: required
+go:
+  - 1.7.6
+  - 1.8.3
+  - tip
+os:
+  - linux
+  - osx
+matrix:
+  allow_failures:
+    - go: tip
+  fast_finish: true
+install:
+  - make vendor
+script:
+  - make hugo-race check
+before_install:
+  # gem install must be run with sudo on OSX
+  - sudo gem install asciidoctor | gem install asciidoctor
+  - sudo pip install docutils

CONTRIBUTING.md

@@ -0,0 +1,161 @@
+# Contributing to Hugo
+
+We welcome contributions to Hugo of any kind including documentation, themes,
+organization, tutorials, blog posts, bug reports, issues, feature requests,
+feature implementations, pull requests, answering questions on the forum,
+helping to manage issues, etc.
+
+The Hugo community and maintainers are [very active](https://github.com/gohugoio/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity. We created a [step by step guide](https://gohugo.io/tutorials/how-to-contribute-to-hugo/) if you're unfamiliar with GitHub or contributing to open source projects in general.
+
+## Table of Contents
+
+* [Asking Support Questions](#asking-support-questions)
+* [Reporting Issues](#reporting-issues)
+* [Submitting Patches](#submitting-patches)
+  * [Code Contribution Guidelines](#code-contribution-guidelines)
+  * [Git Commit Message Guidelines](#git-commit-message-guidelines)
+  * [Vendored Dependencies](#vendored-dependencies)
+  * [Fetching the Sources From GitHub](#fetching-the-sources-from-github)
+  * [Using Git Remotes](#using-git-remotes)
+  * [Build Hugo with Your Changes](#build-hugo-with-your-changes)
+  * [Updating the Hugo Sources](#updating-the-hugo-sources)
+
+## Asking Support Questions
+
+We have an active [discussion forum](https://discourse.gohugo.io) where users and developers can ask questions.
+Please don't use the GitHub issue tracker to ask questions.
+
+## Reporting Issues
+
+If you believe you have found a defect in Hugo or its documentation, use
+the GitHub [issue tracker](https://github.com/gohugoio/hugo/issues) to report the problem to the Hugo maintainers.
+If you're not sure if it's a bug or not, start by asking in the [discussion forum](https://discourse.gohugo.io).
+When reporting the issue, please provide the version of Hugo in use (`hugo version`) and your operating system.
+
+## Submitting Patches
+
+The Hugo project welcomes all contributors and contributions regardless of skill or experience level.
+If you are interested in helping with the project, we will help you with your contribution.
+Hugo is a very active project with many contributions happening daily.
+Because we want to create the best possible product for our users and the best contribution experience for our developers,
+we have a set of guidelines which ensure that all contributions are acceptable.
+The guidelines are not intended as a filter or barrier to participation.
+If you are unfamiliar with the contribution process, the Hugo team will help you and teach you how to bring your contribution in accordance with the guidelines.
+
+### Code Contribution Guidelines
+
+To make the contribution process as seamless as possible, we ask for the following:
+
+* Go ahead and fork the project and make your changes.  We encourage pull requests to allow for review and discussion of code changes.
+* When you’re ready to create a pull request, be sure to:
+    * Sign the [CLA](https://cla-assistant.io/gohugoio/hugo).
+    * Have test cases for the new code. If you have questions about how to do this, please ask in your pull request.
+    * Run `go fmt`.
+    * Add documentation if you are adding new features or changing functionality.  The docs site lives in `/docs`.
+    * Squash your commits into a single commit. `git rebase -i`. It’s okay to force update your pull request with `git push -f`.
+    * Ensure that `make check` succeeds. [Travis CI](https://travis-ci.org/gohugoio/hugo) (Linux and macOS) and [AppVeyor](https://ci.appveyor.com/project/gohugoio/hugo/branch/master) (Windows) will fail the build if `make check` fails.
+    * Follow the **Git Commit Message Guidelines** below.
+
+### Git Commit Message Guidelines
+
+This [blog article](http://chris.beams.io/posts/git-commit/) is a good resource for learning how to write good commit messages,
+the most important part being that each commit message should have a title/subject in imperative mood starting with a capital letter and no trailing period:
+*"Return error on wrong use of the Paginator"*, **NOT** *"returning some error."*
+
+Also, if your commit references one or more GitHub issues, always end your commit message body with *See #1234* or *Fixes #1234*.
+Replace *1234* with the GitHub issue ID. The last example will close the issue when the commit is merged into *master*.
+
+Sometimes it makes sense to prefix the commit message with the packagename (or docs folder) all lowercased ending with a colon.
+That is fine, but the rest of the rules above apply.
+So it is "tpl: Add emojify template func", not "tpl: add emojify template func.", and "docs: Document emoji", not "doc: document emoji."
+
+Please consider to use a short and descriptive branch name, e.g. **NOT** "patch-1". It's very common but creates a naming conflict each time when a submission is pulled for a review.
+
+An example:
+
+```text
+tpl: Add custom index function
+
+Add a custom index template function that deviates from the stdlib simply by not
+returning an "index out of range" error if an array, slice or string index is
+out of range.  Instead, we just return nil values.  This should help make the
+new default function more useful for Hugo users.
+
+Fixes #1949
+```
+
+### Vendored Dependencies
+
+Hugo uses [govendor](https://github.com/kardianos/govendor) 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 since `go get` is not vendor-aware.
+You **must use govendor** to fetch and manage Hugo's dependencies.
+
+### Fetch the Sources From GitHub
+
+```
+go get github.com/kardianos/govendor
+govendor get github.com/gohugoio/hugo
+```
+
+### Using Git Remotes
+
+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:
+
+1. Fetch the Hugo sources as described above.
+
+1. Change to the Hugo source directory:
+
+    ```
+    cd $HOME/go/src/github.com/gohugoio/hugo
+    ```
+
+1. Create a new branch for your changes (the branch name is arbitrary):
+
+    ```
+    git checkout -b iss1234
+    ```
+
+1. After making your changes, commit them to your new branch:
+
+    ```
+    git commit -a -v
+    ```
+
+1. Fork Hugo in GitHub.
+
+1. Add your fork as a new remote (the remote name, "fork" in this example, is arbitrary):
+
+    ```
+    git remote add fork git://github.com/USERNAME/hugo.git
+    ```
+
+1. Push the changes to your new remote:
+
+    ```
+    git push --set-upstream fork iss1234
+    ```
+
+1. You're now ready to submit a PR based upon the new branch in your forked repository.
+
+### Build Hugo with Your Changes
+
+```bash
+cd $HOME/go/src/github.com/gohugoio/hugo
+make hugo
+# or to install in $HOME/go/bin:
+make install
+```
+
+### Updating the Hugo Sources
+
+If you want to stay in sync with the Hugo repository, you can easily pull down
+the source changes, but you'll need to keep the vendored packages up-to-date as
+well.
+
+```
+git pull
+make vendor
+```
+

Dockerfile

@@ -0,0 +1,15 @@
+FROM golang:1.8-alpine
+
+ENV GOPATH /go
+ENV USER root
+
+RUN apk update && apk add git make
+
+# pre-install known dependencies before the source, so we don't redownload them whenever the source changes
+RUN go get github.com/kardianos/govendor \
+ && govendor get github.com/gohugoio/hugo
+
+COPY . $GOPATH/src/github.com/gohugoio/hugo
+
+RUN cd $GOPATH/src/github.com/gohugoio/hugo \
+ 	&& make install test

LICENSE.md

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

Makefile

@@ -1,27 +1,83 @@
+# A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 
-# Adds build information from git repo
-#
-# as suggested by tatsushid in
-# https://github.com/spf13/hugo/issues/540
+PACKAGE = github.com/gohugoio/hugo
+COMMIT_HASH = `git rev-parse --short HEAD 2>/dev/null`
+BUILD_DATE = `date +%FT%T%z`
+LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.CommitHash=${COMMIT_HASH} -X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
+NOGI_LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
 
-COMMIT_HASH=`git rev-parse --short HEAD 2>/dev/null`
-BUILD_DATE=`date +%FT%T%z`
-LDFLAGS=-ldflags "-X github.com/spf13/hugo/hugolib.CommitHash ${COMMIT_HASH} -X github.com/spf13/hugo/hugolib.BuildDate ${BUILD_DATE}"
+.PHONY: vendor docker check fmt lint test test-race vet test-cover-html help
+.DEFAULT_GOAL := help
 
-all: gitinfo
+vendor: ## Install govendor and sync Hugo's vendored dependencies
+	go get github.com/kardianos/govendor
+	govendor sync ${PACKAGE}
 
-install: install-gitinfo
+hugo: vendor ## Build hugo binary
+	go build ${LDFLAGS} ${PACKAGE}
+
+hugo-race: vendor ## Build hugo binary with race detector enabled
+	go build -race ${LDFLAGS} ${PACKAGE}
+
+install: vendor ## Install hugo binary
+	go install ${LDFLAGS} ${PACKAGE}
+
+hugo-no-gitinfo: LDFLAGS = ${NOGI_LDFLAGS}
+hugo-no-gitinfo: vendor hugo ## Build hugo without git info
+
+docker: ## Build hugo Docker container
+	docker build -t hugo .
+	docker rm -f hugo-build || true
+	docker run --name hugo-build hugo ls /go/bin
+	docker cp hugo-build:/go/bin/hugo .
+	docker rm hugo-build
+
+govendor: vendor # Deprecated: use "vendor" target
+get: vendor # Deprecated: use "vendor"
+gitinfo: hugo # Deprecated: use "hugo" target
+install-gitinfo: install # Deprecated: use "install" target
+no-git-info: hugo-no-gitinfo # Deprecated: use "hugo-no-gitinfo" target
+
+check: test-race test386 fmt vet ## Run tests and linters
+
+test386: ## Run tests in 32-bit mode
+	GOARCH=386 govendor test +local
+
+test: ## Run tests
+	govendor test +local
+
+test-race: ## Run tests with race detector
+	govendor test -race +local
+
+fmt: ## Run gofmt linter
+	@for d in `govendor list -no-status +local | sed 's/github.com.gohugoio.hugo/./'` ; do \
+		if [ "`gofmt -l $$d/*.go | tee /dev/stderr`" ]; then \
+			echo "^ improperly formatted go files" && echo && exit 1; \
+		fi \
+	done
+
+lint: ## Run golint linter
+	@for d in `govendor list -no-status +local | sed 's/github.com.gohugoio.hugo/./'` ; do \
+		if [ "`golint $$d | tee /dev/stderr`" ]; then \
+			echo "^ golint errors!" && echo && exit 1; \
+		fi \
+	done
+
+vet: ## Run go vet linter
+	@if [ "`govendor vet +local | tee /dev/stderr`" ]; then \
+		echo "^ go vet errors!" && echo && exit 1; \
+	fi
+
+test-cover-html: PACKAGES = $(shell govendor list -no-status +local | sed 's/github.com.gohugoio.hugo/./')
+test-cover-html: ## Generate test coverage report
+	echo "mode: count" > coverage-all.out
+	$(foreach pkg,$(PACKAGES),\
+		govendor test -coverprofile=coverage.out -covermode=count $(pkg);\
+		tail -n +2 coverage.out >> coverage-all.out;)
+	go tool cover -html=coverage-all.out
+
+check-vendor: ## Verify that vendored packages match git HEAD
+	@git diff-index --quiet HEAD vendor/ || (echo "check-vendor target failed: vendored packages out of sync" && echo && git diff vendor/ && exit 1)
 
 help:
-	echo ${COMMIT_HASH}
-	echo ${BUILD_DATE}
-
-gitinfo:
-	go build ${LDFLAGS} -o hugo main.go
-
-install-gitinfo:
-	go install ${LDFLAGS} ./...
-
-no-git-info:
-	go build -o hugo main.go
-
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

README.md

@@ -1,140 +1,106 @@
-![Hugo](https://raw.githubusercontent.com/spf13/hugo/master/docs/static/img/hugo-logo.png)
+![Hugo](https://raw.githubusercontent.com/gohugoio/hugoDocs/master/static/img/hugo-logo.png)
 
-A Fast and Flexible Static Site Generator built with love by [spf13](http://spf13.com/) and [friends](https://github.com/spf13/hugo/graphs/contributors) in [Go][].
+A Fast and Flexible Static Site Generator built with love by [spf13](http://spf13.com/) and [friends](https://github.com/gohugoio/hugo/graphs/contributors) in [Go][].
 
-[Website](http://gohugo.io) |
-[Forum](https://discuss.gohugo.io) |
-[Chat](https://gitter.im/spf13/hugo) |
-[Documentation](http://gohugo.io/overview/introduction/) |
-[Installation Guide](http://gohugo.io/overview/installing/) |
-[Twitter](http://twitter.com/spf13)
+[Website](https://gohugo.io) |
+[Forum](https://discourse.gohugo.io) |
+[Developer Chat (no support)](https://gitter.im/gohugoio/hugo) |
+[Documentation](https://gohugo.io/overview/introduction/) |
+[Installation Guide](https://gohugo.io/overview/installing/) |
+[Contribution Guide](CONTRIBUTING.md) |
+[Twitter](http://twitter.com/gohugoio)
 
-[![Build Status](https://travis-ci.org/spf13/hugo.png)](https://travis-ci.org/spf13/hugo) [![wercker status](https://app.wercker.com/status/1a0de7d703ce3b80527f00f675e1eb32 "wercker status")](https://app.wercker.com/project/bykey/1a0de7d703ce3b80527f00f675e1eb32) [![Build status](https://ci.appveyor.com/api/projects/status/n2mo912b8s2505e8/branch/master?svg=true)](https://ci.appveyor.com/project/spf13/hugo/branch/master) [![Join the chat at https://gitter.im/spf13/hugo](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/spf13/hugo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![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)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/a5mr220vsd091kua?svg=true&label=Windows+build "Windows Build Status")](https://ci.appveyor.com/project/bep/hugo/branch/master)
+[![Dev chat at https://gitter.im/gohugoio/hugo](https://img.shields.io/badge/gitter-developer_chat-46bc99.svg)](https://gitter.im/spf13/hugo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Go Report Card](https://goreportcard.com/badge/github.com/gohugoio/hugo)](https://goreportcard.com/report/github.com/gohugoio/hugo)
 
 ## Overview
 
-Hugo is a static site generator written in [Go][]. It is optimized for speed, easy use and configurability. Hugo takes a directory with content and templates and renders them into a full HTML website.
+Hugo is a static HTML and CSS website generator written in [Go][].
+It is optimized for speed, easy use and configurability.
+Hugo takes a directory with content and templates and renders them into a full HTML website.
 
-Hugo relies on Markdown files with front matter for meta data. And you can run Hugo from any directory. This works well for shared hosts and other systems where you don’t have a privileged account.
+Hugo relies on Markdown files with front matter for meta data.
+And you can run Hugo from any directory.
+This works well for shared hosts and other systems where you don’t have a privileged account.
 
-Hugo renders a typical website of moderate size in a fraction of a second. A good rule of thumb is that each piece of content renders in around 1 millisecond.
+Hugo renders a typical website of moderate size in a fraction of a second.
+A good rule of thumb is that each piece of content renders in around 1 millisecond.
 
-Hugo is meant to work well for any kind of website including blogs, tumbles and docs.
+Hugo is designed to work well for any kind of website including blogs, tumbles and docs.
 
 #### Supported Architectures
 
-Currently, we provide pre-built Hugo binaries for Windows, Linux, FreeBSD, NetBSD and OS X (Darwin) for x64, i386 and ARM architectures.
+Currently, we provide pre-built Hugo binaries for Windows, Linux, FreeBSD, NetBSD and macOS (Darwin) and [Android](https://gist.github.com/bep/a0d8a26cf6b4f8bc992729b8e50b480b) for x64, i386 and ARM architectures.
 
 Hugo may also be compiled from source wherever the Go compiler tool chain can run, e.g. for other operating systems including DragonFly BSD, OpenBSD, Plan 9 and Solaris.
 
-**Complete documentation is available at [Hugo Documentation](http://gohugo.io/).**
+**Complete documentation is available at [Hugo Documentation][].**
 
 ## Choose How to Install
 
-If you want to use Hugo as your site generator, simply install the Hugo binaries. The Hugo binaries have no external dependencies.
+If you want to use Hugo as your site generator, simply install the Hugo binaries.
+The Hugo binaries have no external dependencies.
 
-To contribute to the Hugo source code or documentation, you should fork the Hugo GitHub project and clone it to your local machine.
+To contribute to the Hugo source code or documentation, you should [fork the Hugo GitHub project](https://github.com/gohugoio/hugo#fork-destination-box) and clone it to your local machine.
 
-Finally, you can install the Hugo source code with `go`, build the binaries yourself, and run Hugo that way. Building the binaries is an easy task for an experienced `go` getter.
+Finally, you can install the Hugo source code with `go`, build the binaries yourself, and run Hugo that way.
+Building the binaries is an easy task for an experienced `go` getter.
 
 ### Install Hugo as Your Site Generator (Binary Install)
 
-Use the [installation instructions in the Hugo documentation](http://gohugo.io/overview/installing/).
-
-### Clone the Hugo Project (Contributor)
-
-1. Make sure your local environment has the following software installed:
-
-    * [Git](http://git-scm.com/)
-    * [Mercurial](http://mercurial.selenic.com/)
-    * [Go][] 1.3+ (Go 1.4+ on Windows, see Go [Issue #8090](https://code.google.com/p/go/issues/detail?id=8090))
-
-2. Fork the [Hugo project on GitHub](https://github.com/spf13/hugo).
-
-3. Clone your fork:
-
-        git clone https://github.com/YOURNAME/hugo
-
-4. Change into the `hugo` directory:
-
-        cd hugo
-
-5. Install the Hugo project’s package dependencies:
-
-        go get -u -v github.com/spf13/hugo
-
-6. Use a symbolic link to add your locally cloned Hugo repository to your `$GOPATH`, assuming you prefer doing development work outside of `$GOPATH`:
-
-        rm -rf "$GOPATH/src/github.com/spf13/hugo"
-        ln -s `pwd` "$GOPATH/src/github.com/spf13/hugo"
-
-    Go expects all of your libraries to be found in`$GOPATH`.
+Use the [installation instructions in the Hugo documentation](https://gohugo.io/overview/installing/).
 
 ### Build and Install the Binaries from Source (Advanced Install)
 
 Add Hugo and its package dependencies to your go `src` directory.
 
-    go get -v github.com/spf13/hugo
+    go get -v github.com/gohugoio/hugo
 
 Once the `get` completes, you should find your new `hugo` (or `hugo.exe`) executable sitting inside `$GOPATH/bin/`.
 
 To update Hugo’s dependencies, use `go get` with the `-u` option.
 
-    go get -u -v github.com/spf13/hugo
+    go get -u -v github.com/gohugoio/hugo
 
 ## Contributing to Hugo
 
-We welcome contributions to Hugo of any kind including documentation, themes, organization, tutorials, blog posts, bug reports, issues, feature requests, feature implementation, pull requests, answering questions on the forum, helping to manage issues, etc. The Hugo community and maintainers are very active and helpful and the project benefits greatly from this activity.
+For a complete guide to contributing to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
 
-[![Throughput Graph](https://graphs.waffle.io/spf13/hugo/throughput.svg)](https://waffle.io/spf13/hugo/metrics)
+We welcome contributions to Hugo of any kind including documentation, themes,
+organization, tutorials, blog posts, bug reports, issues, feature requests,
+feature implementations, pull requests, answering questions on the forum,
+helping to manage issues, etc.
 
-If you have any questions about how to contribute or what to contribute please ask on the [forum](http://discuss.gohugo.io)
+The Hugo community and maintainers are [very active](https://github.com/gohugoio/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity.
 
-## Code Contribution Guideline
+### Asking Support Questions
 
-We welcome your contributions. To make the process as seamless as possible, we ask for the following:
+We have an active [discussion forum](https://discourse.gohugo.io) where users and developers can ask questions.
+Please don't use the GitHub issue tracker to ask questions.
 
-* Go ahead and fork the project and make your changes. We encourage pull requests to discuss code changes.
-* When you’re ready to create a pull request, be sure to:
-     * Have test cases for the new code. If you have questions about how to do it, please ask in your pull request.
-     * Run `go fmt`
-     * Squash your commits into a single commit. `git rebase -i`. It’s okay to force update your pull request.
-     * This [blog article](http://chris.beams.io/posts/git-commit/) is a good resource for learning how to write good commit messages, the most important part being that each commit message should have a title/subject in imperative mode without trailing period: *"Return error on wrong use of the Paginator"*, **NOT** *"Returning some error."* Also, if your commit references one or more GitHub issues, always end your commit message body with *See #1234* or *Fixes #1234*. Replace *1234* with the GitHub issue ID. The last example will close the issue when the commit is merged into *master*.
-     * Make sure `go test ./...` passes, and `go build` completes. Our [Travis CI loop](https://travis-ci.org/spf13/hugo) (Linux) and [AppVeyor](https://ci.appveyor.com/project/spf13/hugo/branch/master) (Windows) will catch most things that are missing. 
+### Reporting Issues
 
-### Building Hugo with Your Changes
+If you believe you have found a defect in Hugo or its documentation, use
+the GitHub issue tracker to report the problem to the Hugo maintainers.
+If you're not sure if it's a bug or not, start by asking in the [discussion forum](https://discourse.gohugo.io).
+When reporting the issue, please provide the version of Hugo in use (`hugo version`).
 
-    cd /path/to/hugo
-    go build -o hugo main.go
-    mv hugo /usr/local/bin/
+### Submitting Patches
 
-### Adding compile information to Hugo
+The Hugo project welcomes all contributors and contributions regardless of skill or experience level.
+If you are interested in helping with the project, we will help you with your contribution.
+Hugo is a very active project with many contributions happening daily.
+Because we want to create the best possible product for our users and the best contribution experience for our developers,
+we have a set of guidelines which ensure that all contributions are acceptable.
+The guidelines are not intended as a filter or barrier to participation.
+If you are unfamiliar with the contribution process, the Hugo team will help you and teach you how to bring your contribution in accordance with the guidelines.
 
-When Hugo is built using the above steps, the `version` sub-command will include the `mdate` of the Hugo executable, similar to the following:
-
-    Hugo Static Site Generator v0.13-DEV buildDate: 2014-12-24T04:46:03-07:00
-
-Instead, it is possible to have the `version` sub-command return information about the git commit used and time of compilation using `build` flags.
-
-To do this, replace the `go build` command with the following *(replace `/path/to/hugo` with the actual path)*:
-
-    go build -ldflags "-X /path/to/hugo/hugolib.CommitHash `git rev-parse --short HEAD 2>/dev/null` -X github.com/spf13/hugo/hugolib.BuildDate `date +%FT%T%z`"
-
-This will result in `hugo version` output that looks similar to:
-
-    Hugo Static Site Generator v0.13-DEV-8042E77 buildDate: 2014-12-25T03:25:57-07:00
-
-Alternatively, just run `make` — all the “magic” above is already in the `Makefile`.  :wink:
-
-### Running Hugo
-
-    cd /path/to/hugo
-    go install github.com/spf13/hugo/hugolib
-    go run main.go
-
-**Complete documentation is available at [Hugo Documentation](http://gohugo.io/).**
+For a complete guide to contributing code to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
 
 [![Analytics](https://ga-beacon.appspot.com/UA-7131036-6/hugo/readme)](https://github.com/igrigorik/ga-beacon)
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/spf13/hugo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
-[Go]: http://golang.org/
+[Go]: https://golang.org/
+[Hugo Documentation]: https://gohugo.io/overview/introduction/

appveyor.yml

@@ -0,0 +1,15 @@
+init:
+  - copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
+  - set PATH=%PATH%;C:\MinGW\bin;%GOPATH%\bin
+  - go version
+  - go env
+
+# clones and cd's to path
+clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo
+
+install:
+  - gem install asciidoctor
+  - pip install docutils
+
+build_script:
+  - make hugo-race check

bench.sh

@@ -7,21 +7,29 @@
 # - Do the same for master
 # - then compare the two runs with benchcmp
 
-if [ $# -ne 2 ]
+benchFilter=".*"
+
+if (( $# < 2 ));
   then
-    echo "USAGE: ./bench.sh <git-branch> <package-to-bench>"
+    echo "USAGE: ./bench.sh <git-branch> <package-to-bench> (and <benchmark filter> (regexp, optional))"
     exit 1
 fi
 
 
+
+if [ $# -eq 3 ]; then
+  benchFilter=$3
+fi
+
+
 BRANCH=$1
 PACKAGE=$2
 
 git checkout $BRANCH
-go test -test.run=NONE -bench=".*" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
+go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
 
 git checkout master
-go test -test.run=NONE -bench=".*" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
+go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
 
 
 benchcmp /tmp/bench-$PACKAGE-master.txt /tmp/bench-$PACKAGE-$BRANCH.txt

benchSite.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Send in a regexp mathing the benchmarks you want to run, i.e. './benchSite.sh "YAML"'. 
+# Note the quotes, which will be needed for more complex expressions.
+# The above will run all variations, but only for front matter YAML.
+
+echo "Running with BenchmarkSiteBuilding/${1}"
+
+go test -run="NONE" -bench="BenchmarkSiteBuilding/${1}$" -test.benchmem=true ./hugolib -memprofile mem.prof -cpuprofile cpu.prof

bufferpool/bufpool.go

@@ -1,9 +1,9 @@
-// Copyright © 2013-14 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package bufferpool provides a pool of bytes buffers.
 package bufferpool
 
 import (

bufferpool/bufpool_test.go

@@ -0,0 +1,27 @@
+// Copyright 2016-present 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 bufferpool
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestBufferPool(t *testing.T) {
+	buff := GetBuffer()
+	buff.WriteString("do be do be do")
+	assert.Equal(t, "do be do be do", buff.String())
+	PutBuffer(buff)
+	assert.Equal(t, 0, buff.Len())
+}

cache/partitioned_lazy_cache.go

@@ -0,0 +1,80 @@
+// Copyright 2017-present 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 cache
+
+import (
+	"sync"
+)
+
+// Partition represents a cache partition where Load is the callback
+// for when the partition is needed.
+type Partition struct {
+	Key  string
+	Load func() (map[string]interface{}, error)
+}
+
+type lazyPartition struct {
+	initSync sync.Once
+	cache    map[string]interface{}
+	load     func() (map[string]interface{}, error)
+}
+
+func (l *lazyPartition) init() error {
+	var err error
+	l.initSync.Do(func() {
+		var c map[string]interface{}
+		c, err = l.load()
+		l.cache = c
+	})
+
+	return err
+}
+
+// PartitionedLazyCache is a lazily loaded cache paritioned by a supplied string key.
+type PartitionedLazyCache struct {
+	partitions map[string]*lazyPartition
+}
+
+// NewPartitionedLazyCache creates a new NewPartitionedLazyCache with the supplied
+// partitions.
+func NewPartitionedLazyCache(partitions ...Partition) *PartitionedLazyCache {
+	lazyPartitions := make(map[string]*lazyPartition, len(partitions))
+	for _, partition := range partitions {
+		lazyPartitions[partition.Key] = &lazyPartition{load: partition.Load}
+	}
+	cache := &PartitionedLazyCache{partitions: lazyPartitions}
+
+	return cache
+}
+
+// Get initializes the partition if not already done so, then looks up the given
+// key in the given partition, returns nil if no value found.
+func (c *PartitionedLazyCache) Get(partition, key string) (interface{}, error) {
+	p, found := c.partitions[partition]
+
+	if !found {
+		return nil, nil
+	}
+
+	if err := p.init(); err != nil {
+		return nil, err
+	}
+
+	if v, found := p.cache[key]; found {
+		return v, nil
+	}
+
+	return nil, nil
+
+}

cache/partitioned_lazy_cache_test.go

@@ -0,0 +1,92 @@
+// Copyright 2017-present 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 cache
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewPartitionedLazyCache(t *testing.T) {
+	t.Parallel()
+
+	assert := require.New(t)
+
+	p1 := Partition{
+		Key: "p1",
+		Load: func() (map[string]interface{}, error) {
+			return map[string]interface{}{
+				"p1_1":   "p1v1",
+				"p1_2":   "p1v2",
+				"p1_nil": nil,
+			}, nil
+		},
+	}
+
+	p2 := Partition{
+		Key: "p2",
+		Load: func() (map[string]interface{}, error) {
+			return map[string]interface{}{
+				"p2_1": "p2v1",
+				"p2_2": "p2v2",
+				"p2_3": "p2v3",
+			}, nil
+		},
+	}
+
+	cache := NewPartitionedLazyCache(p1, p2)
+
+	v, err := cache.Get("p1", "p1_1")
+	assert.NoError(err)
+	assert.Equal("p1v1", v)
+
+	v, err = cache.Get("p1", "p2_1")
+	assert.NoError(err)
+	assert.Nil(v)
+
+	v, err = cache.Get("p1", "p1_nil")
+	assert.NoError(err)
+	assert.Nil(v)
+
+	v, err = cache.Get("p2", "p2_3")
+	assert.NoError(err)
+	assert.Equal("p2v3", v)
+
+	v, err = cache.Get("doesnotexist", "p1_1")
+	assert.NoError(err)
+	assert.Nil(v)
+
+	v, err = cache.Get("p1", "doesnotexist")
+	assert.NoError(err)
+	assert.Nil(v)
+
+	errorP := Partition{
+		Key: "p3",
+		Load: func() (map[string]interface{}, error) {
+			return nil, errors.New("Failed")
+		},
+	}
+
+	cache = NewPartitionedLazyCache(errorP)
+
+	v, err = cache.Get("p1", "doesnotexist")
+	assert.NoError(err)
+	assert.Nil(v)
+
+	_, err = cache.Get("p3", "doesnotexist")
+	assert.Error(err)
+
+}

commands/benchmark.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,62 +14,99 @@
 package commands
 
 import (
-	"github.com/spf13/cobra"
 	"os"
+	"runtime"
 	"runtime/pprof"
+	"time"
+
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
-var cpuProfilefile string
-var memProfilefile string
-var benchmarkTimes int
+var (
+	benchmarkTimes int
+	cpuProfileFile string
+	memProfileFile string
+)
 
-var benchmark = &cobra.Command{
+var benchmarkCmd = &cobra.Command{
 	Use:   "benchmark",
-	Short: "Benchmark hugo by building a site a number of times",
-	Long: `Hugo can build a site many times over and analyze the
-running process creating a benchmark.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		InitializeConfig()
-		bench(cmd, args)
-	},
+	Short: "Benchmark Hugo by building a site a number of times.",
+	Long: `Hugo can build a site many times over and analyze the running process
+creating a benchmark.`,
 }
 
 func init() {
-	benchmark.Flags().StringVar(&cpuProfilefile, "cpuprofile", "", "path/filename for the CPU profile file")
-	benchmark.Flags().StringVar(&memProfilefile, "memprofile", "", "path/filename for the memory profile file")
+	initHugoBuilderFlags(benchmarkCmd)
+	initBenchmarkBuildingFlags(benchmarkCmd)
 
-	benchmark.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
+	benchmarkCmd.Flags().StringVar(&cpuProfileFile, "cpuprofile", "", "path/filename for the CPU profile file")
+	benchmarkCmd.Flags().StringVar(&memProfileFile, "memprofile", "", "path/filename for the memory profile file")
+	benchmarkCmd.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
+
+	benchmarkCmd.RunE = benchmark
 }
 
-func bench(cmd *cobra.Command, args []string) {
+func benchmark(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(benchmarkCmd)
+	if err != nil {
+		return err
+	}
 
-	if memProfilefile != "" {
-		f, err := os.Create(memProfilefile)
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
 
+	var memProf *os.File
+	if memProfileFile != "" {
+		memProf, err = os.Create(memProfileFile)
 		if err != nil {
-			panic(err)
-		}
-		for i := 0; i < benchmarkTimes; i++ {
-			_ = buildSite()
-		}
-		pprof.WriteHeapProfile(f)
-		f.Close()
-
-	} else {
-		if cpuProfilefile == "" {
-			cpuProfilefile = "/tmp/hugo-cpuprofile"
-		}
-		f, err := os.Create(cpuProfilefile)
-
-		if err != nil {
-			panic(err)
-		}
-
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
-		for i := 0; i < benchmarkTimes; i++ {
-			_ = buildSite()
+			return err
 		}
 	}
 
+	var cpuProf *os.File
+	if cpuProfileFile != "" {
+		cpuProf, err = os.Create(cpuProfileFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	var memStats runtime.MemStats
+	runtime.ReadMemStats(&memStats)
+	memAllocated := memStats.TotalAlloc
+	mallocs := memStats.Mallocs
+	if cpuProf != nil {
+		pprof.StartCPUProfile(cpuProf)
+	}
+
+	t := time.Now()
+	for i := 0; i < benchmarkTimes; i++ {
+		if err = c.resetAndBuildSites(false); err != nil {
+			return err
+		}
+	}
+	totalTime := time.Since(t)
+
+	if memProf != nil {
+		pprof.WriteHeapProfile(memProf)
+		memProf.Close()
+	}
+	if cpuProf != nil {
+		pprof.StopCPUProfile()
+		cpuProf.Close()
+	}
+
+	runtime.ReadMemStats(&memStats)
+	totalMemAllocated := memStats.TotalAlloc - memAllocated
+	totalMallocs := memStats.Mallocs - mallocs
+
+	jww.FEEDBACK.Println()
+	jww.FEEDBACK.Printf("Average time per operation: %vms\n", int(1000*totalTime.Seconds()/float64(benchmarkTimes)))
+	jww.FEEDBACK.Printf("Average memory allocated per operation: %vkB\n", totalMemAllocated/uint64(benchmarkTimes)/1024)
+	jww.FEEDBACK.Printf("Average allocations per operation: %v\n", totalMallocs/uint64(benchmarkTimes))
+
+	return nil
 }

commands/check.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -15,17 +15,9 @@ package commands
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
 )
 
-var check = &cobra.Command{
+var checkCmd = &cobra.Command{
 	Use:   "check",
-	Short: "Check content in the source directory",
-	Long: `Hugo will perform some basic analysis on the
-    content provided and will give feedback.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		InitializeConfig()
-		site := hugolib.Site{}
-		site.Analyze()
-	},
+	Short: "Contains some verification checks",
 }

commands/commandeer.go

@@ -0,0 +1,62 @@
+// Copyright 2017 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+)
+
+type commandeer struct {
+	*deps.DepsCfg
+	pathSpec   *helpers.PathSpec
+	configured bool
+}
+
+func (c *commandeer) Set(key string, value interface{}) {
+	if c.configured {
+		panic("commandeer cannot be changed")
+	}
+	c.Cfg.Set(key, value)
+}
+
+// PathSpec lazily creates a new PathSpec, as all the paths must
+// be configured before it is created.
+func (c *commandeer) PathSpec() *helpers.PathSpec {
+	c.configured = true
+	return c.pathSpec
+}
+
+func (c *commandeer) initFs(fs *hugofs.Fs) error {
+	c.DepsCfg.Fs = fs
+	ps, err := helpers.NewPathSpec(fs, c.Cfg)
+	if err != nil {
+		return err
+	}
+	c.pathSpec = ps
+	return nil
+}
+
+func newCommandeer(cfg *deps.DepsCfg) (*commandeer, error) {
+	l := cfg.Language
+	if l == nil {
+		l = helpers.NewDefaultLanguage(cfg.Cfg)
+	}
+	ps, err := helpers.NewPathSpec(cfg.Fs, l)
+	if err != nil {
+		return nil, err
+	}
+	return &commandeer{DepsCfg: cfg, pathSpec: ps}, nil
+}

commands/convert.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,17 +14,15 @@
 package commands
 
 import (
+	"errors"
 	"fmt"
 	"path/filepath"
 	"time"
 
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
-	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/viper"
 )
 
 var outputDir string
@@ -32,47 +30,40 @@ var unsafe bool
 
 var convertCmd = &cobra.Command{
 	Use:   "convert",
-	Short: "Convert will modify your content to different formats",
-	Long:  `Convert will modify your content to different formats`,
-	Run:   nil,
+	Short: "Convert your content to different formats",
+	Long: `Convert your content (e.g. front matter) to different formats.
+
+See convert's subcommands toJSON, toTOML and toYAML for more information.`,
+	RunE: nil,
 }
 
 var toJSONCmd = &cobra.Command{
 	Use:   "toJSON",
 	Short: "Convert front matter to JSON",
-	Long: `toJSON will convert all front matter in the content
-	directory to use JSON for the front matter`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := convertContents(rune([]byte(parser.JSON_LEAD)[0]))
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
+	Long: `toJSON converts all front matter in the content directory
+to use JSON for the front matter.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return convertContents(rune([]byte(parser.JSONLead)[0]))
 	},
 }
 
 var toTOMLCmd = &cobra.Command{
 	Use:   "toTOML",
 	Short: "Convert front matter to TOML",
-	Long: `toTOML will convert all front matter in the content
-	directory to use TOML for the front matter`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := convertContents(rune([]byte(parser.TOML_LEAD)[0]))
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
+	Long: `toTOML converts all front matter in the content directory
+to use TOML for the front matter.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return convertContents(rune([]byte(parser.TOMLLead)[0]))
 	},
 }
 
 var toYAMLCmd = &cobra.Command{
 	Use:   "toYAML",
 	Short: "Convert front matter to YAML",
-	Long: `toYAML will convert all front matter in the content
-	directory to use YAML for the front matter`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := convertContents(rune([]byte(parser.YAML_LEAD)[0]))
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
+	Long: `toYAML converts all front matter in the content directory
+to use YAML for the front matter.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return convertContents(rune([]byte(parser.YAMLLead)[0]))
 	},
 }
 
@@ -81,68 +72,87 @@ func init() {
 	convertCmd.AddCommand(toTOMLCmd)
 	convertCmd.AddCommand(toYAMLCmd)
 	convertCmd.PersistentFlags().StringVarP(&outputDir, "output", "o", "", "filesystem path to write files to")
+	convertCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
 	convertCmd.PersistentFlags().BoolVar(&unsafe, "unsafe", false, "enable less safe operations, please backup first")
+	convertCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
 }
 
-func convertContents(mark rune) (err error) {
-	InitializeConfig()
-	site := &hugolib.Site{}
+func convertContents(mark rune) error {
+	cfg, err := InitializeConfig()
+	if err != nil {
+		return err
+	}
 
-	if err := site.Initialise(); err != nil {
+	h, err := hugolib.NewHugoSites(*cfg)
+	if err != nil {
+		return err
+	}
+
+	site := h.Sites[0]
+
+	if err = site.Initialise(); err != nil {
 		return err
 	}
 
 	if site.Source == nil {
-		panic(fmt.Sprintf("site.Source not set"))
+		panic("site.Source not set")
 	}
 	if len(site.Source.Files()) < 1 {
-		return fmt.Errorf("No source files found")
+		return errors.New("No source files found")
 	}
 
-	jww.FEEDBACK.Println("processing", len(site.Source.Files()), "content files")
+	contentDir := site.PathSpec.AbsPathify(site.Cfg.GetString("contentDir"))
+	site.Log.FEEDBACK.Println("processing", len(site.Source.Files()), "content files")
 	for _, file := range site.Source.Files() {
-		jww.INFO.Println("Attempting to convert", file.LogicalName())
-		page, err := hugolib.NewPage(file.LogicalName())
+		site.Log.INFO.Println("Attempting to convert", file.LogicalName())
+		page, err := site.NewPage(file.LogicalName())
 		if err != nil {
 			return err
 		}
 
 		psr, err := parser.ReadFrom(file.Contents)
 		if err != nil {
-			jww.ERROR.Println("Error processing file:", file.Path())
+			site.Log.ERROR.Println("Error processing file:", file.Path())
 			return err
 		}
 		metadata, err := psr.Metadata()
 		if err != nil {
-			jww.ERROR.Println("Error processing file:", file.Path())
+			site.Log.ERROR.Println("Error processing file:", file.Path())
 			return err
 		}
 
 		// better handling of dates in formats that don't have support for them
 		if mark == parser.FormatToLeadRune("json") || mark == parser.FormatToLeadRune("yaml") || mark == parser.FormatToLeadRune("toml") {
-			newmetadata := cast.ToStringMap(metadata)
-			for k, v := range newmetadata {
+			newMetadata := cast.ToStringMap(metadata)
+			for k, v := range newMetadata {
 				switch vv := v.(type) {
 				case time.Time:
-					newmetadata[k] = vv.Format(time.RFC3339)
+					newMetadata[k] = vv.Format(time.RFC3339)
 				}
 			}
-			metadata = newmetadata
+			metadata = newMetadata
 		}
 
-		page.SetDir(filepath.Join(helpers.AbsPathify(viper.GetString("ContentDir")), file.Dir()))
+		page.SetDir(filepath.Join(contentDir, file.Dir()))
 		page.SetSourceContent(psr.Content())
-		page.SetSourceMetaData(metadata, mark)
+		if err = page.SetSourceMetaData(metadata, mark); err != nil {
+			site.Log.ERROR.Printf("Failed to set source metadata for file %q: %s. For more info see For more info see https://github.com/gohugoio/hugo/issues/2458", page.FullFilePath(), err)
+			continue
+		}
 
 		if outputDir != "" {
-			page.SaveSourceAs(filepath.Join(outputDir, page.FullFilePath()))
+			if err = page.SaveSourceAs(filepath.Join(outputDir, page.FullFilePath())); err != nil {
+				return fmt.Errorf("Failed to save file %q: %s", page.FullFilePath(), err)
+			}
 		} else {
 			if unsafe {
-				page.SaveSource()
+				if err = page.SaveSource(); err != nil {
+					return fmt.Errorf("Failed to save file %q: %s", page.FullFilePath(), err)
+				}
 			} else {
-				jww.FEEDBACK.Println("Unsafe operation not allowed, use --unsafe or set a different output path")
+				site.Log.FEEDBACK.Println("Unsafe operation not allowed, use --unsafe or set a different output path")
 			}
 		}
 	}
-	return
+	return nil
 }

commands/env.go

@@ -0,0 +1,35 @@
+// Copyright 2016 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"runtime"
+
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+var envCmd = &cobra.Command{
+	Use:   "env",
+	Short: "Print Hugo version and environment info",
+	Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		printHugoVersion()
+		jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
+		jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
+		jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
+
+		return nil
+	},
+}

commands/gen.go

@@ -0,0 +1,23 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var genCmd = &cobra.Command{
+	Use:   "gen",
+	Short: "A collection of several useful generators.",
+}

commands/genautocomplete.go

@@ -1,3 +1,16 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package commands
 
 import (
@@ -11,35 +24,47 @@ var autocompleteTarget string
 var autocompleteType string
 
 var genautocompleteCmd = &cobra.Command{
-	Use:   "genautocomplete",
+	Use:   "autocomplete",
 	Short: "Generate shell autocompletion script for Hugo",
 	Long: `Generates a shell autocompletion script for Hugo.
-	
-	NOTE: The current version supports Bash only. This should work for *nix systems with Bash installed.
-	
-	By default the file is written directly to /etc/bash_completion.d for convenience and the command may need superuser rights, e.g:
-	
-	sudo hugo genautocomplete
-	
-	Add --completionfile=/path/to/file flag to set alternative file-path and name.
-	
-	Logout and in again to reload the completion scripts or just source them in directly:
-	
-	. /etc/bash_completion
-	`,
-	Run: func(cmd *cobra.Command, args []string) {
+
+NOTE: The current version supports Bash only.
+      This should work for *nix systems with Bash installed.
+
+By default, the file is written directly to /etc/bash_completion.d
+for convenience, and the command may need superuser rights, e.g.:
+
+	$ sudo hugo gen autocomplete
+
+Add ` + "`--completionfile=/path/to/file`" + ` flag to set alternative
+file-path and name.
+
+Logout and in again to reload the completion scripts,
+or just source them in directly:
+
+	$ . /etc/bash_completion`,
+
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if autocompleteType != "bash" {
-			jww.FATAL.Fatalln("Only Bash is supported for now")
+			return newUserError("Only Bash is supported for now")
 		}
+
 		err := cmd.Root().GenBashCompletionFile(autocompleteTarget)
+
 		if err != nil {
-			jww.FATAL.Fatalln("Failed to generate shell completion file:", err)
+			return err
 		}
+
+		jww.FEEDBACK.Println("Bash completion file for Hugo saved to", autocompleteTarget)
+
+		return nil
 	},
 }
 
 func init() {
-	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/hugo.sh", "Autocompletion file")
-	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteType, "type", "", "bash", "Autocompletion type (currently only bash supported)")
+	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/hugo.sh", "autocompletion file")
+	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteType, "type", "", "bash", "autocompletion type (currently only bash supported)")
 
+	// For bash-completion
+	genautocompleteCmd.PersistentFlags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
 }

commands/gendoc.go

@@ -1,14 +1,30 @@
+// Copyright 2016 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package commands
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
 	"path"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
 const gendocFrontmatterTemplate = `---
@@ -21,21 +37,25 @@ url: %s
 
 var gendocdir string
 var gendocCmd = &cobra.Command{
-	Use:   "gendoc",
+	Use:   "doc",
 	Short: "Generate Markdown documentation for the Hugo CLI.",
 	Long: `Generate Markdown documentation for the Hugo CLI.
-	
-	This command is, mostly, used to create up-to-date documentation for gohugo.io.
-	
-	It creates one Markdown file per command with front matter suitable for rendering in Hugo.
-	`,
 
-	Run: func(cmd *cobra.Command, args []string) {
+This command is, mostly, used to create up-to-date documentation
+of Hugo's command-line interface for http://gohugo.io/.
+
+It creates one Markdown file per command with front matter suitable
+for rendering in Hugo.`,
+
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if !strings.HasSuffix(gendocdir, helpers.FilePathSeparator) {
 			gendocdir += helpers.FilePathSeparator
 		}
-		if found, _ := helpers.Exists(gendocdir, hugofs.OsFs); !found {
-			hugofs.OsFs.Mkdir(gendocdir, 0777)
+		if found, _ := helpers.Exists(gendocdir, hugofs.Os); !found {
+			jww.FEEDBACK.Println("Directory", gendocdir, "does not exist, creating...")
+			if err := hugofs.Os.MkdirAll(gendocdir, 0777); err != nil {
+				return err
+			}
 		}
 		now := time.Now().Format(time.RFC3339)
 		prepender := func(filename string) string {
@@ -50,10 +70,17 @@ var gendocCmd = &cobra.Command{
 			return "/commands/" + strings.ToLower(base) + "/"
 		}
 
-		cobra.GenMarkdownTreeCustom(cmd.Root(), gendocdir, prepender, linkHandler)
+		jww.FEEDBACK.Println("Generating Hugo command-line documentation in", gendocdir, "...")
+		doc.GenMarkdownTreeCustom(cmd.Root(), gendocdir, prepender, linkHandler)
+		jww.FEEDBACK.Println("Done.")
+
+		return nil
 	},
 }
 
 func init() {
 	gendocCmd.PersistentFlags().StringVar(&gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
+
+	// For bash-completion
+	gendocCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 }

commands/gendocshelper.go

@@ -0,0 +1,72 @@
+// Copyright 2017-present The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/gohugoio/hugo/docshelper"
+	"github.com/spf13/cobra"
+)
+
+type genDocsHelper struct {
+	target string
+	cmd    *cobra.Command
+}
+
+func createGenDocsHelper() *genDocsHelper {
+	g := &genDocsHelper{
+		cmd: &cobra.Command{
+			Use:    "docshelper",
+			Short:  "Generate some data files for the Hugo docs.",
+			Hidden: true,
+		},
+	}
+
+	g.cmd.RunE = func(cmd *cobra.Command, args []string) error {
+		return g.generate()
+	}
+
+	// Note that ./docs is a submodule, and writing to that would be suboptimal.
+	// Let us assume that the default is a sibling project.
+	g.cmd.PersistentFlags().StringVarP(&g.target, "dir", "", "../hugoDocs/data", "data dir")
+
+	return g
+}
+
+func (g *genDocsHelper) generate() error {
+	fmt.Println("Generate docs data to", g.target)
+
+	targetFile := filepath.Join(g.target, "docs.json")
+
+	f, err := os.Create(targetFile)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	enc := json.NewEncoder(f)
+	enc.SetIndent("", "  ")
+
+	if err := enc.Encode(docshelper.DocProviders); err != nil {
+		return err
+	}
+
+	fmt.Println("Done!")
+	return nil
+
+}

commands/genman.go

@@ -0,0 +1,66 @@
+// Copyright 2016 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+var genmandir string
+var genmanCmd = &cobra.Command{
+	Use:   "man",
+	Short: "Generate man pages for the Hugo CLI",
+	Long: `This command automatically generates up-to-date man pages of Hugo's
+command-line interface.  By default, it creates the man page files
+in the "man" directory under the current directory.`,
+
+	RunE: func(cmd *cobra.Command, args []string) error {
+		header := &doc.GenManHeader{
+			Section: "1",
+			Manual:  "Hugo Manual",
+			Source:  fmt.Sprintf("Hugo %s", helpers.CurrentHugoVersion),
+		}
+		if !strings.HasSuffix(genmandir, helpers.FilePathSeparator) {
+			genmandir += helpers.FilePathSeparator
+		}
+		if found, _ := helpers.Exists(genmandir, hugofs.Os); !found {
+			jww.FEEDBACK.Println("Directory", genmandir, "does not exist, creating...")
+			if err := hugofs.Os.MkdirAll(genmandir, 0777); err != nil {
+				return err
+			}
+		}
+		cmd.Root().DisableAutoGenTag = true
+
+		jww.FEEDBACK.Println("Generating Hugo man pages in", genmandir, "...")
+		doc.GenManTree(cmd.Root(), header, genmandir)
+
+		jww.FEEDBACK.Println("Done.")
+
+		return nil
+	},
+}
+
+func init() {
+	genmanCmd.PersistentFlags().StringVar(&genmandir, "dir", "man/", "the directory to write the man pages.")
+
+	// For bash-completion
+	genmanCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+}

commands/hugo_windows.go

@@ -0,0 +1,27 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import "github.com/spf13/cobra"
+
+func init() {
+	// This message to show to Windows users if Hugo is opened from explorer.exe
+	cobra.MousetrapHelpText = `
+
+  Hugo is a command-line tool for generating static website.
+
+  You need to open cmd.exe and run Hugo from there.
+  
+  Visit http://gohugo.io/ for more information.`
+}

commands/import_jekyll.go

@@ -0,0 +1,577 @@
+// Copyright 2016 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
+	"github.com/spf13/afero"
+	"github.com/spf13/cast"
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+func init() {
+	importCmd.AddCommand(importJekyllCmd)
+}
+
+var importCmd = &cobra.Command{
+	Use:   "import",
+	Short: "Import your site from others.",
+	Long: `Import your site from other web site generators like Jekyll.
+
+Import requires a subcommand, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
+	RunE: nil,
+}
+
+var importJekyllCmd = &cobra.Command{
+	Use:   "jekyll",
+	Short: "hugo import from Jekyll",
+	Long: `hugo import from Jekyll.
+
+Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
+	RunE: importFromJekyll,
+}
+
+func init() {
+	importJekyllCmd.Flags().Bool("force", false, "allow import into non-empty target directory")
+}
+
+func 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`.")
+	}
+
+	jekyllRoot, err := filepath.Abs(filepath.Clean(args[0]))
+	if err != nil {
+		return newUserError("Path error:", args[0])
+	}
+
+	targetDir, err := filepath.Abs(filepath.Clean(args[1]))
+	if err != nil {
+		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.")
+	}
+
+	forceImport, _ := cmd.Flags().GetBool("force")
+	site, err := createSiteFromJekyll(jekyllRoot, targetDir, forceImport)
+	if err != nil {
+		return err
+	}
+
+	jww.FEEDBACK.Println("Importing...")
+
+	fileCount := 0
+	callback := func(path string, fi os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if fi.IsDir() {
+			return nil
+		}
+
+		relPath, err := filepath.Rel(jekyllRoot, path)
+		if err != nil {
+			return newUserError("Get rel path error:", path)
+		}
+
+		relPath = filepath.ToSlash(relPath)
+		draft := false
+
+		switch {
+		case strings.HasPrefix(relPath, "_posts/"):
+			relPath = "content/post" + relPath[len("_posts"):]
+		case strings.HasPrefix(relPath, "_drafts/"):
+			relPath = "content/draft" + relPath[len("_drafts"):]
+			draft = true
+		default:
+			return nil
+		}
+
+		fileCount++
+		return convertJekyllPost(site, path, relPath, targetDir, draft)
+	}
+
+	err = helpers.SymbolicWalk(hugofs.Os, jekyllRoot, callback)
+
+	if err != nil {
+		return err
+	}
+	jww.FEEDBACK.Println("Congratulations!", fileCount, "post(s) imported!")
+	jww.FEEDBACK.Println("Now, start Hugo by yourself:\n" +
+		"$ git clone https://github.com/spf13/herring-cove.git " + args[1] + "/themes/herring-cove")
+	jww.FEEDBACK.Println("$ cd " + args[1] + "\n$ hugo server --theme=herring-cove")
+
+	return nil
+}
+
+// TODO: Consider calling doNewSite() instead?
+func createSiteFromJekyll(jekyllRoot, targetDir string, force bool) (*hugolib.Site, error) {
+	s, err := hugolib.NewSiteDefaultLang()
+	if err != nil {
+		return nil, err
+	}
+
+	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")
+		}
+
+		isEmpty, _ := helpers.IsEmpty(targetDir, fs)
+
+		if !isEmpty && !force {
+			return nil, errors.New("Target path \"" + targetDir + "\" already exists and is not empty")
+		}
+	}
+
+	jekyllConfig := loadJekyllConfig(fs, jekyllRoot)
+
+	// Crude test to make sure at least one of _drafts/ and _posts/ exists
+	// and is not empty.
+	hasPostsOrDrafts := false
+	postsDir := filepath.Join(jekyllRoot, "_posts")
+	draftsDir := filepath.Join(jekyllRoot, "_drafts")
+	for _, d := range []string{postsDir, draftsDir} {
+		if exists, _ := helpers.Exists(d, fs); exists {
+			if isDir, _ := helpers.IsDir(d, fs); isDir {
+				if isEmpty, _ := helpers.IsEmpty(d, fs); !isEmpty {
+					hasPostsOrDrafts = true
+				}
+			}
+		}
+	}
+	if !hasPostsOrDrafts {
+		return nil, errors.New("Your Jekyll root contains neither posts nor drafts, aborting.")
+	}
+
+	mkdir(targetDir, "layouts")
+	mkdir(targetDir, "content")
+	mkdir(targetDir, "archetypes")
+	mkdir(targetDir, "static")
+	mkdir(targetDir, "data")
+	mkdir(targetDir, "themes")
+
+	createConfigFromJekyll(fs, targetDir, "yaml", jekyllConfig)
+
+	copyJekyllFilesAndFolders(jekyllRoot, filepath.Join(targetDir, "static"))
+
+	return s, nil
+}
+
+func loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
+	path := filepath.Join(jekyllRoot, "_config.yml")
+
+	exists, err := helpers.Exists(path, fs)
+
+	if err != nil || !exists {
+		jww.WARN.Println("_config.yaml not found: Is the specified Jekyll root correct?")
+		return nil
+	}
+
+	f, err := fs.Open(path)
+	if err != nil {
+		return nil
+	}
+
+	defer f.Close()
+
+	b, err := ioutil.ReadAll(f)
+
+	if err != nil {
+		return nil
+	}
+
+	c, err := parser.HandleYAMLMetaData(b)
+
+	if err != nil {
+		return nil
+	}
+
+	return c.(map[string]interface{})
+}
+
+func createConfigFromJekyll(fs afero.Fs, inpath string, kind string, jekyllConfig map[string]interface{}) (err error) {
+	title := "My New Hugo Site"
+	baseURL := "http://example.org/"
+
+	for key, value := range jekyllConfig {
+		lowerKey := strings.ToLower(key)
+
+		switch lowerKey {
+		case "title":
+			if str, ok := value.(string); ok {
+				title = str
+			}
+
+		case "url":
+			if str, ok := value.(string); ok {
+				baseURL = str
+			}
+		}
+	}
+
+	in := map[string]interface{}{
+		"baseURL":            baseURL,
+		"title":              title,
+		"languageCode":       "en-us",
+		"disablePathToLower": true,
+	}
+	kind = parser.FormatSanitize(kind)
+
+	var buf bytes.Buffer
+	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
+	if err != nil {
+		return err
+	}
+
+	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs)
+}
+
+func copyFile(source string, dest string) error {
+	sf, err := os.Open(source)
+	if err != nil {
+		return err
+	}
+	defer sf.Close()
+	df, err := os.Create(dest)
+	if err != nil {
+		return err
+	}
+	defer df.Close()
+	_, err = io.Copy(df, sf)
+	if err == nil {
+		si, err := os.Stat(source)
+		if err != nil {
+			err = os.Chmod(dest, si.Mode())
+
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+	return nil
+}
+
+func copyDir(source string, dest string) error {
+	fi, err := os.Stat(source)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New(source + " is not a directory")
+	}
+	err = os.MkdirAll(dest, fi.Mode())
+	if err != nil {
+		return err
+	}
+	entries, err := ioutil.ReadDir(source)
+	for _, entry := range entries {
+		sfp := filepath.Join(source, entry.Name())
+		dfp := filepath.Join(dest, entry.Name())
+		if entry.IsDir() {
+			err = copyDir(sfp, dfp)
+			if err != nil {
+				jww.ERROR.Println(err)
+			}
+		} else {
+			err = copyFile(sfp, dfp)
+			if err != nil {
+				jww.ERROR.Println(err)
+			}
+		}
+
+	}
+	return nil
+}
+
+func copyJekyllFilesAndFolders(jekyllRoot string, dest string) error {
+	fi, err := os.Stat(jekyllRoot)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New(jekyllRoot + " is not a directory")
+	}
+	err = os.MkdirAll(dest, fi.Mode())
+	if err != nil {
+		return err
+	}
+	entries, err := ioutil.ReadDir(jekyllRoot)
+	for _, entry := range entries {
+		sfp := filepath.Join(jekyllRoot, entry.Name())
+		dfp := filepath.Join(dest, entry.Name())
+		if entry.IsDir() {
+			if entry.Name()[0] != '_' && entry.Name()[0] != '.' {
+				err = copyDir(sfp, dfp)
+				if err != nil {
+					jww.ERROR.Println(err)
+				}
+			}
+		} else {
+			lowerEntryName := strings.ToLower(entry.Name())
+			exceptSuffix := []string{".md", ".markdown", ".html", ".htm",
+				".xml", ".textile", "rakefile", "gemfile", ".lock"}
+			isExcept := false
+			for _, suffix := range exceptSuffix {
+				if strings.HasSuffix(lowerEntryName, suffix) {
+					isExcept = true
+					break
+				}
+			}
+
+			if !isExcept && entry.Name()[0] != '.' && entry.Name()[0] != '_' {
+				err = copyFile(sfp, dfp)
+				if err != nil {
+					jww.ERROR.Println(err)
+				}
+			}
+		}
+
+	}
+	return nil
+}
+
+func parseJekyllFilename(filename string) (time.Time, string, error) {
+	re := regexp.MustCompile(`(\d+-\d+-\d+)-(.+)\..*`)
+	r := re.FindAllStringSubmatch(filename, -1)
+	if len(r) == 0 {
+		return time.Now(), "", errors.New("filename not match")
+	}
+
+	postDate, err := time.Parse("2006-1-2", r[0][1])
+	if err != nil {
+		return time.Now(), "", err
+	}
+
+	postName := r[0][2]
+
+	return postDate, postName, nil
+}
+
+func convertJekyllPost(s *hugolib.Site, path, relPath, targetDir string, draft bool) error {
+	jww.TRACE.Println("Converting", path)
+
+	filename := filepath.Base(path)
+	postDate, postName, err := parseJekyllFilename(filename)
+	if err != nil {
+		jww.WARN.Printf("Failed to parse filename '%s': %s. Skipping.", filename, err)
+		return nil
+	}
+
+	jww.TRACE.Println(filename, postDate, postName)
+
+	targetFile := filepath.Join(targetDir, relPath)
+	targetParentDir := filepath.Dir(targetFile)
+	os.MkdirAll(targetParentDir, 0777)
+
+	contentBytes, err := ioutil.ReadFile(path)
+	if err != nil {
+		jww.ERROR.Println("Read file error:", path)
+		return err
+	}
+
+	psr, err := parser.ReadFrom(bytes.NewReader(contentBytes))
+	if err != nil {
+		jww.ERROR.Println("Parse file error:", path)
+		return err
+	}
+
+	metadata, err := psr.Metadata()
+	if err != nil {
+		jww.ERROR.Println("Processing file error:", path)
+		return err
+	}
+
+	newmetadata, err := convertJekyllMetaData(metadata, postName, postDate, draft)
+	if err != nil {
+		jww.ERROR.Println("Convert metadata error:", path)
+		return err
+	}
+
+	jww.TRACE.Println(newmetadata)
+	content := convertJekyllContent(newmetadata, string(psr.Content()))
+
+	page, err := s.NewPage(filename)
+	if err != nil {
+		jww.ERROR.Println("New page error", filename)
+		return err
+	}
+
+	page.SetDir(targetParentDir)
+	page.SetSourceContent([]byte(content))
+	page.SetSourceMetaData(newmetadata, parser.FormatToLeadRune("yaml"))
+	page.SaveSourceAs(targetFile)
+
+	jww.TRACE.Println("Target file:", targetFile)
+
+	return nil
+}
+
+func convertJekyllMetaData(m interface{}, postName string, postDate time.Time, draft bool) (interface{}, error) {
+	url := postDate.Format("/2006/01/02/") + postName + "/"
+
+	metadata, err := cast.ToStringMapE(m)
+	if err != nil {
+		return nil, err
+	}
+
+	if draft {
+		metadata["draft"] = true
+	}
+
+	for key, value := range metadata {
+		lowerKey := strings.ToLower(key)
+
+		switch lowerKey {
+		case "layout":
+			delete(metadata, key)
+		case "permalink":
+			if str, ok := value.(string); ok {
+				url = str
+			}
+			delete(metadata, key)
+		case "category":
+			if str, ok := value.(string); ok {
+				metadata["categories"] = []string{str}
+			}
+			delete(metadata, key)
+		case "excerpt_separator":
+			if key != lowerKey {
+				delete(metadata, key)
+				metadata[lowerKey] = value
+			}
+		case "date":
+			if str, ok := value.(string); ok {
+				re := regexp.MustCompile(`(\d+):(\d+):(\d+)`)
+				r := re.FindAllStringSubmatch(str, -1)
+				if len(r) > 0 {
+					hour, _ := strconv.Atoi(r[0][1])
+					minute, _ := strconv.Atoi(r[0][2])
+					second, _ := strconv.Atoi(r[0][3])
+					postDate = time.Date(postDate.Year(), postDate.Month(), postDate.Day(), hour, minute, second, 0, time.UTC)
+				}
+			}
+			delete(metadata, key)
+		}
+
+	}
+
+	metadata["url"] = url
+	metadata["date"] = postDate.Format(time.RFC3339)
+
+	return metadata, nil
+}
+
+func convertJekyllContent(m interface{}, content string) string {
+	metadata, _ := cast.ToStringMapE(m)
+
+	lines := strings.Split(content, "\n")
+	var resultLines []string
+	for _, line := range lines {
+		resultLines = append(resultLines, strings.Trim(line, "\r\n"))
+	}
+
+	content = strings.Join(resultLines, "\n")
+
+	excerptSep := "<!--more-->"
+	if value, ok := metadata["excerpt_separator"]; ok {
+		if str, strOk := value.(string); strOk {
+			content = strings.Replace(content, strings.TrimSpace(str), excerptSep, -1)
+		}
+	}
+
+	replaceList := []struct {
+		re      *regexp.Regexp
+		replace string
+	}{
+		{regexp.MustCompile("(?i)<!-- more -->"), "<!--more-->"},
+		{regexp.MustCompile(`\{%\s*raw\s*%\}\s*(.*?)\s*\{%\s*endraw\s*%\}`), "$1"},
+		{regexp.MustCompile(`{%\s*highlight\s*(.*?)\s*%}`), "{{< highlight $1 >}}"},
+		{regexp.MustCompile(`{%\s*endhighlight\s*%}`), "{{< / highlight >}}"},
+	}
+
+	for _, replace := range replaceList {
+		content = replace.re.ReplaceAllString(content, replace.replace)
+	}
+
+	replaceListFunc := []struct {
+		re      *regexp.Regexp
+		replace func(string) string
+	}{
+		// Octopress image tag: http://octopress.org/docs/plugins/image-tag/
+		{regexp.MustCompile(`{%\s+img\s*(.*?)\s*%}`), replaceImageTag},
+	}
+
+	for _, replace := range replaceListFunc {
+		content = replace.re.ReplaceAllStringFunc(content, replace.replace)
+	}
+
+	return content
+}
+
+func replaceImageTag(match string) string {
+	r := regexp.MustCompile(`{%\s+img\s*(\p{L}*)\s+([\S]*/[\S]+)\s+(\d*)\s*(\d*)\s*(.*?)\s*%}`)
+	result := bytes.NewBufferString("{{< figure ")
+	parts := r.FindStringSubmatch(match)
+	// Index 0 is the entire string, ignore
+	replaceOptionalPart(result, "class", parts[1])
+	replaceOptionalPart(result, "src", parts[2])
+	replaceOptionalPart(result, "width", parts[3])
+	replaceOptionalPart(result, "height", parts[4])
+	// title + alt
+	part := parts[5]
+	if len(part) > 0 {
+		splits := strings.Split(part, "'")
+		lenSplits := len(splits)
+		if lenSplits == 1 {
+			replaceOptionalPart(result, "title", splits[0])
+		} else if lenSplits == 3 {
+			replaceOptionalPart(result, "title", splits[1])
+		} else if lenSplits == 5 {
+			replaceOptionalPart(result, "title", splits[1])
+			replaceOptionalPart(result, "alt", splits[3])
+		}
+	}
+	result.WriteString(">}}")
+	return result.String()
+
+}
+func replaceOptionalPart(buffer *bytes.Buffer, partName string, part string) {
+	if len(part) > 0 {
+		buffer.WriteString(partName + "=\"" + part + "\" ")
+	}
+}

commands/import_jekyll_test.go

@@ -0,0 +1,126 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"encoding/json"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestParseJekyllFilename(t *testing.T) {
+	filenameArray := []string{
+		"2015-01-02-test.md",
+		"2012-03-15-中文.markup",
+	}
+
+	expectResult := []struct {
+		postDate time.Time
+		postName string
+	}{
+		{time.Date(2015, time.January, 2, 0, 0, 0, 0, time.UTC), "test"},
+		{time.Date(2012, time.March, 15, 0, 0, 0, 0, time.UTC), "中文"},
+	}
+
+	for i, filename := range filenameArray {
+		postDate, postName, err := parseJekyllFilename(filename)
+		assert.Equal(t, err, nil)
+		assert.Equal(t, expectResult[i].postDate.Format("2006-01-02"), postDate.Format("2006-01-02"))
+		assert.Equal(t, expectResult[i].postName, postName)
+	}
+}
+
+func TestConvertJekyllMetadata(t *testing.T) {
+	testDataList := []struct {
+		metadata interface{}
+		postName string
+		postDate time.Time
+		draft    bool
+		expect   string
+	}{
+		{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"date":"2015-10-01T00:00:00Z","url":"/2015/10/01/testPost/"}`},
+		{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), true,
+			`{"date":"2015-10-01T00:00:00Z","draft":true,"url":"/2015/10/01/testPost/"}`},
+		{map[interface{}]interface{}{"Permalink": "/permalink.html", "layout": "post"},
+			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"date":"2015-10-01T00:00:00Z","url":"/permalink.html"}`},
+		{map[interface{}]interface{}{"permalink": "/permalink.html"},
+			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"date":"2015-10-01T00:00:00Z","url":"/permalink.html"}`},
+		{map[interface{}]interface{}{"category": nil, "permalink": 123},
+			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"date":"2015-10-01T00:00:00Z","url":"/2015/10/01/testPost/"}`},
+		{map[interface{}]interface{}{"Excerpt_Separator": "sep"},
+			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"date":"2015-10-01T00:00:00Z","excerpt_separator":"sep","url":"/2015/10/01/testPost/"}`},
+		{map[interface{}]interface{}{"category": "book", "layout": "post", "Others": "Goods", "Date": "2015-10-01 12:13:11"},
+			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"Others":"Goods","categories":["book"],"date":"2015-10-01T12:13:11Z","url":"/2015/10/01/testPost/"}`},
+	}
+
+	for _, data := range testDataList {
+		result, err := convertJekyllMetaData(data.metadata, data.postName, data.postDate, data.draft)
+		assert.Equal(t, nil, err)
+		jsonResult, err := json.Marshal(result)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, data.expect, string(jsonResult))
+	}
+}
+
+func TestConvertJekyllContent(t *testing.T) {
+	testDataList := []struct {
+		metadata interface{}
+		content  string
+		expect   string
+	}{
+		{map[interface{}]interface{}{},
+			`Test content\n<!-- more -->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
+		{map[interface{}]interface{}{},
+			`Test content\n<!-- More -->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
+		{map[interface{}]interface{}{"excerpt_separator": "<!--sep-->"},
+			`Test content\n<!--sep-->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
+		{map[interface{}]interface{}{}, "{% raw %}text{% endraw %}", "text"},
+		{map[interface{}]interface{}{}, "{%raw%} text2 {%endraw %}", "text2"},
+		{map[interface{}]interface{}{},
+			"{% highlight go %}\nvar s int\n{% endhighlight %}",
+			"{{< highlight go >}}\nvar s int\n{{< / highlight >}}"},
+
+		// Octopress image tag
+		{map[interface{}]interface{}{},
+			"{% img http://placekitten.com/890/280 %}",
+			"{{< figure src=\"http://placekitten.com/890/280\" >}}"},
+		{map[interface{}]interface{}{},
+			"{% img left http://placekitten.com/320/250 Place Kitten #2 %}",
+			"{{< figure class=\"left\" src=\"http://placekitten.com/320/250\" title=\"Place Kitten #2\" >}}"},
+		{map[interface{}]interface{}{},
+			"{% img right http://placekitten.com/300/500 150 250 'Place Kitten #3' %}",
+			"{{< figure class=\"right\" src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #3\" >}}"},
+		{map[interface{}]interface{}{},
+			"{% img right http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten' %}",
+			"{{< figure class=\"right\" src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
+		{map[interface{}]interface{}{},
+			"{% img http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten' %}",
+			"{{< figure src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
+		{map[interface{}]interface{}{},
+			"{% img right /placekitten/300/500 'Place Kitten #4' 'An image of a very cute kitten' %}",
+			"{{< figure class=\"right\" src=\"/placekitten/300/500\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
+	}
+
+	for _, data := range testDataList {
+		result := convertJekyllContent(data.metadata, data.content)
+		assert.Equal(t, data.expect, result)
+	}
+}

commands/limit_darwin.go

@@ -1,10 +1,22 @@
-// +build darwin
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// 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,
@@ -22,20 +34,21 @@ import (
 )
 
 func init() {
-	check.AddCommand(limit)
+	checkCmd.AddCommand(limit)
 }
 
 var limit = &cobra.Command{
 	Use:   "ulimit",
 	Short: "Check system ulimit settings",
 	Long: `Hugo will inspect the current ulimit settings on the system.
-    This is primarily to ensure that Hugo can watch enough files on some OSs`,
-	Run: func(cmd *cobra.Command, args []string) {
+This is primarily to ensure that Hugo can watch enough files on some OSs`,
+	RunE: func(cmd *cobra.Command, args []string) error {
 		var rLimit syscall.Rlimit
 		err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Error Getting Rlimit ", err)
+			return newSystemError("Error Getting Rlimit ", err)
 		}
+
 		jww.FEEDBACK.Println("Current rLimit:", rLimit)
 
 		jww.FEEDBACK.Println("Attempting to increase limit")
@@ -43,13 +56,15 @@ var limit = &cobra.Command{
 		rLimit.Cur = 999999
 		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Error Setting rLimit ", err)
+			return newSystemError("Error Setting rLimit ", err)
 		}
 		err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Error Getting rLimit ", err)
+			return newSystemError("Error Getting rLimit ", err)
 		}
 		jww.FEEDBACK.Println("rLimit after change:", rLimit)
+
+		return nil
 	},
 }
 
@@ -60,11 +75,11 @@ func tweakLimit() {
 		jww.ERROR.Println("Unable to obtain rLimit", err)
 	}
 	if rLimit.Cur < rLimit.Max {
-		rLimit.Max = 999999
-		rLimit.Cur = 999999
+		rLimit.Max = 64000
+		rLimit.Cur = 64000
 		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Unable to increase number of open files limit", err)
+			jww.WARN.Println("Unable to increase number of open files limit", err)
 		}
 	}
 }

commands/limit_others.go

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

commands/list.go

@@ -1,9 +1,9 @@
-// Copyright © 2014 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,72 +14,148 @@
 package commands
 
 import (
-	"fmt"
 	"path/filepath"
 
+	"github.com/gohugoio/hugo/hugolib"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/viper"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
 func init() {
 	listCmd.AddCommand(listDraftsCmd)
 	listCmd.AddCommand(listFutureCmd)
+	listCmd.AddCommand(listExpiredCmd)
+	listCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
+	listCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
 }
 
 var listCmd = &cobra.Command{
 	Use:   "list",
 	Short: "Listing out various types of content",
-	Long:  `Listing out various types of content. List requires a subcommand, eg. hugo list drafts`,
-	Run:   nil,
+	Long: `Listing out various types of content.
+
+List requires a subcommand, e.g. ` + "`hugo list drafts`.",
+	RunE: nil,
 }
 
 var listDraftsCmd = &cobra.Command{
 	Use:   "drafts",
 	Short: "List all drafts",
-	Long:  `List all of the drafts in your content directory`,
-	Run: func(cmd *cobra.Command, args []string) {
+	Long:  `List all of the drafts in your content directory.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
 
-		InitializeConfig()
-		viper.Set("BuildDrafts", true)
-
-		site := &hugolib.Site{}
-
-		if err := site.Process(); err != nil {
-			fmt.Println("Error Processing Source Content", err)
+		cfg, err := InitializeConfig()
+		if err != nil {
+			return err
 		}
 
-		for _, p := range site.Pages {
+		c, err := newCommandeer(cfg)
+		if err != nil {
+			return err
+		}
+
+		c.Set("buildDrafts", true)
+
+		sites, err := hugolib.NewHugoSites(*cfg)
+
+		if err != nil {
+			return newSystemError("Error creating sites", err)
+		}
+
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return newSystemError("Error Processing Source Content", err)
+		}
+
+		for _, p := range sites.Pages() {
 			if p.IsDraft() {
-				fmt.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
 			}
 
 		}
 
+		return nil
+
 	},
 }
 
 var listFutureCmd = &cobra.Command{
 	Use:   "future",
 	Short: "List all posts dated in the future",
-	Long:  `List all of the posts in your content directory who will be posted in the future`,
-	Run: func(cmd *cobra.Command, args []string) {
+	Long: `List all of the posts in your content directory which will be
+posted in the future.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
 
-		InitializeConfig()
-		viper.Set("BuildFuture", true)
-
-		site := &hugolib.Site{}
-
-		if err := site.Process(); err != nil {
-			fmt.Println("Error Processing Source Content", err)
+		cfg, err := InitializeConfig()
+		if err != nil {
+			return err
 		}
 
-		for _, p := range site.Pages {
+		c, err := newCommandeer(cfg)
+		if err != nil {
+			return err
+		}
+
+		c.Set("buildFuture", true)
+
+		sites, err := hugolib.NewHugoSites(*cfg)
+
+		if err != nil {
+			return newSystemError("Error creating sites", err)
+		}
+
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return newSystemError("Error Processing Source Content", err)
+		}
+
+		for _, p := range sites.Pages() {
 			if p.IsFuture() {
-				fmt.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
 			}
 
 		}
 
+		return nil
+
+	},
+}
+
+var listExpiredCmd = &cobra.Command{
+	Use:   "expired",
+	Short: "List all posts already expired",
+	Long: `List all of the posts in your content directory which has already
+expired.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+
+		cfg, err := InitializeConfig()
+		if err != nil {
+			return err
+		}
+
+		c, err := newCommandeer(cfg)
+		if err != nil {
+			return err
+		}
+
+		c.Set("buildExpired", true)
+
+		sites, err := hugolib.NewHugoSites(*cfg)
+
+		if err != nil {
+			return newSystemError("Error creating sites", err)
+		}
+
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return newSystemError("Error Processing Source Content", err)
+		}
+
+		for _, p := range sites.Pages() {
+			if p.IsExpired() {
+				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+			}
+
+		}
+
+		return nil
+
 	},
 }

commands/list_config.go

@@ -1,9 +1,9 @@
-// Copyright © 2013-15 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,40 +14,53 @@
 package commands
 
 import (
-	"fmt"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"reflect"
 	"sort"
+
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+	"github.com/spf13/viper"
 )
 
-var config = &cobra.Command{
+var configCmd = &cobra.Command{
 	Use:   "config",
 	Short: "Print the site configuration",
-	Long:  `Print the site configuration, both default and custom settings`,
-	Run: func(cmd *cobra.Command, args []string) {
-		InitializeConfig()
-		allSettings := viper.AllSettings()
-
-		var separator string
-		if allSettings["metadataformat"] == "toml" {
-			separator = " = "
-		} else {
-			separator = ": "
-		}
-
-		var keys []string
-		for k := range allSettings {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		for _, k := range keys {
-			kv := reflect.ValueOf(allSettings[k])
-			if kv.Kind() == reflect.String {
-				fmt.Printf("%s%s\"%+v\"\n", k, separator, allSettings[k])
-			} else {
-				fmt.Printf("%s%s%+v\n", k, separator, allSettings[k])
-			}
-		}
-	},
+	Long:  `Print the site configuration, both default and custom settings.`,
+}
+
+func init() {
+	configCmd.RunE = printConfig
+}
+
+func printConfig(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(configCmd)
+
+	if err != nil {
+		return err
+	}
+
+	allSettings := cfg.Cfg.(*viper.Viper).AllSettings()
+
+	var separator string
+	if allSettings["metadataformat"] == "toml" {
+		separator = " = "
+	} else {
+		separator = ": "
+	}
+
+	var keys []string
+	for k := range allSettings {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		kv := reflect.ValueOf(allSettings[k])
+		if kv.Kind() == reflect.String {
+			jww.FEEDBACK.Printf("%s%s\"%+v\"\n", k, separator, allSettings[k])
+		} else {
+			jww.FEEDBACK.Printf("%s%s%+v\n", k, separator, allSettings[k])
+		}
+	}
+
+	return nil
 }

commands/new.go

@@ -1,9 +1,9 @@
-// Copyright © 2014-2015 Steve Francia <spf@spf13.com>.
+// Copyright 2016 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -15,32 +15,41 @@ package commands
 
 import (
 	"bytes"
+	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/gohugoio/hugo/create"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
+	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/create"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 )
 
-var siteType string
-var configFormat string
-var contentType string
-var contentFormat string
-var contentFrontMatter string
+var (
+	configFormat  string
+	contentEditor string
+	contentType   string
+)
 
 func init() {
 	newSiteCmd.Flags().StringVarP(&configFormat, "format", "f", "toml", "config & frontmatter format")
-	newCmd.Flags().StringVarP(&configFormat, "format", "f", "toml", "frontmatter format")
-	newCmd.Flags().StringVarP(&contentType, "kind", "k", "", "Content type to create")
+	newSiteCmd.Flags().Bool("force", false, "init inside non-empty directory")
+	newCmd.Flags().StringVarP(&contentType, "kind", "k", "", "content type to create")
+	newCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
+	newCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+	newCmd.Flags().StringVar(&contentEditor, "editor", "", "edit new content with this editor, if provided")
+
 	newCmd.AddCommand(newSiteCmd)
 	newCmd.AddCommand(newThemeCmd)
+
 }
 
 var newCmd = &cobra.Command{
@@ -48,10 +57,12 @@ var newCmd = &cobra.Command{
 	Short: "Create new content for your site",
 	Long: `Create a new content file and automatically set the date and title.
 It will guess which kind of file to create based on the path provided.
-You can also specify the kind with -k KIND
-If archetypes are provided in your theme or site, they will be used.
-`,
-	Run: NewContent,
+
+You can also specify the kind with ` + "`-k KIND`" + `.
+
+If archetypes are provided in your theme or site, they will be used.`,
+
+	RunE: NewContent,
 }
 
 var newSiteCmd = &cobra.Command{
@@ -59,9 +70,8 @@ var newSiteCmd = &cobra.Command{
 	Short: "Create a new site (skeleton)",
 	Long: `Create a new site in the provided directory.
 The new site will have the correct structure, but no content or theme yet.
-Use 'hugo new [contentPath]' to create new content.
-	`,
-	Run: NewSite,
+Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
+	RunE: NewSite,
 }
 
 var newThemeCmd = &cobra.Command{
@@ -70,99 +80,202 @@ var newThemeCmd = &cobra.Command{
 	Long: `Create a new theme (skeleton) called [name] in the current directory.
 New theme is a skeleton. Please add content to the touched files. Add your
 name to the copyright line in the license and adjust the theme.toml file
-as you see fit.
-	`,
-	Run: NewTheme,
+as you see fit.`,
+	RunE: NewTheme,
 }
 
 // NewContent adds new content to a Hugo site.
-func NewContent(cmd *cobra.Command, args []string) {
-	InitializeConfig()
+func NewContent(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
 
-	if cmd.Flags().Lookup("format").Changed {
-		viper.Set("MetaDataFormat", configFormat)
+	if err != nil {
+		return err
+	}
+
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	if cmd.Flags().Changed("editor") {
+		c.Set("newContentEditor", contentEditor)
 	}
 
 	if len(args) < 1 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("path needs to be provided")
+		return newUserError("path needs to be provided")
 	}
 
-	createpath := args[0]
+	createPath := args[0]
 
 	var kind string
 
-	createpath, kind = newContentPathSection(createpath)
+	createPath, kind = newContentPathSection(createPath)
 
 	if contentType != "" {
 		kind = contentType
 	}
 
-	err := create.NewContent(kind, createpath)
+	ps, err := helpers.NewPathSpec(cfg.Fs, cfg.Cfg)
 	if err != nil {
-		jww.ERROR.Println(err)
+		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.initSites(); err != nil {
+			return nil, err
+		}
+
+		if err := Hugo.Build(hugolib.BuildCfg{SkipRender: true, PrintStats: false}); err != nil {
+			return nil, err
+		}
+
+		s = Hugo.Sites[0]
+
+		if len(Hugo.Sites) > 1 {
+			// Find the best match.
+			for _, ss := range Hugo.Sites {
+				if strings.Contains(createPath, "."+ss.Language.Lang) {
+					s = ss
+					break
+				}
+			}
+		}
+		return s, nil
+	}
+
+	return create.NewContent(ps, siteFactory, kind, createPath)
 }
 
-// NewSite creates a new hugo site and initializes a structured Hugo directory.
-func NewSite(cmd *cobra.Command, args []string) {
+func doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
+	dirs := []string{
+		filepath.Join(basepath, "layouts"),
+		filepath.Join(basepath, "content"),
+		filepath.Join(basepath, "archetypes"),
+		filepath.Join(basepath, "static"),
+		filepath.Join(basepath, "data"),
+		filepath.Join(basepath, "themes"),
+	}
+
+	if exists, _ := helpers.Exists(basepath, fs.Source); exists {
+		if isDir, _ := helpers.IsDir(basepath, fs.Source); !isDir {
+			return errors.New(basepath + " already exists but not a directory")
+		}
+
+		isEmpty, _ := helpers.IsEmpty(basepath, fs.Source)
+
+		switch {
+		case !isEmpty && !force:
+			return errors.New(basepath + " already exists and is not empty")
+
+		case !isEmpty && force:
+			all := append(dirs, filepath.Join(basepath, "config."+configFormat))
+			for _, path := range all {
+				if exists, _ := helpers.Exists(path, fs.Source); exists {
+					return errors.New(path + " already exists")
+				}
+			}
+		}
+	}
+
+	for _, dir := range dirs {
+		if err := fs.Source.MkdirAll(dir, 0777); err != nil {
+			return fmt.Errorf("Failed to create dir: %s", err)
+		}
+	}
+
+	createConfig(fs, basepath, configFormat)
+
+	jww.FEEDBACK.Printf("Congratulations! Your new Hugo site is created in %s.\n\n", basepath)
+	jww.FEEDBACK.Println(nextStepsText())
+
+	return nil
+}
+
+func nextStepsText() string {
+	var nextStepsText bytes.Buffer
+
+	nextStepsText.WriteString(`Just a few more steps and you're ready to go:
+
+1. Download a theme into the same-named folder.
+   Choose a theme from https://themes.gohugo.io/, or
+   create your own with the "hugo new theme <THEMENAME>" command.
+2. Perhaps you want to add some content. You can add single files
+   with "hugo new `)
+
+	nextStepsText.WriteString(filepath.Join("<SECTIONNAME>", "<FILENAME>.<FORMAT>"))
+
+	nextStepsText.WriteString(`".
+3. Start the built-in live server via "hugo server".
+
+Visit https://gohugo.io/ for quickstart guide and full documentation.`)
+
+	return nextStepsText.String()
+}
+
+// NewSite creates a new Hugo site and initializes a structured Hugo directory.
+func NewSite(cmd *cobra.Command, args []string) error {
 	if len(args) < 1 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("path needs to be provided")
+		return newUserError("path needs to be provided")
 	}
 
 	createpath, err := filepath.Abs(filepath.Clean(args[0]))
 	if err != nil {
-		cmd.Usage()
-		jww.FATAL.Fatalln(err)
+		return newUserError(err)
 	}
 
-	if x, _ := helpers.Exists(createpath, hugofs.SourceFs); x {
-		y, _ := helpers.IsDir(createpath, hugofs.SourceFs)
-		if z, _ := helpers.IsEmpty(createpath, hugofs.SourceFs); y && z {
-			jww.INFO.Println(createpath, "already exists and is empty")
-		} else {
-			jww.FATAL.Fatalln(createpath, "already exists and is not empty")
-		}
-	}
+	forceNew, _ := cmd.Flags().GetBool("force")
 
-	mkdir(createpath, "layouts")
-	mkdir(createpath, "content")
-	mkdir(createpath, "archetypes")
-	mkdir(createpath, "static")
-	mkdir(createpath, "data")
-
-	createConfig(createpath, configFormat)
+	return doNewSite(hugofs.NewDefault(viper.New()), createpath, forceNew)
 }
 
 // NewTheme creates a new Hugo theme.
-func NewTheme(cmd *cobra.Command, args []string) {
-	InitializeConfig()
+func NewTheme(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
 
-	if len(args) < 1 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("theme name needs to be provided")
+	if err != nil {
+		return err
 	}
 
-	createpath := helpers.AbsPathify(filepath.Join("themes", args[0]))
+	if len(args) < 1 {
+		return newUserError("theme name needs to be provided")
+	}
+
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	createpath := c.PathSpec().AbsPathify(filepath.Join(c.Cfg.GetString("themesDir"), args[0]))
 	jww.INFO.Println("creating theme at", createpath)
 
-	if x, _ := helpers.Exists(createpath, hugofs.SourceFs); x {
-		jww.FATAL.Fatalln(createpath, "already exists")
+	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
+		return newUserError(createpath, "already exists")
 	}
 
 	mkdir(createpath, "layouts", "_default")
 	mkdir(createpath, "layouts", "partials")
 
-	touchFile(createpath, "layouts", "index.html")
-	touchFile(createpath, "layouts", "_default", "list.html")
-	touchFile(createpath, "layouts", "_default", "single.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "index.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "404.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "list.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "single.html")
 
-	touchFile(createpath, "layouts", "partials", "header.html")
-	touchFile(createpath, "layouts", "partials", "footer.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")
 
 	mkdir(createpath, "archetypes")
-	touchFile(createpath, "archetypes", "default.md")
+
+	archDefault := []byte("+++\n+++\n")
+
+	err = helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), cfg.Fs.Source)
+	if err != nil {
+		return err
+	}
 
 	mkdir(createpath, "static", "js")
 	mkdir(createpath, "static", "css")
@@ -189,12 +302,14 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 `)
 
-	err := helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), hugofs.SourceFs)
+	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), cfg.Fs.Source)
 	if err != nil {
-		jww.FATAL.Fatalln(err)
+		return err
 	}
 
-	createThemeMD(createpath)
+	createThemeMD(cfg.Fs, createpath)
+
+	return nil
 }
 
 func mkdir(x ...string) {
@@ -206,28 +321,28 @@ func mkdir(x ...string) {
 	}
 }
 
-func touchFile(x ...string) {
+func touchFile(fs afero.Fs, x ...string) {
 	inpath := filepath.Join(x...)
 	mkdir(filepath.Dir(inpath))
-	err := helpers.WriteToDisk(inpath, bytes.NewReader([]byte{}), hugofs.SourceFs)
+	err := helpers.WriteToDisk(inpath, bytes.NewReader([]byte{}), fs)
 	if err != nil {
 		jww.FATAL.Fatalln(err)
 	}
 }
 
-func createThemeMD(inpath string) (err error) {
+func createThemeMD(fs *hugofs.Fs, inpath string) (err error) {
 
 	by := []byte(`# theme.toml template for a Hugo theme
-# See https://github.com/spf13/hugoThemes#themetoml for an example
+# See https://github.com/gohugoio/hugoThemes#themetoml for an example
 
 name = "` + strings.Title(helpers.MakeTitle(filepath.Base(inpath))) + `"
 license = "MIT"
 licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
 description = ""
 homepage = "http://siteforthistheme.com/"
-tags = ["", ""]
-features = ["", ""]
-min_version = 0.13
+tags = []
+features = []
+min_version = "0.24"
 
 [author]
   name = ""
@@ -240,7 +355,7 @@ min_version = 0.13
   repo = ""
 `)
 
-	err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), hugofs.SourceFs)
+	err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), fs.Source)
 	if err != nil {
 		return
 	}
@@ -251,7 +366,7 @@ min_version = 0.13
 func newContentPathSection(path string) (string, string) {
 	// Forward slashes is used in all examples. Convert if needed.
 	// Issue #1133
-	createpath := strings.Replace(path, "/", helpers.FilePathSeparator, -1)
+	createpath := filepath.FromSlash(path)
 	var section string
 	// assume the first directory is the section (kind)
 	if strings.Contains(createpath[1:], helpers.FilePathSeparator) {
@@ -261,23 +376,19 @@ func newContentPathSection(path string) (string, string) {
 	return createpath, section
 }
 
-func createConfig(inpath string, kind string) (err error) {
+func createConfig(fs *hugofs.Fs, inpath string, kind string) (err error) {
 	in := map[string]string{
-		"baseurl":      "http://replace-this-with-your-hugo-site.com/",
+		"baseURL":      "http://example.org/",
 		"title":        "My New Hugo Site",
 		"languageCode": "en-us",
 	}
 	kind = parser.FormatSanitize(kind)
 
-	by, err := parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind))
+	var buf bytes.Buffer
+	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
 	if err != nil {
 		return err
 	}
 
-	err = helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), bytes.NewReader(by), hugofs.SourceFs)
-	if err != nil {
-		return
-	}
-
-	return nil
+	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
 }

commands/new_test.go

@@ -1,9 +1,26 @@
+// Copyright 2016 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package commands
 
 import (
-	"github.com/stretchr/testify/assert"
 	"path/filepath"
 	"testing"
+
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // Issue #1133
@@ -12,3 +29,94 @@ func TestNewContentPathSectionWithForwardSlashes(t *testing.T) {
 	assert.Equal(t, filepath.FromSlash("/post/new.md"), p)
 	assert.Equal(t, "post", s)
 }
+
+func checkNewSiteInited(fs *hugofs.Fs, basepath string, t *testing.T) {
+
+	paths := []string{
+		filepath.Join(basepath, "layouts"),
+		filepath.Join(basepath, "content"),
+		filepath.Join(basepath, "archetypes"),
+		filepath.Join(basepath, "static"),
+		filepath.Join(basepath, "data"),
+		filepath.Join(basepath, "config.toml"),
+	}
+
+	for _, path := range paths {
+		_, err := fs.Source.Stat(path)
+		require.NoError(t, err)
+	}
+}
+
+func TestDoNewSite(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, doNewSite(fs, basepath, false))
+
+	checkNewSiteInited(fs, basepath, t)
+}
+
+func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
+
+	require.NoError(t, doNewSite(fs, basepath, false))
+}
+
+func TestDoNewSite_error_base_exists(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
+	_, err := fs.Source.Create(filepath.Join(basepath, "foo"))
+	require.NoError(t, err)
+	// Since the directory already exists and isn't empty, expect an error
+	require.Error(t, doNewSite(fs, basepath, false))
+
+}
+
+func TestDoNewSite_force_empty_dir(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
+
+	require.NoError(t, doNewSite(fs, basepath, true))
+
+	checkNewSiteInited(fs, basepath, t)
+}
+
+func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	contentPath := filepath.Join(basepath, "content")
+
+	require.NoError(t, fs.Source.MkdirAll(contentPath, 777))
+	require.Error(t, doNewSite(fs, basepath, true))
+}
+
+func TestDoNewSite_error_force_config_inside_exists(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	configPath := filepath.Join(basepath, "config.toml")
+	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
+	_, err := fs.Source.Create(configPath)
+	require.NoError(t, err)
+
+	require.Error(t, doNewSite(fs, basepath, true))
+}
+
+func newTestCfg() (*viper.Viper, *hugofs.Fs) {
+
+	v := viper.New()
+	fs := hugofs.NewMem(v)
+
+	v.SetFs(fs.Source)
+
+	return v, fs
+
+}

commands/release.go

@@ -0,0 +1,62 @@
+// +build release
+
+// Copyright 2017-present The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"github.com/gohugoio/hugo/releaser"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	HugoCmd.AddCommand(createReleaser().cmd)
+}
+
+type releaseCommandeer struct {
+	cmd *cobra.Command
+
+	// Will be zero for main releases.
+	patchLevel int
+
+	skipPublish bool
+
+	step int
+}
+
+func createReleaser() *releaseCommandeer {
+	// Note: This is a command only meant for internal use and must be run
+	// via "go run -tags release main.go release" on the actual code base that is in the release.
+	r := &releaseCommandeer{
+		cmd: &cobra.Command{
+			Use:    "release",
+			Short:  "Release a new version of Hugo.",
+			Hidden: true,
+		},
+	}
+
+	r.cmd.RunE = func(cmd *cobra.Command, args []string) error {
+		return r.release()
+	}
+
+	r.cmd.PersistentFlags().IntVarP(&r.patchLevel, "patch", "p", 0, "patch level, defaults to 0 for main releases")
+	r.cmd.PersistentFlags().IntVarP(&r.step, "step", "s", -1, "release step, defaults to -1 for all steps.")
+	r.cmd.PersistentFlags().BoolVarP(&r.skipPublish, "skip-publish", "", false, "skip all publishing pipes of the release")
+
+	return r
+}
+
+func (r *releaseCommandeer) release() error {
+	return releaser.New(r.patchLevel, r.step, r.skipPublish).Run()
+}

commands/server.go

@@ -1,9 +1,9 @@
-// Copyright © 2013-14 Steve Francia <spf@spf13.com>.
+// Copyright 2016 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -24,109 +24,187 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/viper"
 )
 
-var serverPort int
-var serverInterface string
-var serverWatch bool
-var serverAppend bool
-var disableLiveReload bool
-
-//var serverCmdV *cobra.Command
+var (
+	disableLiveReload bool
+	renderToDisk      bool
+	serverAppend      bool
+	serverInterface   string
+	serverPort        int
+	serverWatch       bool
+)
 
 var serverCmd = &cobra.Command{
-	Use:   "server",
-	Short: "Hugo runs its own webserver to render the files",
-	Long: `Hugo is able to run its own high performance web server.
-Hugo will render all the files defined in the source directory and
-serve them up.`,
-	//Run: server,
+	Use:     "server",
+	Aliases: []string{"serve"},
+	Short:   "A high performance webserver",
+	Long: `Hugo provides its own webserver which builds and serves the site.
+While hugo server is high performance, it is a webserver with limited options.
+Many run it in production, but the standard behavior is for people to use it
+in development and use a more full featured server such as Nginx or Caddy.
+
+'hugo server' will avoid writing the rendered and served content to disk,
+preferring to store it in memory.
+
+By default hugo will also watch your files for any changes you make and
+automatically rebuild the site. It will then live reload any open browser pages
+and push the latest content to them. As most Hugo sites are built in a fraction
+of a second, you will be able to save and see your changes nearly instantly.`,
+	//RunE: server,
+}
+
+type filesOnlyFs struct {
+	fs http.FileSystem
+}
+
+type noDirFile struct {
+	http.File
+}
+
+func (fs filesOnlyFs) Open(name string) (http.File, error) {
+	f, err := fs.fs.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	return noDirFile{f}, nil
+}
+
+func (f noDirFile) Readdir(count int) ([]os.FileInfo, error) {
+	return nil, nil
 }
 
 func init() {
+	initHugoBuilderFlags(serverCmd)
+
 	serverCmd.Flags().IntVarP(&serverPort, "port", "p", 1313, "port on which the server will listen")
 	serverCmd.Flags().StringVarP(&serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
-	serverCmd.Flags().BoolVarP(&serverWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")
-	serverCmd.Flags().BoolVarP(&serverAppend, "appendPort", "", true, "append port to baseurl")
+	serverCmd.Flags().BoolVarP(&serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
+	serverCmd.Flags().BoolVarP(&serverAppend, "appendPort", "", true, "append port to baseURL")
 	serverCmd.Flags().BoolVar(&disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
+	serverCmd.Flags().BoolVar(&renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)")
 	serverCmd.Flags().String("memstats", "", "log memory usage to this file")
-	serverCmd.Flags().Int("meminterval", 100, "interval to poll memory usage (requires --memstats)")
-	serverCmd.Run = server
+	serverCmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".")
+
+	serverCmd.RunE = server
+
 }
 
-func server(cmd *cobra.Command, args []string) {
-	InitializeConfig()
+func server(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(serverCmd)
+	if err != nil {
+		return err
+	}
 
-	if cmd.Flags().Lookup("disableLiveReload").Changed {
-		viper.Set("DisableLiveReload", disableLiveReload)
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	if cmd.Flags().Changed("disableLiveReload") {
+		c.Set("disableLiveReload", disableLiveReload)
 	}
 
 	if serverWatch {
-		viper.Set("Watch", true)
+		c.Set("watch", true)
+	}
+
+	if c.Cfg.GetBool("watch") {
+		serverWatch = true
+		c.watchConfig()
 	}
 
 	l, err := net.Listen("tcp", net.JoinHostPort(serverInterface, strconv.Itoa(serverPort)))
 	if err == nil {
 		l.Close()
 	} else {
+		if serverCmd.Flags().Changed("port") {
+			// port set explicitly by user -- he/she probably meant it!
+			return newSystemErrorF("Server startup failed: %s", err)
+		}
 		jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port")
 		sp, err := helpers.FindAvailablePort()
 		if err != nil {
-			jww.ERROR.Println("Unable to find alternative port to use")
-			jww.ERROR.Fatalln(err)
+			return newSystemError("Unable to find alternative port to use:", err)
 		}
 		serverPort = sp.Port
 	}
 
-	viper.Set("port", serverPort)
+	c.Set("port", serverPort)
 
-	BaseURL, err := fixURL(BaseURL)
+	baseURL, err = fixURL(c.Cfg, baseURL)
 	if err != nil {
-		jww.ERROR.Fatal(err)
+		return err
 	}
-	viper.Set("BaseURL", BaseURL)
+	c.Set("baseURL", baseURL)
 
 	if err := memStats(); err != nil {
 		jww.ERROR.Println("memstats error:", err)
 	}
 
-	build(serverWatch)
+	// If a Destination is provided via flag write to disk
+	if destination != "" {
+		renderToDisk = true
+	}
+
+	// Hugo writes the output to memory instead of the disk
+	if !renderToDisk {
+		cfg.Fs.Destination = new(afero.MemMapFs)
+		// Rendering to memoryFS, publish to Root regardless of publishDir.
+		c.Set("publishDir", "/")
+	}
+
+	if err := c.build(serverWatch); err != nil {
+		return err
+	}
+
+	for _, s := range Hugo.Sites {
+		s.RegisterMediaTypes()
+	}
 
 	// Watch runs its own server as part of the routine
 	if serverWatch {
-		watched := getDirList()
-		workingDir := helpers.AbsPathify(viper.GetString("WorkingDir"))
-		for i, dir := range watched {
-			watched[i], _ = helpers.GetRelativePath(dir, workingDir)
+		watchDirs := c.getDirList()
+		baseWatchDir := c.Cfg.GetString("workingDir")
+		for i, dir := range watchDirs {
+			watchDirs[i], _ = helpers.GetRelativePath(dir, baseWatchDir)
 		}
-		unique := strings.Join(helpers.RemoveSubpaths(watched), ",")
 
-		jww.FEEDBACK.Printf("Watching for changes in %s/{%s}\n", workingDir, unique)
-		err := NewWatcher(serverPort)
+		rootWatchDirs := strings.Join(helpers.UniqueStrings(helpers.ExtractRootPaths(watchDirs)), ",")
+
+		jww.FEEDBACK.Printf("Watching for changes in %s%s{%s}\n", baseWatchDir, helpers.FilePathSeparator, rootWatchDirs)
+		err := c.newWatcher(serverPort)
+
 		if err != nil {
-			fmt.Println(err)
+			return err
 		}
 	}
 
-	serve(serverPort)
+	c.serve(serverPort)
+
+	return nil
 }
 
-func serve(port int) {
-	jww.FEEDBACK.Println("Serving pages from " + helpers.AbsPathify(viper.GetString("PublishDir")))
+func (c *commandeer) serve(port int) {
+	if renderToDisk {
+		jww.FEEDBACK.Println("Serving pages from " + c.PathSpec().AbsPathify(c.Cfg.GetString("publishDir")))
+	} else {
+		jww.FEEDBACK.Println("Serving pages from memory")
+	}
 
-	httpFs := &afero.HttpFs{SourceFs: hugofs.DestinationFS}
-	fileserver := http.FileServer(httpFs.Dir(helpers.AbsPathify(viper.GetString("PublishDir"))))
+	httpFs := afero.NewHttpFs(c.Fs.Destination)
+	fs := filesOnlyFs{httpFs.Dir(c.PathSpec().AbsPathify(c.Cfg.GetString("publishDir")))}
+	fileserver := http.FileServer(fs)
 
 	// We're only interested in the path
-	u, err := url.Parse(viper.GetString("BaseURL"))
+	u, err := url.Parse(c.Cfg.GetString("baseURL"))
 	if err != nil {
-		jww.ERROR.Fatalf("Invalid BaseURL: %s", err)
+		jww.ERROR.Fatalf("Invalid baseURL: %s", err)
 	}
 	if u.Path == "" || u.Path == "/" {
 		http.Handle("/", fileserver)
@@ -134,10 +212,8 @@ func serve(port int) {
 		http.Handle(u.Path, http.StripPrefix(u.Path, fileserver))
 	}
 
-	u.Host = net.JoinHostPort(serverInterface, strconv.Itoa(serverPort))
-	u.Scheme = "http"
-	jww.FEEDBACK.Printf("Web Server is available at %s\n", u.String())
-	fmt.Println("Press Ctrl+C to stop")
+	jww.FEEDBACK.Printf("Web Server is available at %s (bind address %s)\n", u.String(), serverInterface)
+	jww.FEEDBACK.Println("Press Ctrl+C to stop")
 
 	endpoint := net.JoinHostPort(serverInterface, strconv.Itoa(port))
 	err = http.ListenAndServe(endpoint, nil)
@@ -147,45 +223,53 @@ func serve(port int) {
 	}
 }
 
-// fixURL massages the BaseURL into a form needed for serving
+// fixURL massages the baseURL into a form needed for serving
 // all pages correctly.
-func fixURL(s string) (string, error) {
+func fixURL(cfg config.Provider, s string) (string, error) {
 	useLocalhost := false
 	if s == "" {
-		s = viper.GetString("BaseURL")
+		s = cfg.GetString("baseURL")
 		useLocalhost = true
 	}
-	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
-		s = "http://" + s
-	}
+
 	if !strings.HasSuffix(s, "/") {
 		s = s + "/"
 	}
+
+	// do an initial parse of the input string
 	u, err := url.Parse(s)
 	if err != nil {
 		return "", err
 	}
 
-	if serverAppend {
-		if useLocalhost {
-			u.Host = fmt.Sprintf("localhost:%d", serverPort)
-			u.Scheme = "http"
-			return u.String(), nil
+	// if no Host is defined, then assume that no schema or double-slash were
+	// present in the url.  Add a double-slash and make a best effort attempt.
+	if u.Host == "" && s != "/" {
+		s = "//" + s
+
+		u, err = url.Parse(s)
+		if err != nil {
+			return "", err
 		}
-		host := u.Host
-		if strings.Contains(host, ":") {
-			host, _, err = net.SplitHostPort(u.Host)
-			if err != nil {
-				return "", fmt.Errorf("Failed to split BaseURL hostpost: %s", err)
-			}
-		}
-		u.Host = fmt.Sprintf("%s:%d", host, serverPort)
-		return u.String(), nil
 	}
 
 	if useLocalhost {
+		if u.Scheme == "https" {
+			u.Scheme = "http"
+		}
 		u.Host = "localhost"
 	}
+
+	if serverAppend {
+		if strings.Contains(u.Host, ":") {
+			u.Host, _, err = net.SplitHostPort(u.Host)
+			if err != nil {
+				return "", fmt.Errorf("Failed to split baseURL hostpost: %s", err)
+			}
+		}
+		u.Host += fmt.Sprintf(":%d", serverPort)
+	}
+
 	return u.String(), nil
 }
 

commands/server_test.go

@@ -1,3 +1,16 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package commands
 
 import (
@@ -7,8 +20,6 @@ import (
 )
 
 func TestFixURL(t *testing.T) {
-	defer viper.Reset()
-
 	type data struct {
 		TestName   string
 		CLIBaseURL string
@@ -23,19 +34,20 @@ func TestFixURL(t *testing.T) {
 		{"Basic subdir", "", "http://foo.com/bar", true, 1313, "http://localhost:1313/bar/"},
 		{"Basic production", "http://foo.com", "http://foo.com", false, 80, "http://foo.com/"},
 		{"Production subdir", "http://foo.com/bar", "http://foo.com/bar", false, 80, "http://foo.com/bar/"},
-		{"No http", "", "foo.com", true, 1313, "http://localhost:1313/"},
-		{"Override configured port", "", "foo.com:2020", true, 1313, "http://localhost:1313/"},
-		{"No http production", "foo.com", "foo.com", false, 80, "http://foo.com/"},
-		{"No http production with port", "foo.com", "foo.com", true, 2020, "http://foo.com:2020/"},
+		{"No http", "", "foo.com", true, 1313, "//localhost:1313/"},
+		{"Override configured port", "", "foo.com:2020", true, 1313, "//localhost:1313/"},
+		{"No http production", "foo.com", "foo.com", false, 80, "//foo.com/"},
+		{"No http production with port", "foo.com", "foo.com", true, 2020, "//foo.com:2020/"},
+		{"No config", "", "", true, 1313, "//localhost:1313/"},
 	}
 
 	for i, test := range tests {
-		viper.Reset()
-		BaseURL = test.CLIBaseURL
-		viper.Set("BaseURL", test.CfgBaseURL)
+		v := viper.New()
+		baseURL = test.CLIBaseURL
+		v.Set("baseURL", test.CfgBaseURL)
 		serverAppend = test.AppendPort
 		serverPort = test.Port
-		result, err := fixURL(BaseURL)
+		result, err := fixURL(v, baseURL)
 		if err != nil {
 			t.Errorf("Test #%d %s: unexpected error %s", i, test.TestName, err)
 		}

commands/undraft.go

@@ -1,82 +1,83 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package commands
 
 import (
 	"bytes"
-	"fmt"
+	"errors"
 	"os"
 	"time"
 
+	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/parser"
-	jww "github.com/spf13/jwalterweatherman"
 )
 
 var undraftCmd = &cobra.Command{
 	Use:   "undraft path/to/content",
 	Short: "Undraft changes the content's draft status from 'True' to 'False'",
-	Long:  `Undraft changes the content's draft status from 'True' to 'False' and updates the date to the current date and time. If the content's draft status is 'False', nothing is done`,
-	Run:   Undraft,
+	Long: `Undraft changes the content's draft status from 'True' to 'False'
+and updates the date to the current date and time.
+If the content's draft status is 'False', nothing is done.`,
+	RunE: Undraft,
 }
 
-// Publish publishes the specified content by setting its draft status
+// Undraft publishes the specified content by setting its draft status
 // to false and setting its publish date to now. If the specified content is
 // not a draft, it will log an error.
-func Undraft(cmd *cobra.Command, args []string) {
-	InitializeConfig()
+func Undraft(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
+
+	if err != nil {
+		return err
+	}
 
 	if len(args) < 1 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("a piece of content needs to be specified")
+		return newUserError("a piece of content needs to be specified")
 	}
 
 	location := args[0]
 	// open the file
-	f, err := os.Open(location)
+	f, err := cfg.Fs.Source.Open(location)
 	if err != nil {
-		jww.ERROR.Print(err)
-		return
+		return err
 	}
 
 	// get the page from file
 	p, err := parser.ReadFrom(f)
 	f.Close()
 	if err != nil {
-		jww.ERROR.Print(err)
-		return
+		return err
 	}
 
 	w, err := undraftContent(p)
 	if err != nil {
-		jww.ERROR.Printf("an error occurred while undrafting %q: %s", location, err)
-		return
+		return newSystemErrorF("an error occurred while undrafting %q: %s", location, err)
 	}
 
-	f, err = os.OpenFile(location, os.O_WRONLY|os.O_TRUNC, 0644)
+	f, err = cfg.Fs.Source.OpenFile(location, os.O_WRONLY|os.O_TRUNC, 0644)
 	if err != nil {
-		jww.ERROR.Printf("%q not be undrafted due to error opening file to save changes: %q\n", location, err)
-		return
+		return newSystemErrorF("%q not be undrafted due to error opening file to save changes: %q\n", location, err)
 	}
 	defer f.Close()
 	_, err = w.WriteTo(f)
 	if err != nil {
-		jww.ERROR.Printf("%q not be undrafted due to save error: %q\n", location, err)
+		return newSystemErrorF("%q not be undrafted due to save error: %q\n", location, err)
 	}
-	return
+	return nil
 }
 
-// undraftContent: if the content is a draft, change it's draft status to
+// undraftContent: if the content is a draft, change its draft status to
 // 'false' and set the date to time.Now(). If the draft status is already
 // 'false', don't do anything.
 func undraftContent(p parser.Page) (bytes.Buffer, error) {
@@ -90,8 +91,7 @@ func undraftContent(p parser.Page) (bytes.Buffer, error) {
 	// Front Matter
 	fm := p.FrontMatter()
 	if fm == nil {
-		err := fmt.Errorf("Front Matter was found, nothing was finalized")
-		return buff, err
+		return buff, errors.New("Front Matter was found, nothing was finalized")
 	}
 
 	var isDraft, gotDate bool
@@ -101,7 +101,7 @@ L:
 		switch k {
 		case "draft":
 			if !v.(bool) {
-				return buff, fmt.Errorf("not a Draft: nothing was done")
+				return buff, errors.New("not a Draft: nothing was done")
 			}
 			isDraft = true
 			if gotDate {
@@ -118,20 +118,20 @@ L:
 
 	// if draft wasn't found in FrontMatter, it isn't a draft.
 	if !isDraft {
-		return buff, fmt.Errorf("not a Draft: nothing was done")
+		return buff, errors.New("not a Draft: nothing was done")
 	}
 
 	// get the front matter as bytes and split it into lines
 	var lineEnding []byte
-	fmLines := bytes.Split(fm, parser.UnixEnding)
+	fmLines := bytes.Split(fm, []byte("\n"))
 	if len(fmLines) == 1 { // if the result is only 1 element, try to split on dos line endings
-		fmLines = bytes.Split(fm, parser.DosEnding)
+		fmLines = bytes.Split(fm, []byte("\r\n"))
 		if len(fmLines) == 1 {
-			return buff, fmt.Errorf("unable to split FrontMatter into lines")
+			return buff, errors.New("unable to split FrontMatter into lines")
 		}
-		lineEnding = append(lineEnding, parser.DosEnding...)
+		lineEnding = append(lineEnding, []byte("\r\n")...)
 	} else {
-		lineEnding = append(lineEnding, parser.UnixEnding...)
+		lineEnding = append(lineEnding, []byte("\n")...)
 	}
 
 	// Write the front matter lines to the buffer, replacing as necessary
@@ -151,7 +151,7 @@ L:
 	}
 
 	// append the actual content
-	buff.Write([]byte(p.Content()))
+	buff.Write(p.Content())
 
 	return buff, nil
 }

commands/undraft_test.go

@@ -1,3 +1,16 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package commands
 
 // TODO Support Mac Encoding (\r)
@@ -8,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/parser"
 )
 
 var (
@@ -33,17 +46,17 @@ func TestUndraftContent(t *testing.T) {
 		{yamlDraftFM, ""},
 	}
 
-	for _, test := range tests {
+	for i, test := range tests {
 		r := bytes.NewReader([]byte(test.fm))
 		p, _ := parser.ReadFrom(r)
 		res, err := undraftContent(p)
 		if test.expectedErr != "" {
 			if err == nil {
-				t.Error("Expected error, got none")
+				t.Errorf("[%d] Expected error, got none", i)
 				continue
 			}
 			if err.Error() != test.expectedErr {
-				t.Errorf("Expected %q, got %q", test.expectedErr, err)
+				t.Errorf("[%d] Expected %q, got %q", i, test.expectedErr, err)
 				continue
 			}
 		} else {
@@ -51,19 +64,19 @@ func TestUndraftContent(t *testing.T) {
 			p, _ = parser.ReadFrom(r)
 			meta, err := p.Metadata()
 			if err != nil {
-				t.Errorf("unexpected error %q", err)
+				t.Errorf("[%d] unexpected error %q", i, err)
 				continue
 			}
 			for k, v := range meta.(map[string]interface{}) {
 				if k == "draft" {
 					if v.(bool) {
-						t.Errorf("Expected %q to be \"false\", got \"true\"", k)
+						t.Errorf("[%d] Expected %q to be \"false\", got \"true\"", i, k)
 						continue
 					}
 				}
 				if k == "date" {
 					if !strings.HasPrefix(v.(string), time.Now().Format("2006-01-02")) {
-						t.Errorf("Expected %v to start with %v", v.(string), time.Now().Format("2006-01-02"))
+						t.Errorf("[%d] Expected %v to start with %v", i, v.(string), time.Now().Format("2006-01-02"))
 					}
 				}
 			}

commands/version.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,38 +14,42 @@
 package commands
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
 	"github.com/kardianos/osext"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugolib"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
-var timeLayout string // the layout for time.Time
-
-var version = &cobra.Command{
+var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of Hugo",
-	Long:  `All software has versions. This is Hugo's`,
-	Run: func(cmd *cobra.Command, args []string) {
-		if hugolib.BuildDate == "" {
-			setBuildDate() // set the build date from executable's mdate
-		} else {
-			formatBuildDate() // format the compile time
-		}
-		if hugolib.CommitHash == "" {
-			fmt.Printf("Hugo Static Site Generator v%s BuildDate: %s\n", helpers.HugoVersion(), hugolib.BuildDate)
-		} else {
-			fmt.Printf("Hugo Static Site Generator v%s-%s BuildDate: %s\n", helpers.HugoVersion(), strings.ToUpper(hugolib.CommitHash), hugolib.BuildDate)
-		}
+	Long:  `All software has versions. This is Hugo's.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		printHugoVersion()
+		return nil
 	},
 }
 
+func printHugoVersion() {
+	if hugolib.BuildDate == "" {
+		setBuildDate() // set the build date from executable's mdate
+	} else {
+		formatBuildDate() // format the compile time
+	}
+	if hugolib.CommitHash == "" {
+		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
+	} else {
+		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s-%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, strings.ToUpper(hugolib.CommitHash), runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
+	}
+}
+
 // setBuildDate checks the ModTime of the Hugo executable and returns it as a
 // formatted string.  This assumes that the executable name is Hugo, if it does
 // not exist, an empty string will be returned.  This is only called if the
@@ -56,12 +60,12 @@ func setBuildDate() {
 	fname, _ := osext.Executable()
 	dir, err := filepath.Abs(filepath.Dir(fname))
 	if err != nil {
-		fmt.Println(err)
+		jww.ERROR.Println(err)
 		return
 	}
 	fi, err := os.Lstat(filepath.Join(dir, filepath.Base(fname)))
 	if err != nil {
-		fmt.Println(err)
+		jww.ERROR.Println(err)
 		return
 	}
 	t := fi.ModTime()

config/configProvider.go

@@ -0,0 +1,26 @@
+// Copyright 2017-present The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+// Provider provides the configuration settings for Hugo.
+type Provider interface {
+	GetString(key string) string
+	GetInt(key string) int
+	GetBool(key string) bool
+	GetStringMap(key string) map[string]interface{}
+	GetStringMapString(key string) map[string]string
+	Get(key string) interface{}
+	Set(key string, value interface{})
+	IsSet(key string) bool
+}

create/content.go

@@ -1,9 +1,9 @@
-// Copyright © 2014 Steve Francia <spf@spf13.com>.
+// Copyright 2016 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -11,130 +11,87 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package create provides functions to create new content.
 package create
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
-	"strings"
-	"time"
 
-	"github.com/spf13/cast"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
 	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/viper"
 )
 
-func NewContent(kind, name string) (err error) {
-	jww.INFO.Println("attempting to create ", name, "of", kind)
+// 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 {
+	ext := helpers.Ext(targetPath)
 
-	location := FindArchetype(kind)
+	jww.INFO.Printf("attempting to create %q of %q of ext %q", targetPath, kind, ext)
 
-	var by []byte
+	archetypeFilename := findArchetype(ps, kind, ext)
 
-	if location != "" {
-		by, err = ioutil.ReadFile(location)
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
-	}
-	if location == "" || err != nil {
-		by = []byte("+++\n title = \"title\"\n draft = true \n+++\n")
-	}
-
-	psr, err := parser.ReadFrom(bytes.NewReader(by))
+	f, err := ps.Fs.Source.Open(archetypeFilename)
 	if err != nil {
 		return err
 	}
-	metadata, err := psr.Metadata()
-	if err != nil {
-		return err
-	}
-	newmetadata, err := cast.ToStringMapE(metadata)
-	if err != nil {
-		jww.ERROR.Println("Error processing archetype file:", location)
-		return err
+	defer f.Close()
+	// Building the sites can be expensive, so only do it if really needed.
+	siteUsed := false
+	if helpers.ReaderContains(f, []byte(".Site")) {
+		siteUsed = true
 	}
 
-	for k := range newmetadata {
-		switch strings.ToLower(k) {
-		case "date":
-			newmetadata[k] = time.Now()
-		case "title":
-			newmetadata[k] = helpers.MakeTitle(helpers.Filename(name))
-		}
-	}
-
-	caseimatch := func(m map[string]interface{}, key string) bool {
-		for k := range m {
-			if strings.ToLower(k) == strings.ToLower(key) {
-				return true
-			}
-		}
-		return false
-	}
-
-	if newmetadata == nil {
-		newmetadata = make(map[string]interface{})
-	}
-
-	if !caseimatch(newmetadata, "date") {
-		newmetadata["date"] = time.Now()
-	}
-
-	if !caseimatch(newmetadata, "title") {
-		newmetadata["title"] = helpers.MakeTitle(helpers.Filename(name))
-	}
-
-	page, err := hugolib.NewPage(name)
+	s, err := siteFactory(targetPath, siteUsed)
 	if err != nil {
 		return err
 	}
 
-	if x := parser.FormatSanitize(viper.GetString("MetaDataFormat")); x == "json" || x == "yaml" || x == "toml" {
-		newmetadata["date"] = time.Now().Format(time.RFC3339)
+	var content []byte
+
+	content, err = executeArcheTypeAsTemplate(s, kind, targetPath, archetypeFilename)
+	if err != nil {
+		return err
 	}
 
-	//page.Dir = viper.GetString("sourceDir")
-	page.SetSourceMetaData(newmetadata, parser.FormatToLeadRune(viper.GetString("MetaDataFormat")))
-	page.SetSourceContent(psr.Content())
-	if err = page.SafeSaveSourceAs(filepath.Join(viper.GetString("contentDir"), name)); err != nil {
-		return
+	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
 	}
-	jww.FEEDBACK.Println(helpers.AbsPathify(filepath.Join(viper.GetString("contentDir"), name)), "created")
 
-	editor := viper.GetString("NewContentEditor")
+	jww.FEEDBACK.Println(contentPath, "created")
 
+	editor := s.Cfg.GetString("newContentEditor")
 	if editor != "" {
-		jww.FEEDBACK.Printf("Editing %s in %s.\n", name, editor)
+		jww.FEEDBACK.Printf("Editing %s with %q ...\n", targetPath, editor)
 
-		cmd := exec.Command(editor, path.Join(viper.GetString("contentDir"), name))
+		cmd := exec.Command(editor, contentPath)
 		cmd.Stdin = os.Stdin
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 
-		if err = cmd.Run(); err != nil {
-			return
-		}
+		return cmd.Run()
 	}
 
 	return nil
 }
 
-func FindArchetype(kind string) (outpath string) {
-	search := []string{helpers.AbsPathify(viper.GetString("archetypeDir"))}
+// FindArchetype takes a given kind/archetype of content and returns an output
+// path for that archetype.  If no archetype is found, an empty string is
+// returned.
+func findArchetype(ps *helpers.PathSpec, kind, ext string) (outpath string) {
+	search := []string{ps.AbsPathify(ps.Cfg.GetString("archetypeDir"))}
 
-	if viper.GetString("theme") != "" {
-		themeDir := filepath.Join(helpers.AbsPathify("themes/"+viper.GetString("theme")), "/archetypes/")
-		if _, err := os.Stat(themeDir); os.IsNotExist(err) {
-			jww.ERROR.Println("Unable to find archetypes directory for theme :", viper.GetString("theme"), "in", themeDir)
+	if ps.Cfg.GetString("theme") != "" {
+		themeDir := filepath.Join(ps.AbsPathify(ps.Cfg.GetString("themesDir")+"/"+ps.Cfg.GetString("theme")), "/archetypes/")
+		if _, err := ps.Fs.Source.Stat(themeDir); os.IsNotExist(err) {
+			jww.ERROR.Printf("Unable to find archetypes directory for theme %q at %q", ps.Cfg.GetString("theme"), themeDir)
 		} else {
 			search = append(search, themeDir)
 		}
@@ -143,18 +100,21 @@ func FindArchetype(kind string) (outpath string) {
 	for _, x := range search {
 		// If the new content isn't in a subdirectory, kind == "".
 		// Therefore it should be excluded otherwise `is a directory`
-		// error will occur. github.com/spf13/hugo/issues/411
-		var pathsToCheck []string
+		// error will occur. github.com/gohugoio/hugo/issues/411
+		var pathsToCheck = []string{"default"}
 
-		if kind == "" {
-			pathsToCheck = []string{"default.md", "default"}
-		} else {
-			pathsToCheck = []string{kind + ".md", kind, "default.md", "default"}
+		if ext != "" {
+			if kind != "" {
+				pathsToCheck = append([]string{kind + ext, "default" + ext}, pathsToCheck...)
+			} else {
+				pathsToCheck = append([]string{"default" + ext}, pathsToCheck...)
+			}
 		}
+
 		for _, p := range pathsToCheck {
 			curpath := filepath.Join(x, p)
 			jww.DEBUG.Println("checking", curpath, "for archetypes")
-			if exists, _ := helpers.Exists(curpath, hugofs.SourceFs); exists {
+			if exists, _ := helpers.Exists(curpath, ps.Fs.Source); exists {
 				jww.INFO.Println("curpath: " + curpath)
 				return curpath
 			}

create/content_template_handler.go

@@ -0,0 +1,114 @@
+// Copyright 2017 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package create
+
+import (
+	"bytes"
+	"fmt"
+	"time"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/source"
+
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/tpl"
+	"github.com/spf13/afero"
+)
+
+// ArchetypeFileData represents the data available to an archetype template.
+type ArchetypeFileData struct {
+	// The archetype content type, either given as --kind option or extracted
+	// from the target path's section, i.e. "blog/mypost.md" will resolve to
+	// "blog".
+	Type string
+
+	// The current date and time as a RFC3339 formatted string, suitable for use in front matter.
+	Date string
+
+	// The Site, fully equipped with all the pages etc. Note: This will only be set if it is actually
+	// used in the archetype template. Also, if this is a multilingual setup,
+	// this site is the site that best matches the target content file, based
+	// on the presence of language code in the filename.
+	Site *hugolib.Site
+
+	// The target content file. Note that the .Content will be empty, as that
+	// has not been created yet.
+	*source.File
+}
+
+const (
+	archetypeTemplateTemplate = `+++
+title = "{{ replace .TranslationBaseName "-" " " | title }}"
+date = {{ .Date }}
+draft = true
++++`
+)
+
+func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFilename string) ([]byte, error) {
+
+	var (
+		archetypeContent  []byte
+		archetypeTemplate []byte
+		err               error
+	)
+
+	sp := source.NewSourceSpec(s.Deps.Cfg, s.Deps.Fs)
+	f := sp.NewFile(targetPath)
+
+	data := ArchetypeFileData{
+		Type: kind,
+		Date: time.Now().Format(time.RFC3339),
+		File: f,
+		Site: s,
+	}
+
+	if archetypeFilename == "" {
+		// TODO(bep) archetype revive the issue about wrong tpl funcs arg order
+		archetypeTemplate = []byte(archetypeTemplateTemplate)
+	} else {
+		archetypeTemplate, err = afero.ReadFile(s.Fs.Source, archetypeFilename)
+		if err != nil {
+			return nil, fmt.Errorf("Failed to read archetype file %q: %s", archetypeFilename, err)
+		}
+
+	}
+
+	// Reuse the Hugo template setup to get the template funcs properly set up.
+	templateHandler := s.Deps.Tmpl.(tpl.TemplateHandler)
+	templateName := "_text/" + helpers.Filename(archetypeFilename)
+	if err := templateHandler.AddTemplate(templateName, string(archetypeTemplate)); err != nil {
+		return nil, fmt.Errorf("Failed to parse archetype file %q: %s", archetypeFilename, err)
+	}
+
+	templ := templateHandler.Lookup(templateName)
+
+	var buff bytes.Buffer
+	if err := templ.Execute(&buff, data); err != nil {
+		return nil, fmt.Errorf("Failed to process archetype file %q: %s", archetypeFilename, err)
+	}
+
+	archetypeContent = buff.Bytes()
+
+	if !bytes.Contains(archetypeContent, []byte("date")) || !bytes.Contains(archetypeContent, []byte("title")) {
+		// TODO(bep) remove some time in the future.
+		s.Log.FEEDBACK.Println(fmt.Sprintf(`WARNING: date and/or title missing from archetype file %q. 
+From Hugo 0.24 this must be provided in the archetype file itself, if needed. Example:
+%s
+`, archetypeFilename, archetypeTemplateTemplate))
+
+	}
+
+	return archetypeContent, nil
+
+}

create/content_test.go

@@ -0,0 +1,175 @@
+// Copyright 2016 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 create_test
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/gohugoio/hugo/deps"
+
+	"github.com/gohugoio/hugo/hugolib"
+
+	"fmt"
+
+	"github.com/gohugoio/hugo/hugofs"
+
+	"github.com/gohugoio/hugo/create"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/spf13/afero"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewContent(t *testing.T) {
+	v := viper.New()
+	initViper(v)
+
+	cases := []struct {
+		kind     string
+		path     string
+		expected []string
+	}{
+		{"post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
+		{"post", "post/org-1.org", []string{`#+title: ORG-1`}},
+		{"emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}},
+		{"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
+	}
+
+	for _, c := range cases {
+		cfg, fs := newTestCfg()
+		ps, err := helpers.NewPathSpec(fs, cfg)
+		require.NoError(t, err)
+		h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
+		require.NoError(t, err)
+		require.NoError(t, initFs(fs))
+
+		siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
+			return h.Sites[0], nil
+		}
+
+		require.NoError(t, create.NewContent(ps, siteFactory, c.kind, c.path))
+
+		fname := filepath.Join("content", filepath.FromSlash(c.path))
+		content := readFileFromFs(t, fs.Source, fname)
+		for i, v := range c.expected {
+			found := strings.Contains(content, v)
+			if !found {
+				t.Errorf("[%d] %q missing from output:\n%q", i, v, content)
+			}
+		}
+	}
+}
+
+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")
+}
+
+func initFs(fs *hugofs.Fs) error {
+	perm := os.FileMode(0755)
+	var err error
+
+	// create directories
+	dirs := []string{
+		"archetypes",
+		"content",
+		filepath.Join("themes", "sample", "archetypes"),
+	}
+	for _, dir := range dirs {
+		err = fs.Source.Mkdir(dir, perm)
+		if err != nil {
+			return err
+		}
+	}
+
+	// create files
+	for _, v := range []struct {
+		path    string
+		content string
+	}{
+		{
+			path:    filepath.Join("archetypes", "post.md"),
+			content: "+++\ndate = \"2015-01-12T19:20:04-07:00\"\ntitle = \"Post Arch title\"\ntest = \"test1\"\n+++\n",
+		},
+		{
+			path:    filepath.Join("archetypes", "post.org"),
+			content: "#+title: {{ .BaseFileName  | upper }}",
+		},
+		{
+			path: filepath.Join("archetypes", "product.md"),
+			content: `+++
+title = "{{ .BaseFileName  | upper }}"
++++`,
+		},
+		{
+			path:    filepath.Join("archetypes", "emptydate.md"),
+			content: "+++\ndate =\"\"\ntitle = \"Empty Date Arch title\"\ntest = \"test1\"\n+++\n",
+		},
+	} {
+		f, err := fs.Source.Create(v.path)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+
+		_, err = f.Write([]byte(v.content))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// 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)
+	b, err := afero.ReadFile(fs, filename)
+	if err != nil {
+		// Print some debug info
+		root := strings.Split(filename, helpers.FilePathSeparator)[0]
+		afero.Walk(fs, root, func(path string, info os.FileInfo, err error) error {
+			if info != nil && !info.IsDir() {
+				fmt.Println("    ", path)
+			}
+
+			return nil
+		})
+		t.Fatalf("Failed to read file: %s", err)
+	}
+	return string(b)
+}
+
+func newTestCfg() (*viper.Viper, *hugofs.Fs) {
+
+	v := viper.New()
+	fs := hugofs.NewMem(v)
+
+	v.SetFs(fs.Source)
+
+	initViper(v)
+
+	return v, fs
+
+}

deps/deps.go

@@ -0,0 +1,176 @@
+package deps
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/output"
+	"github.com/gohugoio/hugo/tpl"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+// Deps holds dependencies used by many.
+// There will be normally be only one instance of deps in play
+// at a given time, i.e. one per Site built.
+type Deps struct {
+	// The logger to use.
+	Log *jww.Notepad `json:"-"`
+
+	// The templates to use. This will usually implement the full tpl.TemplateHandler.
+	Tmpl tpl.TemplateFinder `json:"-"`
+
+	// The file systems to use.
+	Fs *hugofs.Fs `json:"-"`
+
+	// The PathSpec to use
+	*helpers.PathSpec `json:"-"`
+
+	// The ContentSpec to use
+	*helpers.ContentSpec `json:"-"`
+
+	// The configuration to use
+	Cfg config.Provider `json:"-"`
+
+	// The translation func to use
+	Translate func(translationID string, args ...interface{}) string `json:"-"`
+
+	Language *helpers.Language
+
+	// All the output formats available for the current site.
+	OutputFormatsConfig output.Formats
+
+	templateProvider ResourceProvider
+	WithTemplate     func(templ tpl.TemplateHandler) error `json:"-"`
+
+	translationProvider ResourceProvider
+}
+
+// ResourceProvider is used to create and refresh, and clone resources needed.
+type ResourceProvider interface {
+	Update(deps *Deps) error
+	Clone(deps *Deps) error
+}
+
+func (d *Deps) TemplateHandler() tpl.TemplateHandler {
+	return d.Tmpl.(tpl.TemplateHandler)
+}
+
+func (d *Deps) LoadResources() error {
+	// Note that the translations need to be loaded before the templates.
+	if err := d.translationProvider.Update(d); err != nil {
+		return err
+	}
+
+	if err := d.templateProvider.Update(d); err != nil {
+		return err
+	}
+
+	if th, ok := d.Tmpl.(tpl.TemplateHandler); ok {
+		th.PrintErrors()
+	}
+
+	return nil
+}
+
+func New(cfg DepsCfg) (*Deps, error) {
+	var (
+		logger = cfg.Logger
+		fs     = cfg.Fs
+	)
+
+	if cfg.TemplateProvider == nil {
+		panic("Must have a TemplateProvider")
+	}
+
+	if cfg.TranslationProvider == nil {
+		panic("Must have a TranslationProvider")
+	}
+
+	if cfg.Language == nil {
+		panic("Must have a Language")
+	}
+
+	if logger == nil {
+		logger = jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
+	}
+
+	if fs == nil {
+		// Default to the production file system.
+		fs = hugofs.NewDefault(cfg.Language)
+	}
+
+	ps, err := helpers.NewPathSpec(fs, cfg.Language)
+
+	if err != nil {
+		return nil, err
+	}
+
+	d := &Deps{
+		Fs:                  fs,
+		Log:                 logger,
+		templateProvider:    cfg.TemplateProvider,
+		translationProvider: cfg.TranslationProvider,
+		WithTemplate:        cfg.WithTemplate,
+		PathSpec:            ps,
+		ContentSpec:         helpers.NewContentSpec(cfg.Language),
+		Cfg:                 cfg.Language,
+		Language:            cfg.Language,
+	}
+
+	return d, nil
+}
+
+// ForLanguage creates a copy of the Deps with the language dependent
+// parts switched out.
+func (d Deps) ForLanguage(l *helpers.Language) (*Deps, error) {
+	var err error
+
+	d.PathSpec, err = helpers.NewPathSpec(d.Fs, l)
+	if err != nil {
+		return nil, err
+	}
+
+	d.ContentSpec = helpers.NewContentSpec(l)
+	d.Cfg = l
+	d.Language = l
+
+	if err := d.translationProvider.Clone(&d); err != nil {
+		return nil, err
+	}
+
+	if err := d.templateProvider.Clone(&d); err != nil {
+		return nil, err
+	}
+
+	return &d, nil
+
+}
+
+// DepsCfg contains configuration options that can be used to configure Hugo
+// on a global level, i.e. logging etc.
+// Nil values will be given default values.
+type DepsCfg struct {
+
+	// The Logger to use.
+	Logger *jww.Notepad
+
+	// The file systems to use
+	Fs *hugofs.Fs
+
+	// The language to use.
+	Language *helpers.Language
+
+	// The configuration to use.
+	Cfg config.Provider
+
+	// Template handling.
+	TemplateProvider ResourceProvider
+	WithTemplate     func(templ tpl.TemplateHandler) error
+
+	// i18n handling.
+	TranslationProvider ResourceProvider
+}

docs/.gitignore

@@ -1 +0,0 @@
-/.idea

docs/archetypes/default.md

@@ -1,6 +0,0 @@
-+++
-weight = 5
-[menu]
-  [menu.main]
-    parent = "x"
-+++

docs/archetypes/showcase.md

@@ -1,14 +0,0 @@
----
-date: 2013-07-01T07:32:00Z
-description: ""
-license: ""
-licenseLink: ""
-sitelink: http://spf13.com/
-sourceLink: https://github.com/spf13/spf13.com
-tags:
-- personal
-- blog
-thumbnail: /img/spf13-tn.jpg
-title: spf13.com
----
-

docs/config.toml

@@ -1,92 +0,0 @@
-baseurl = "http://gohugo.io/"
-MetaDataFormat = "yaml"
-
-[params]
-  description = "Documentation of Hugo, a fast and flexible static site generator built with love by spf13 and friends in Go"
-  author = "Steve Francia (spf13) and friends"
-
-[taxonomies]
-  tag = "tags"
-  group = "groups"
-
-[[menu.main]]
-    name = "Download Hugo"
-    pre = "<i class='fa fa-download'></i>"
-    url = "https://github.com/spf13/hugo/releases"
-    weight = -200
-[[menu.main]]
-    name = "Showcase"
-    pre = "<i class='fa fa-cubes'></i>"
-    url = "/showcase/"
-    weight = -180
-[[menu.main]]
-    name = "Press & Articles"
-    pre = "<i class='fa fa-bullhorn'></i>"
-    url = "/community/press/"
-    weight = -170
-[[menu.main]]
-    name = "Discuss Hugo"
-    pre = "<i class='fa fa-comments'></i>"
-    url = "http://discuss.gohugo.io/"
-    weight = -150
-[[menu.main]]
-    name = "About Hugo"
-    identifier = "about"
-    pre = "<i class='fa fa-heart'></i>"
-    weight = -110
-[[menu.main]]
-    name = "Getting Started"
-    identifier = "getting started"
-    pre = "<i class='fa fa-road'></i>"
-    weight = -100
-[[menu.main]]
-    name = "Hugo Commands"
-    identifier = "commands"
-    pre = "<i class='fa fa-space-shuttle'></i>"
-    weight = -95
-    url = "/commands/"
-[[menu.main]]
-    name = "Content"
-    identifier = "content"
-    pre = "<i class='fa fa-file-text'></i>"
-    weight = -90
-[[menu.main]]
-    name = "Themes"
-    identifier = "themes"
-    pre = "<i class='fa fa-desktop'></i>"
-    weight = -85
-[[menu.main]]
-    name = "Templates"
-    identifier = "layout"
-    pre = "<i class='fa fa-columns'></i>"
-    weight = -80
-[[menu.main]]
-    name = "Taxonomies"
-    identifier = "taxonomy"
-    pre = "<i class='fa fa-tags'></i>"
-    weight = -70
-[[menu.main]]
-    name = "Extras"
-    identifier = "extras"
-    pre = "<i class='fa fa-gift'></i>"
-    weight = -60
-[[menu.main]]
-    name = "Community"
-    identifier = "community"
-    pre = "<i class='fa fa-group'></i>"
-    weight = -50
-[[menu.main]]
-    parent = "community"
-    name = "Discussion Forum"
-    url = "http://discuss.gohugo.io"
-    weight = 150
-[[menu.main]]
-    name = "Tutorials"
-    identifier = "tutorials"
-    pre = "<i class='fa fa-book'></i>"
-    weight = -40
-[[menu.main]]
-    name = "Troubleshooting"
-    identifier = "troubleshooting"
-    pre = "<i class='fa fa-wrench'></i>"
-    weight = -30

docs/content/commands/hugo.md

@@ -1,65 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo"
-slug: hugo
-url: /commands/hugo/
----
-## hugo
-
-hugo builds your site
-
-### Synopsis
-
-
-hugo is the main command, used to build your Hugo site. 
-	
-Hugo is a Fast and Flexible Static Site Generator built with love by spf13 and friends in Go.
-
-Complete documentation is available at http://gohugo.io
-
-```
-hugo
-```
-
-### Options
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-  -h, --help=false: help for hugo
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --noTimes=false: Don't sync modification time of files
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-  -w, --watch=false: watch filesystem for changes and recreate as needed
-```
-
-### SEE ALSO
-* [hugo benchmark](/commands/hugo_benchmark/)	 - Benchmark hugo by building a site a number of times
-* [hugo check](/commands/hugo_check/)	 - Check content in the source directory
-* [hugo config](/commands/hugo_config/)	 - Print the site configuration
-* [hugo convert](/commands/hugo_convert/)	 - Convert will modify your content to different formats
-* [hugo genautocomplete](/commands/hugo_genautocomplete/)	 - Generate shell autocompletion script for Hugo
-* [hugo gendoc](/commands/hugo_gendoc/)	 - Generate Markdown documentation for the Hugo CLI.
-* [hugo help](/commands/hugo_help/)	 - Help about any command
-* [hugo list](/commands/hugo_list/)	 - Listing out various types of content
-* [hugo new](/commands/hugo_new/)	 - Create new content for your site
-* [hugo server](/commands/hugo_server/)	 - Hugo runs its own webserver to render the files
-* [hugo undraft](/commands/hugo_undraft/)	 - Undraft changes the content's draft status from 'True' to 'False'
-* [hugo version](/commands/hugo_version/)	 - Print the version number of Hugo
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.802527731 +0000 UTC

docs/content/commands/hugo_benchmark.md

@@ -1,57 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo benchmark"
-slug: hugo_benchmark
-url: /commands/hugo_benchmark/
----
-## hugo benchmark
-
-Benchmark hugo by building a site a number of times
-
-### Synopsis
-
-
-Hugo can build a site many times over and analyze the
-running process creating a benchmark.
-
-```
-hugo benchmark
-```
-
-### Options
-
-```
-  -n, --count=13: number of times to build the site
-      --cpuprofile="": path/filename for the CPU profile file
-  -h, --help=false: help for benchmark
-      --memprofile="": path/filename for the memory profile file
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.80030401 +0000 UTC

docs/content/commands/hugo_check.md

@@ -1,54 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo check"
-slug: hugo_check
-url: /commands/hugo_check/
----
-## hugo check
-
-Check content in the source directory
-
-### Synopsis
-
-
-Hugo will perform some basic analysis on the
-    content provided and will give feedback.
-
-```
-hugo check
-```
-
-### Options
-
-```
-  -h, --help=false: help for check
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.800150805 +0000 UTC

docs/content/commands/hugo_config.md

@@ -1,53 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo config"
-slug: hugo_config
-url: /commands/hugo_config/
----
-## hugo config
-
-Print the site configuration
-
-### Synopsis
-
-
-Print the site configuration, both default and custom settings
-
-```
-hugo config
-```
-
-### Options
-
-```
-  -h, --help=false: help for config
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.800015664 +0000 UTC

docs/content/commands/hugo_convert.md

@@ -1,54 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo convert"
-slug: hugo_convert
-url: /commands/hugo_convert/
----
-## hugo convert
-
-Convert will modify your content to different formats
-
-### Synopsis
-
-
-Convert will modify your content to different formats
-
-### Options
-
-```
-  -h, --help=false: help for convert
-  -o, --output="": filesystem path to write files to
-      --unsafe=false: enable less safe operations, please backup first
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-* [hugo convert toJSON](/commands/hugo_convert_tojson/)	 - Convert front matter to JSON
-* [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 at 2015-05-21 18:03:19.800919 +0000 UTC

docs/content/commands/hugo_convert_toJSON.md

@@ -1,56 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo convert toJSON"
-slug: hugo_convert_toJSON
-url: /commands/hugo_convert_tojson/
----
-## hugo convert toJSON
-
-Convert front matter to JSON
-
-### Synopsis
-
-
-toJSON will convert all front matter in the content
-	directory to use JSON for the front matter
-
-```
-hugo convert toJSON
-```
-
-### Options
-
-```
-  -h, --help=false: help for toJSON
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-  -o, --output="": filesystem path to write files to
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-      --unsafe=false: enable less safe operations, please backup first
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo convert](/commands/hugo_convert/)	 - Convert will modify your content to different formats
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.800453812 +0000 UTC

docs/content/commands/hugo_convert_toTOML.md

@@ -1,56 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo convert toTOML"
-slug: hugo_convert_toTOML
-url: /commands/hugo_convert_totoml/
----
-## hugo convert toTOML
-
-Convert front matter to TOML
-
-### Synopsis
-
-
-toTOML will convert all front matter in the content
-	directory to use TOML for the front matter
-
-```
-hugo convert toTOML
-```
-
-### Options
-
-```
-  -h, --help=false: help for toTOML
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-  -o, --output="": filesystem path to write files to
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-      --unsafe=false: enable less safe operations, please backup first
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo convert](/commands/hugo_convert/)	 - Convert will modify your content to different formats
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.800610431 +0000 UTC

docs/content/commands/hugo_convert_toYAML.md

@@ -1,56 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo convert toYAML"
-slug: hugo_convert_toYAML
-url: /commands/hugo_convert_toyaml/
----
-## hugo convert toYAML
-
-Convert front matter to YAML
-
-### Synopsis
-
-
-toYAML will convert all front matter in the content
-	directory to use YAML for the front matter
-
-```
-hugo convert toYAML
-```
-
-### Options
-
-```
-  -h, --help=false: help for toYAML
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-  -o, --output="": filesystem path to write files to
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-      --unsafe=false: enable less safe operations, please backup first
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo convert](/commands/hugo_convert/)	 - Convert will modify your content to different formats
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.800758702 +0000 UTC

docs/content/commands/hugo_genautocomplete.md

@@ -1,68 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo genautocomplete"
-slug: hugo_genautocomplete
-url: /commands/hugo_genautocomplete/
----
-## hugo genautocomplete
-
-Generate shell autocompletion script for Hugo
-
-### Synopsis
-
-
-Generates a shell autocompletion script for Hugo.
-	
-	NOTE: The current version supports Bash only. This should work for *nix systems with Bash installed.
-	
-	By default the file is written directly to /etc/bash_completion.d for convenience and the command may need superuser rights, e.g:
-	
-	sudo hugo genautocomplete
-	
-	Add --completionfile=/path/to/file flag to set alternative file-path and name.
-	
-	Logout and in again to reload the completion scripts or just source them in directly:
-	
-	. /etc/bash_completion
-	
-
-```
-hugo genautocomplete
-```
-
-### Options
-
-```
-      --completionfile="/etc/bash_completion.d/hugo.sh": Autocompletion file
-  -h, --help=false: help for genautocomplete
-      --type="bash": Autocompletion type (currently only bash supported)
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.802059052 +0000 UTC

docs/content/commands/hugo_gendoc.md

@@ -1,59 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo gendoc"
-slug: hugo_gendoc
-url: /commands/hugo_gendoc/
----
-## hugo gendoc
-
-Generate Markdown documentation for the Hugo CLI.
-
-### Synopsis
-
-
-Generate Markdown documentation for the Hugo CLI.
-	
-	This command is, mostly, used to create up-to-date documentation for gohugo.io.
-	
-	It creates one Markdown file per command with front matter suitable for rendering in Hugo.
-	
-
-```
-hugo gendoc
-```
-
-### Options
-
-```
-      --dir="/tmp/hugodoc/": the directory to write the doc.
-  -h, --help=false: help for gendoc
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.802209793 +0000 UTC

docs/content/commands/hugo_help.md

@@ -1,54 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo help"
-slug: hugo_help
-url: /commands/hugo_help/
----
-## hugo help
-
-Help about any command
-
-### Synopsis
-
-
-Help provides help for any command in the application.
-    Simply type hugo help [path to command] for full details.
-
-```
-hugo help [command]
-```
-
-### Options
-
-```
-  -h, --help=false: help for help
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.802371739 +0000 UTC

docs/content/commands/hugo_list.md

@@ -1,51 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo list"
-slug: hugo_list
-url: /commands/hugo_list/
----
-## hugo list
-
-Listing out various types of content
-
-### Synopsis
-
-
-Listing out various types of content. List requires a subcommand, eg. hugo list drafts
-
-### Options
-
-```
-  -h, --help=false: help for list
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-* [hugo list drafts](/commands/hugo_list_drafts/)	 - List all drafts
-* [hugo list future](/commands/hugo_list_future/)	 - List all posts dated in the future
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.801756747 +0000 UTC

docs/content/commands/hugo_list_drafts.md

@@ -1,53 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo list drafts"
-slug: hugo_list_drafts
-url: /commands/hugo_list_drafts/
----
-## hugo list drafts
-
-List all drafts
-
-### Synopsis
-
-
-List all of the drafts in your content directory
-
-```
-hugo list drafts
-```
-
-### Options
-
-```
-  -h, --help=false: help for drafts
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo list](/commands/hugo_list/)	 - Listing out various types of content
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.801489239 +0000 UTC

docs/content/commands/hugo_list_future.md

@@ -1,53 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo list future"
-slug: hugo_list_future
-url: /commands/hugo_list_future/
----
-## hugo list future
-
-List all posts dated in the future
-
-### Synopsis
-
-
-List all of the posts in your content directory who will be posted in the future
-
-```
-hugo list future
-```
-
-### Options
-
-```
-  -h, --help=false: help for future
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo list](/commands/hugo_list/)	 - Listing out various types of content
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.801618973 +0000 UTC

docs/content/commands/hugo_new.md

@@ -1,61 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo new"
-slug: hugo_new
-url: /commands/hugo_new/
----
-## hugo new
-
-Create new content for your site
-
-### Synopsis
-
-
-Create a new content file and automatically set the date and title.
-It will guess which kind of file to create based on the path provided.
-You can also specify the kind with -k KIND
-If archetypes are provided in your theme or site, they will be used.
-
-
-```
-hugo new [path]
-```
-
-### Options
-
-```
-  -f, --format="toml": frontmatter format
-  -h, --help=false: help for new
-  -k, --kind="": Content type to create
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-* [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 at 2015-05-21 18:03:19.80134962 +0000 UTC

docs/content/commands/hugo_new_site.md

@@ -1,57 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo new site"
-slug: hugo_new_site
-url: /commands/hugo_new_site/
----
-## hugo new site
-
-Create a new site (skeleton)
-
-### Synopsis
-
-
-Create a new site in the provided directory.
-The new site will have the correct structure, but no content or theme yet.
-Use 'hugo new [contentPath]' to create new content.
-	
-
-```
-hugo new site [path]
-```
-
-### Options
-
-```
-  -f, --format="toml": config & frontmatter format
-  -h, --help=false: help for site
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo new](/commands/hugo_new/)	 - Create new content for your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.80106191 +0000 UTC

docs/content/commands/hugo_new_theme.md

@@ -1,57 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo new theme"
-slug: hugo_new_theme
-url: /commands/hugo_new_theme/
----
-## hugo new theme
-
-Create a new theme
-
-### Synopsis
-
-
-Create a new theme (skeleton) called [name] in the current directory.
-New theme is a skeleton. Please add content to the touched files. Add your
-name to the copyright line in the license and adjust the theme.toml file
-as you see fit.
-	
-
-```
-hugo new theme [name]
-```
-
-### Options
-
-```
-  -h, --help=false: help for theme
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo new](/commands/hugo_new/)	 - Create new content for your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.801202688 +0000 UTC

docs/content/commands/hugo_server.md

@@ -1,62 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo server"
-slug: hugo_server
-url: /commands/hugo_server/
----
-## hugo server
-
-Hugo runs its own webserver to render the files
-
-### Synopsis
-
-
-Hugo is able to run its own high performance web server.
-Hugo will render all the files defined in the source directory and
-serve them up.
-
-```
-hugo server
-```
-
-### Options
-
-```
-      --appendPort=true: append port to baseurl
-      --bind="127.0.0.1": interface to which the server will bind
-      --disableLiveReload=false: watch without enabling live browser reload on rebuild
-  -h, --help=false: help for server
-      --meminterval=100: interval to poll memory usage (requires --memstats)
-      --memstats="": log memory usage to this file
-  -p, --port=1313: port on which the server will listen
-  -w, --watch=false: watch filesystem for changes and recreate as needed
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.799665309 +0000 UTC

docs/content/commands/hugo_undraft.md

@@ -1,53 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo undraft"
-slug: hugo_undraft
-url: /commands/hugo_undraft/
----
-## hugo undraft
-
-Undraft changes the content's draft status from 'True' to 'False'
-
-### Synopsis
-
-
-Undraft changes the content's draft status from 'True' to 'False' and updates the date to the current date and time. If the content's draft status is 'False', nothing is done
-
-```
-hugo undraft path/to/content
-```
-
-### Options
-
-```
-  -h, --help=false: help for undraft
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.801883978 +0000 UTC

docs/content/commands/hugo_version.md

@@ -1,53 +0,0 @@
----
-date: 2015-05-21T20:03:19+02:00
-title: "hugo version"
-slug: hugo_version
-url: /commands/hugo_version/
----
-## hugo version
-
-Print the version number of Hugo
-
-### Synopsis
-
-
-All software has versions. This is Hugo's
-
-```
-hugo version
-```
-
-### Options
-
-```
-  -h, --help=false: help for version
-```
-
-### Options inherited from parent commands
-
-```
-  -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-  -D, --buildDrafts=false: include content marked as draft
-  -F, --buildFuture=false: include content with publishdate in the future
-      --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-      --config="": config file (default is path/config.yaml|json|toml)
-  -d, --destination="": filesystem path to write files to
-      --disableRSS=false: Do not build RSS files
-      --disableSitemap=false: Do not build Sitemap file
-      --editor="": edit new content with this editor, if provided
-      --ignoreCache=false: Ignores the cache directory for reading but still writes to it
-      --log=false: Enable Logging
-      --logFile="": Log File path (if set, logging enabled automatically)
-      --pluralizeListTitles=true: Pluralize titles in lists using inflect
-  -s, --source="": filesystem path to read files relative from
-      --stepAnalysis=false: display memory and timing of different steps of the program
-  -t, --theme="": theme to use (located in /themes/THEMENAME/)
-      --uglyUrls=false: if true, use /filename.html instead of /filename/
-  -v, --verbose=false: verbose output
-      --verboseLog=false: verbose logging
-```
-
-### SEE ALSO
-* [hugo](/commands/hugo/)	 - hugo builds your site
-
-###### Auto generated by spf13/cobra at 2015-05-21 18:03:19.799870429 +0000 UTC

docs/content/community/contributing.md

@@ -1,67 +0,0 @@
----
-aliases:
-- /doc/contributing/
-- /meta/contributing/
-date: 2013-07-01
-menu:
-  main:
-    parent: community
-next: /tutorials/automated-deployments
-prev: /community/mailing-list
-title: Contributing to Hugo
-weight: 30
----
-
-All contributions to Hugo are welcome. Whether you want to scratch an itch, or simply contribute to the project, feel free to pick something from the roadmap
-or contact [spf13](http://spf13.com/) about what may make sense
-to do next.
-
-You should fork the project and make your changes.  *We encourage pull requests to discuss code changes.*
-
-
-When you're ready to create a pull request, be sure to:
-
-  * Have test cases for the new code.  If you have questions about how to do it, please ask in your pull request.
-  * Run `go fmt`
-  * Squash your commits into a single commit.  `git rebase -i`.  It's okay to force update your pull request.
-  * Make sure `go test ./...` passes, and `go build` completes.  Our [Travis CI loop](https://travis-ci.org/spf13/hugo) will catch most things that are missing.  The exception: Windows.  We run on Windows from time to time, but if you have access, please check on a Windows machine too.
-
-## Contribution Overview
-
-1. Fork Hugo from https://github.com/spf13/hugo
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Commit passing tests to validate changes.
-5. Run `go fmt`
-6. Squash commits into a single (or logically grouped) commits (`git rebase -i`)
-7. Push to the branch (`git push origin my-new-feature`)
-8. Create new Pull Request
-
-
-# Building from source
-
-## Clone locally (for contributors):
-
-    git clone https://github.com/spf13/hugo
-    cd hugo
-    go get
-
-Because Go expects all of your libraries to be found in either
-`$GOROOT` or `$GOPATH`, it's helpful to symlink the project to one
-of the following paths:
-
- * `ln -s /path/to/your/hugo $GOPATH/src/github.com/spf13/hugo`
- * `ln -s /path/to/your/hugo $GOROOT/src/pkg/github.com/spf13/hugo`
-
-## Running Hugo
-
-    cd /path/to/hugo
-    go install github.com/spf13/hugo/hugo
-    go run main.go
-
-## Building Hugo
-
-    cd /path/to/hugo
-    go build -o hugo main.go
-    mv hugo /usr/local/bin/
-

docs/content/community/mailing-list.md

@@ -1,50 +0,0 @@
----
-date: 2013-07-01
-menu:
-  main:
-    parent: community
-next: /community/contributing
-prev: /extras/urls
-title: Mailing List
-weight: 10
----
-
-## Discussion Forum
-
-Hugo has its own [discussion forum](http://discuss.gohugo.io/) powered by [Discourse](http://www.discourse.org/).
-
-Please use this for all discussions, questions, etc.
-
-## Mailing List
-
-Hugo has two mailing lists:
-
-### Announcements
-Very low traffic. Only releases will be emailed here.
-
-https://groups.google.com/forum/#!forum/hugo-announce
-
-### Discussion (Archive)
-
-**This has been replaced with the [Hugo discussion forum](http://discuss.gohugo.io/).**
-
-It is available for archival purposes.
-
-https://groups.google.com/forum/#!forum/hugo-discuss
-
-
-## Other Resources
-
-### GoNuts
-
-For general Go questions or discussion please refer to the Go mailing list.
-
-https://groups.google.com/forum/#!forum/golang-nuts
-
-### GitHub Issues
-
-https://github.com/spf13/hugo/issues
-
-### Twitter
-
-Hugo doesn't have its own Twitter handle, but feel free to tweet [@spf13](http://twitter.com/spf13).

docs/content/community/press.md

@@ -1,103 +0,0 @@
----
-date: 2014-03-24T20:00:00Z
-linktitle: Press
-notoc: true
-title: Press, Blogs and Media Coverage
-weight: 20
----
-
-### Help keep this list up to date
-
-Know of a post, article or tutorial on hugo? [Add it to this list](https://github.com/spf13/hugo/edit/master/docs/content/community/press.md).
-
-## Press and Articles
-
-Hugo has been featured in the following Blog Posts, Press and Media.
-
-
-| Title                                                                                                                                                                     | Author                                                        | Date         |
-| ------                                                                                                                                                                    | ------                                                        | -----:       |
-| [An Introduction to Static Site Generators](http://davidwalsh.name/introduction-static-site-generators)                                                                   | Eduardo Bouças                                                | 20 May 2015  |
-| [Hugo Still Rules](http://cheekycoder.com/2015/05/hugo-still-rules/)                                                                                                      | Cheeky Coder                                                  | 18 May 2015  |
-| [hugo - Static Site Generator](http://gscacco.github.io/post/hugo/)                                                                                                       | G Scaccoio                                                    | 4 May 2015   |
-| [WindowsでHugoを使う](http://ureta.net/2015/05/hugo-on-windows/)                                                                                                          | うれ太郎                                                      | 1 May 2015   |
-| [Hugoのshortcodesを用いてサイトにスライドなどを埋め込む](http://blog.yucchiy.com/2015/04/29/hugo-shortcode/)                                                              | Yucchiy                                                       | 29 Apr 2015  |
-| [HugoとCircleCIでGitHub PagesにBlogを公開してみたら超簡単だった](http://hori-ryota.github.io/blog/create-blog-with-hugo-and-circleci/)                                    | Hori Ryota                                                    | 17 Apr 2015  |
-| [10 Best Static Site Generators](http://beebom.com/2015/04/best-static-site-generators)                                                                                   | Aniruddha Mysore                                              | 6 Apr 2015   |
-| [Goodbye WordPress; Hello Hugo](http://willwarren.com/2015/04/05/goodbye-wordpress-hello-hugo/)                                                                           | Will Warren                                                   | 5 Apr 2015   |
-| [Static Websites with Hugo on Google Cloud Storage](http://www.moxie.io/post/static-websites-with-hugo-on-google-cloud-storage/)                                          | Moxie Input/Output                                            | 2 Apr 2015   |
-| [De nuevo iniciando un blog](http://alvarolizama.net/blog/denuevo-iniciando-un-blog/)                                                                                     | Alvaro Lizama                                                 | 29 Mar 2015  |
-| [Top Static Site Generators in 2015](http://superdevresources.com/static-site-generators-2015/)                                                                           | Kanishk Kunal                                                 | 12 Mar 2015  |
-| [Moving to Hugo](http://abiosoft.com/moving-to-hugo/)                                                                                                                     | Abiola Ibrahim                                                | 8 Mar 2015   |
-| [Hugoで試行錯誤する - log](http://deprode.net/log/logs/first/)                                                                                                            | Deprode                                                       | 28 Feb 2015  |
-| [服务器上 hugo 的安装和配置 <small>(Installing and configuring Hugo on the server)</small>](http://hucsmn.com/post/hugo-tutorial-make-it-work/)                           | hucsmn                                                        | 11 Feb 2015  |
-| [blogをoctopressからHugoに乗り換えたメモ](http://blog.jigyakkuma.org/2015/02/11/hugo/)                                                                                    | jigyakkuma                                                    | 11 Feb 2015  |
-| [Hugoでブログをつくった](http://porgy13.github.io/post/new-hugo-blog/)                                                                                                    | porgy13                                                       | 7 Feb 2015   |
-| [Hugoにブログを移行した](http://keichi.net/post/first/)                                                                                                                   | Keichi Takahashi                                              | 4 Feb 2015   |
-| [Hugo静态网站生成器中文教程](http://nanshu.wang/post/2015-01-31/)                                                                                                         | Nanshu Wang                                                   | 31 Jan 2015  |
-| [Hugo + Github Pages + Wercker CI =<br> ¥0（無料）でコマンド 1 発（自動化）でサイト・ブログを公開・運営・分析・収益化](http://qiita.com/yoheimuta/items/8a619cac356bed89a4c9) | Yoheimuta                                                     | 31 Jan 2015  |
-| [Running Hugo websites on anynines](http://blog.anynines.com/running-hugo-websites-on-anynines/)                                                                          | Julian Weber                                                  | 30 Jan 2015  |
-| [MiddlemanからHugoへ移行した](http://re-dzine.net/2015/01/hugo/)                                                                                                          | Haruki Konishi                                                | 21 Jan 2015  |
-| [WordPress から Hugo に乗り換えました](http://rakuishi.com/archives/wordpress-to-hugo/)                                                                                   | rakuishi                                                      | 20 Jan 2015  |
-| [HUGOを使ってサイトを立ち上げる方法](http://qiita.com/syui/items/869538099551f24acbbf)                                                                                    | Syui                                                          | 17 Jan 2015  |
-| [Jekyllが許されるのは小学生までだよね](http://t32k.me/mol/log/hugo/)                                                                                                      | Ishimoto Koji                                                 | 16 Jan 2015  |
-| [Getting started with Hugo](http://anthonyfok.org/post/getting-started-with-hugo/)                                                                                        | Anthony Fok                                                   | 12 Jan 2015  |
-| [把这个博客静态化了 <small>(Migrate to Hugo)</small>](http://lich-eng.com/2015/01/03/migrate-to-hugo/)                                                                    | Li Cheng                                                      | 3 Jan 2015   |
-| [My Hugo Experiment](http://tilde.club/~jbaty/2014/12/2014-12-31-my-hugo-experiment/)                                                                                     | Jack Baty                                                     | 31 Dec 2014  |
-| [Porting my blog with Hugo](http://blog.srackham.com/posts/porting-my-blog-with-hugo/)                                                                                    | Stuart Rackham                                                | 30 Dec 2014  |
-| [Hugoを使ってみたときのメモ](http://machortz.github.io/posts/usinghugo/)                                                                                                  | Machortz                                                      | 29 Dec 2014  |
-| [OctopressからHugoへ移行した](http://deeeet.com/writing/2014/12/25/hugo/)                                                                                                 | Taichi Nakashima                                              | 25 Dec 2014  |
-| [Hugo로 Github에 블로그 호스팅하기](http://cdpython.github.io/post/go/hugo/hugo-github/)                                                                                  | CD Python                                                     | 25 Dec 2014  |
-| [Migrating to Hugo From Octopress](http://nathanleclaire.com/blog/2014/12/22/migrating-to-hugo-from-octopress/)                                                           | Nathan LeClaire                                               | 22 Dec 2014  |
-| [Dynamic Pages with GoHugo.io](http://cyrillschumacher.com/2014/12/21/dynamic-pages-with-gohugo.io/)                                                                      | Cyrill Schumacher                                             | 21 Dec 2014  |
-| [6 Static Blog Generators That Aren’t Jekyll](http://www.sitepoint.com/6-static-blog-generators-arent-jekyll/)                                                            | David Turnbull                                                | 8 Dec 2014   |
-| [Travel Blogging Setup](http://www.stou.dk/2014/11/travel-blogging-setup/)                                                                                                | Rasmus Stougaard                                              | 23 Nov 2014  |
-| [Hosting A Hugo Website Behind Nginx](http://www.bigbeeconsultants.co.uk/blog/hosting-hugo-website-behind-nginx)                                                          | Rick Beton                                                    | 20 Nov 2014  |
-| [使用Hugo搭建免费个人Blog <small>(How to use Hugo)</small>](http://ulricqin.com/post/how-to-use-hugo/)                                                                    | Ulric Qin 秦晓辉                                              | 11 Nov 2014  |
-| [Built in Speed and Built for Speed by Hugo](http://cheekycoder.com/2014/10/built-for-speed-by-hugo/)                                                                     | Cheeky Coder                                                  | 30 Oct 2014  |
-| [hugo, syncthing](http://fredix.ovh/2014/10/hugo-syncthing/)                                                                                                              | Frédéric Logier                                               | 13 Oct 2014  |
-| [Hugo para crear sitios web estáticos](http://www.webbizarro.com/noticias/1076/hugo-para-crear-sitios-web-estaticos/)                                                     | Web Bizarro                                                   | 19 Aug 2014  |
-| [Hello Hugo!](http://commiechink.com/2014/08/hello-hugo/)                                                                                                                 | Jason Yee                                                     | 19 Aug 2014  |
-| [Going with hugo](http://www.markuseliasson.se/article/going-with-hugo/)                                                                                                  | Markus Eliasson                                               | 18 Aug 2014  |
-| [Benchmarking Jekyll, Hugo and Wintersmith](http://www.internaldeployment.se/post/2014-08-12-Jekyll-and-its-alternatives-from-a-site-generation-point-of-view/)           | Fredrik Loch                                                  | 12 Aug 2014  |
-| [Goodbye Octopress, Hello Hugo!](http://andreimihu.com/blog/2014/08/11/goodbye-octopress-hello-hugo/)                                                                     | Andrei Mihu                                                   | 11 Aug 2014  |
-| [Beautiful sites for Open Source projects](http://beautifulopen.com/2014/08/09/hugo/)                                                                                     | Beautiful Open                                                | 9 Aug 2014   |
-| [Hugo: Beyond the Defaults](http://npf.io/2014/08/hugo-beyond-the-defaults/)                                                                                              | Nate Finch                                                    | 8 Aug 2014   |
-| [First Impressions of Hugo](https://peteraba.com/blog/first-impressions-of-hugo/)                                                                                         | Peter Aba                                                     | 6 Aug 2014   |
-| [New Site Workflow](http://vurt.co.uk/post/new_website/)                                                                                                                  | Giles Paterson                                                | 5 Aug 2014   |
-| [How I Learned to Stop Worrying and Love the (Static) Web](http://cognition.ca/post/about-hugo/)                                                                          | Joshua McKenty                                                | 4 Aug 2014   |
-| [Hugo over Octopress](http://kennywoo.com/blog/hugo---golang-based-static-site-generator/)                                                                                | Kenny Woo                                                     | 3 Aug 2014   |
-| [Hugo Is Friggin' Awesome](http://npf.io/2014/08/hugo-is-awesome/)                                                                                                        | Nate Finch                                                    | 1 Aug 2014   |
-| [再次搬家 <small>(Move from WordPress to Hugo)</small>](http://www.chingli.com/misc/move-from-wordpress-to-hugo/)                                                         | 青砾 (chingli)                                                | 12 July 2014 |
-| [Embedding Gists in Hugo](http://danmux.com/posts/embedded_gists/)                                                                                                        | Dan Mull                                                      | 5 July 2014  |
-| [An Introduction To Hugo](http://www.cirrushosting.com/web-hosting-blog/an-introduction-to-hugo/)                                                                         | Dan Silber                                                    | 1 July 2014  |
-| [Moving to Hugo](http://danmux.com/posts/hugo_based_blog/)                                                                                                                | Dan Mull                                                      | 29 May 2014  |
-| [开源之静态站点生成器排行榜<br><small>(Leaderboard of open-source static website generators)</small>](http://code.csdn.net/news/2819909)                                  | CSDN.net                                                      | 23 May 2014  |
-| [How I deploy this site using Fabric](http://carlorat.me/quote/fabric/)                                                                                                   | Carlo Ratam                                                   | 21 May 2014  |
-| [Finally, a satisfying and effective blog setup](http://michaelwhatcott.com/now-powered-by-hugo/)                                                                         | Michael Whatcott                                              | 20 May 2014  |
-| [Hugo from scratch](http://zackofalltrades.com/notes/2014/05/hugo-from-scratch/)                                                                                          | Zack Williams                                                 | 18 May 2014  |
-| [Why I switched away from Jekyll](http://www.jakejanuzelli.com/why-I-switched-away-from-jekyll/)                                                                          | Jake Januzelli                                                | 10 May 2014  |
-| [Welcome our new blog](http://blog.ninya.io/posts/welcome-our-new-blog/)                                                                                                  | Ninya.io                                                      | 11 Apr 2014  |
-| [Mission Not Accomplished](http://johnsto.co.uk/blog/mission-not-accomplished/)                                                                                           | Dave Johnston                                                 | 3 Apr 2014   |
-| [Hugo - A Static Site Builder in Go](http://deepfriedcode.com/post/hugo/)                                                                                                 | Deep Fried Code                                               | 30 Mar 2014  |
-| [Adventures in Angular Podcast](http://devchat.tv/adventures-in-angular/003-aia-gdes)                                                                                     | Matias Niemela                                                | 28 Mar 2014  |
-| [Hugo](http://bra.am/post/hugo/)                                                                                                                                          | bra.am                                                        | 23 Mar 2014  |
-| [Converting Blogger To Markdown](http://trishagee.github.io/project/atom-to-hugo/)                                                                                        | Trisha Gee                                                    | 20 Mar 2014  |
-| [Moving to Hugo Static Web Pages](http://tepid.org/tech/hugo-web/)                                                                                                        | Tobias Weingartner                                            | 16 Mar 2014  |
-| [Hugo and GitHub Pages](http://sglyon.com/blog/2014/creating-the-site/)                                                                                                   | Spencer Lyon                                                  | 15 Mar 2014  |
-| [New Blog Engine: Hugo](https://blog.afoolishmanifesto.com/posts/hugo/)                                                                                                   | fREW Schmidt                                                  | 15 Mar 2014  |
-| [Hugo + gulp.js = Huggle](http://ktmud.github.io/huggle/en/intro/) ([English](http://ktmud.github.io/huggle/en/intro/), [中文](http://ktmud.github.io/huggle/zh/intro/))  | Jesse Yang 杨建超                                             | 8 Mar 2014   |
-| [Powered by Hugo](http://kieranhealy.org/blog/archives/2014/02/24/powered-by-hugo/)                                                                                       | Kieran Healy                                                  | 24 Feb 2014  |
-| [静的サイトを素早く構築するために<br>GoLangで作られたジェネレータHugo](http://hamasyou.com/blog/2014/02/21/hugo/)                                                         | <div style="line-height: 1.1;">Shogo Hamada<br>濱田章吾</div> | 21 Feb 2014  |
-| [Latest Roundup of Useful Tools For Developers](http://codegeekz.com/latest-roundup-of-useful-tools-for-developers/)                                                      | CodeGeekz                                                     | 13 Feb 2014  |
-| [Hugo: Static Site Generator written in Go](http://www.braveterry.com/2014/02/06/hugo-static-site-generator-written-in-go/)                                               | Brave Terry                                                   | 6 Feb 2014   |
-| [10 Useful HTML5 Tools for Web Designers and Developers](http://designdizzy.com/10-useful-html5-tools-for-web-designers-and-developers/)                                  | Design Dizzy                                                  | 4 Feb 2014   |
-| [Hugo – Fast, Flexible Static Site Generator](http://cube3x.com/hugo-fast-flexible-static-site-generator/)                                                                | Joby Joseph                                                   | 18 Jan 2014  |
-| [Hugo: A new way to build static website](http://www.w3update.com/opensource/hugo-a-new-way-to-build-static-website.html)                                                 | w3update                                                      | 17 Jan  2014 |
-| [Xaprb now uses Hugo](http://xaprb.com/blog/2014/01/15/using-hugo/)                                                                                                       | Baron Schwartz                                                | 15 Jan 2014  |
-| [New jQuery Plugins And Resources That Web Designers Need](http://www.designyourway.net/blog/resources/new-jquery-plugins-and-resources-that-web-designers-need/)         | Design Your Way                                               | 2014         |
-| [On Blog Construction](http://alexla.sh/post/on-blog-construction/)                                                                                                       | Alexander Lash                                                | 27 Dec 2013  |
-| [Hugo](http://onethingwell.org/post/69070926608/hugo)                                                                                                                     | One Thing Well                                                | 5 Dec 2013   |
-| [In Praise Of Hugo](http://sound-guru.com/blog/post/hello-world/)                                                                                                         | sound-guru.com                                                | 19 Oct 2013  |
-| [Hosting a blog on S3 and Cloudfront](http://www.danesparza.net/2013/07/hosting-a-blog-on-s3-and-cloudfront/)                                                             | Dan Esparza                                                   | 24 July 2013 |
-

docs/content/content/archetypes.md

@@ -1,93 +0,0 @@
----
-date: 2014-05-14T02:13:50Z
-menu:
-  main:
-    parent: content
-next: /content/ordering
-prev: /content/types
-title: Archetypes
-weight: 50
-toc: true
----
-
-Hugo v0.11 introduced the concept of a content builder. Using the
-command: <code>hugo new <em>[relative new content path]</em></code>,
-you can start a content file with the date and title automatically set.
-While this is a welcome feature, active writers need more.
-
-Hugo presents the concept of archetypes, which are archetypal content files
-with pre-configured [front matter](content/front-matter) which will
-populate each new content file whenever you run the `hugo new` command.
-
-
-## Example
-
-### Step 1. Creating an archetype
-
-In this example scenario, we have a blog with a single content type (blog post).
-We will use ‘tags’ and ‘categories’ for our taxonomies, so let's create an archetype file with ‘tags’ and ‘categories’ pre-defined, as follows:
-
-#### archetypes/default.md
-
-    +++
-    tags = ["x", "y"]
-    categories = ["x", "y"]
-    +++
-
-> __CAVEAT:__  Some editors (e.g. Sublime, Emacs) do not insert an EOL (end-of-line) character at the end of the file (i.e. EOF).  If you get a [strange EOF error](/troubleshooting/strange-eof-error/) when using `hugo new`, please open each archetype file (i.e.&nbsp;`archetypes/*.md`) and press <kbd>Enter</kbd> to type a carriage return after the closing `+++` or `---` as necessary.
-
-
-### Step 2. Using the archetype
-
-Now, with `archetypes/default.md` in place, let's create a new post in the `post` section with the `hugo new` command:
-
-    $ hugo new post/my-new-post.md
-
-Hugo would create the file with the following contents:
-
-#### content/post/my-new-post.md
-
-    +++
-    title = "my new post"
-    date = "2015-01-12T19:20:04-07:00"
-    tags = ["x", "y"]
-    categories = ["x", "y"]
-    +++
-
-We see that the `title` and `date` variables have been added, in addition to the `tags` and `categories` variables which were carried over from `archetype/default.md`.
-
-Congratulations!  We have successfully created an archetype and used it for our new contents.  That's all there is to it!
-
-
-## Using a different front matter format
-
-By default, the front matter will be created in the TOML format
-regardless of what format the archetype is using.
-
-You can specify a different default format in your site-wide config file
-(e.g. `config.toml`) using the `MetaDataFormat` directive.
-Possible values are `"toml"`, `"yaml"` and `"json"`.
-
-
-## Which archetype is being used
-
-The following rules apply:
-
-* If an archetype with a filename that matches the content type being created, it will be used.
-* If no match is found, `archetypes/default.md` will be used.
-* If neither is present and a theme is in use, then within the theme:
-    * If an archetype with a filename that matches the content type being created, it will be used.
-    * If no match is found, `archetypes/default.md` will be used.
-* If no archetype files are present, then the one that ships with Hugo will be used.
-
-Hugo provides a simple archetype which sets the `title` (based on the
-file name) and the `date` in RFC&nbsp;3339 format based on
-[`now()`](http://golang.org/pkg/time/#Now), which returns the current time.
-
-> *Note: `hugo new` does not automatically add `draft = true` when the user
-> provides an archetype.  This is by design, rationale being that
-> the archetype should set its own value for all fields.
-> `title` and `date`, which are dynamic and unique for each piece of content,
-> are the sole exceptions.*
-
-Content type is automatically detected based on the path. You are welcome to declare which type to create using the `--kind` flag during creation.

docs/content/content/example.md

@@ -1,91 +0,0 @@
----
-aliases:
-- /doc/example/
-date: 2013-07-01
-linktitle: Example
-menu:
-  main:
-    parent: content
-next: /themes/overview
-notoc: true
-prev: /content/summaries
-title: Example Content File
-weight: 70
----
-
-Some things are better shown than explained. The following is a very basic example of a content file written in [Markdown](https://help.github.com/articles/github-flavored-markdown/):
-
-**mysite/content/project/nitro.md → http://mysite.com/project/nitro.html**
-
-With TOML front matter:
-
-```markdown
-+++
-date        = "2013-06-21T11:27:27-04:00"
-title       = "Nitro: A quick and simple profiler for Go"
-description = "Nitro is a simple profiler for your Golang applications"
-tags        = [ "Development", "Go", "profiling" ]
-topics      = [ "Development", "Go" ]
-slug        = "nitro"
-project_url = "https://github.com/spf13/nitro"
-+++
-
-# Nitro
-
-Quick and easy performance analyzer library for [Go](http://golang.org/).
-
-## Overview
-
-Nitro is a quick and easy performance analyzer library for Go.
-It is useful for comparing A/B against different drafts of functions
-or different functions.
-
-## Implementing Nitro
-
-Using Nitro is simple. First, use `go get` to install the latest version
-of the library.
-
-    $ go get github.com/spf13/nitro
-
-Next, include nitro in your application.
-```
-
-You may also use the equivalent YAML front matter:
-
-```markdown
----
-date:        "2013-06-21T11:27:27-04:00"
-title:       "Nitro: A quick and simple profiler for Go"
-description: "Nitro is a simple profiler for your Go lang applications"
-tags:        [ "Development", "Go", "profiling" ]
-topics:      [ "Development", "Go" ]
-slug:        "nitro"
-project_url: "https://github.com/spf13/nitro"
----
-```
-
-`nitro.md` would be rendered as follows:
-
-> # Nitro
->
-> Quick and easy performance analyzer library for [Go](http://golang.org/).
->
-> ## Overview
->
-> Nitro is a quick and easy performance analyzer library for Go.
-> It is useful for comparing A/B against different drafts of functions
-> or different functions.
->
-> ## Implementing Nitro
->
-> Using Nitro is simple. First, use `go get` to install the latest version
-> of the library.
->
->     $ go get github.com/spf13/nitro
->
-> Next, include nitro in your application.
-
-The source `nitro.md` file is converted to HTML by the excellent
-[Blackfriday](https://github.com/russross/blackfriday) Markdown processor,
-which supports extended features found in the popular
-[GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/).

docs/content/content/front-matter.md

@@ -1,109 +0,0 @@
----
-aliases:
-- /doc/front-matter/
-date: 2013-07-01
-menu:
-  main:
-    parent: content
-next: /content/sections
-prev: /content/organization
-title: Front Matter
-weight: 20
-toc: true
----
-
-The **front matter** is one of the features that gives Hugo its strength. It enables
-you to include the meta data of the content right with it. Hugo supports a few
-different formats, each with their own identifying tokens.
-
-Supported formats:
-
-  * **[TOML][]**, identified by '`+++`'.
-  * **[YAML][]**, identified by '`---`'.
-  * **[JSON][]**, a single JSON object which is surrounded by '`{`' and '`}`', each on their own line.
-
-[TOML]: https://github.com/toml-lang/toml "Tom's Obvious, Minimal Language"
-[YAML]: http://www.yaml.org/ "YAML Ain't Markup Language"
-[JSON]: http://www.json.org/ "JavaScript Object Notation"
-
-## TOML Example
-
-    +++
-    title = "spf13-vim 3.0 release and new website"
-    description = "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-    tags = [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-    date = "2012-04-06"
-    categories = [
-      "Development",
-      "VIM"
-    ]
-    slug = "spf13-vim-3-0-release-and-new-website"
-    +++
-    
-    Content of the file goes Here
-
-## YAML Example
-
-    ---
-    title: "spf13-vim 3.0 release and new website"
-    description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-    tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-    date: "2012-04-06"
-    categories:
-      - "Development"
-      - "VIM"
-    slug: "spf13-vim-3-0-release-and-new-website"
-    ---
-    
-    Content of the file goes Here
-
-## JSON Example
-
-    {
-        "title": "spf13-vim 3.0 release and new website",
-        "description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
-        "tags": [ ".vimrc", "plugins", "spf13-vim", "vim" ],
-        "date": "2012-04-06",
-        "categories": [
-            "Development",
-            "VIM"
-        ],
-        "slug": "spf13-vim-3-0-release-and-new-website",
-    }
-    
-    Content of the file goes Here
-
-## Variables
-
-There are a few predefined variables that Hugo is aware of and utilizes. The user can also create
-any variable they want to. These will be placed into the `.Params` variable available to the templates.
-Field names are always normalized to lowercase (e.g. `camelCase: true` is available as `.Params.camelcase`).
-
-### Required variables
-
-* **title** The title for the content
-* **description** The description for the content
-* **date** The date the content will be sorted by
-* **taxonomies** These will use the field name of the plural form of the index (see tags and categories above)
-
-### Optional variables
-
-* **redirect** Mark the post as a redirect post
-* **draft** If true, the content will not be rendered unless `hugo` is called with `--buildDrafts`
-* **publishdate** If in the future, content will not be rendered unless `hugo` is called with `--buildFuture`
-* **type** The type of the content (will be derived from the directory automatically if unset)
-* **weight** Used for sorting
-* **markup** *(Experimental)* Specify `"rst"` for reStructuredText (requires
-            `rst2html`) or `"md"` (default) for Markdown
-* **slug** The token to appear in the tail of the URL,
-   *or*<br>
-* **url** The full path to the content from the web root.<br>
-
-*If neither `slug` or `url` is present, the filename will be used.*
-
-## Configure Blackfriday rendering
-
-It's possible to set some options for Markdown rendering in the page's front matter, as an override to the site wide configuration.
-
-See [Configuration]({{< ref "overview/configuration.md#configure-blackfriday-rendering" >}}) for more.
-

docs/content/content/ordering.md

@@ -1,39 +0,0 @@
----
-date: 2014-03-06
-linktitle: Ordering
-menu:
-  main:
-    parent: content
-next: /content/summaries
-prev: /content/archetypes
-title: Ordering Content
-weight: 60
----
-
-Hugo provides you with all the flexibility you need to organize how your content is ordered.
-
-By default, content is ordered by weight, then by date with the most
-recent date first, but alternative sorting (by `title` and `linktitle`) is
-also available. The order the content would appear is specified in
-the [list template](/templates/list/).
-
-_Both the `date` and `weight` fields are optional._
-
-Unweighted pages appear at the end of the list. If no weights are provided (or
-if weights are the same), `date` will be used to sort. If neither is provided,
-content will be ordered based on how it's read off the disk, and no order is
-guaranteed.
-
-## Assigning weight to content
-
-    +++
-    weight = 4
-    title = "Three"
-    date = "2012-04-06"
-    +++
-    Front Matter with Ordered Pages 3
-
-
-## Ordering Content Within Taxonomies
-
-Please see the [Taxonomy Ordering Documentation](/taxonomies/ordering/).

docs/content/content/organization.md

@@ -1,165 +0,0 @@
----
-aliases:
-- /doc/organization/
-date: 2013-07-01
-linktitle: Organization
-menu:
-  main:
-    parent: content
-next: /content/front-matter
-prev: /overview/source-directory
-title: Content Organization
-weight: 10
-toc: true
----
-
-Hugo uses Markdown files with headers commonly called the *front matter*. Hugo
-respects the organization that you provide for your content to minimize any
-extra configuration, though this can be overridden by additional configuration
-in the front matter.
-
-## Organization
-
-In Hugo, the content should be arranged in the same way they are intended for
-the rendered website. Without any additional configuration, the following will
-just work. Hugo supports content nested at any level. The top level is special
-in Hugo and is used as the [section](/content/sections/).
-
-    .
-    └── content
-        ├── post
-        |   ├── firstpost.md   // <- http://1.com/post/firstpost/
-        |   ├── happy
-        |   |   └── ness.md    // <- http://1.com/post/happy/ness/
-        |   └── secondpost.md  // <- http://1.com/post/secondpost/
-        └── quote
-            ├── first.md       // <- http://1.com/quote/first/
-            └── second.md      // <- http://1.com/quote/second/
-
-**Here's the same organization run with `hugo --uglyUrls`**
-
-    .
-    └── content
-        ├── post
-        |   ├── firstpost.md   // <- http://1.com/post/firstpost.html
-        |   ├── happy
-        |   |   └── ness.md    // <- http://1.com/post/happy/ness.html
-        |   └── secondpost.md  // <- http://1.com/post/secondpost.html
-        └── quote
-            ├── first.md       // <- http://1.com/quote/first.html
-            └── second.md      // <- http://1.com/quote/second.html
-
-## Destinations
-
-Hugo believes that you organize your content with a purpose. The same structure
-that works to organize your source content is used to organize the rendered
-site. As displayed above, the organization of the source content will be
-mirrored in the destination.
-
-There are times when one would need more control over their content. In these
-cases, there are a variety of things that can be specified in the front matter
-to determine the destination of a specific piece of content.
-
-The following items are defined in order, latter items in the list will override
-earlier settings.
-
-### filename
-This isn't in the front matter, but is the actual name of the file minus the
-extension. This will be the name of the file in the destination.
-
-### slug
-Defined in the front matter, the `slug` can take the place of the filename for the
-destination.
-
-### filepath
-The actual path to the file on disk. Destination will create the destination
-with the same path. Includes [section](/content/sections/).
-
-### section
-`section` can be provided in the front matter overriding the section derived from
-the source content location on disk. See [section](/content/sections/).
-
-### path
-`path` can be provided in the front matter. This will replace the actual
-path to the file on disk. Destination will create the destination with the same
-path. Includes [section](/content/sections/).
-
-### url
-A complete URL can be provided. This will override all the above as it pertains
-to the end destination. This must be the path from the baseURL (starting with a "/").
-When a `url` is provided, it will be used exactly. Using `url` will ignore the
-`--uglyUrls` setting.
-
-
-## Path breakdown in Hugo
-
-### Content
-
-    .             path           slug
-    .       ⊢-------^----⊣ ⊢------^-------⊣
-    content/extras/indexes/category-example/index.html
-
-
-    .       section              slug
-    .       ⊢--^--⊣        ⊢------^-------⊣
-    content/extras/indexes/category-example/index.html
-
-
-    .       section  slug
-    .       ⊢--^--⊣⊢--^--⊣
-    content/extras/indexes/index.html
-
-### Destination
-
-
-               permalink
-    ⊢--------------^-------------⊣
-    http://spf13.com/projects/hugo
-
-
-       baseURL       section  slug
-    ⊢-----^--------⊣ ⊢--^---⊣ ⊢-^⊣
-    http://spf13.com/projects/hugo
-
-
-       baseURL       section          slug
-    ⊢-----^--------⊣ ⊢--^--⊣        ⊢--^--⊣
-    http://spf13.com/extras/indexes/example
-
-
-       baseURL            path       slug
-    ⊢-----^--------⊣ ⊢------^-----⊣ ⊢--^--⊣
-    http://spf13.com/extras/indexes/example
-
-
-       baseURL            url
-    ⊢-----^--------⊣ ⊢-----^-----⊣
-    http://spf13.com/projects/hugo
-
-
-       baseURL               url
-    ⊢-----^--------⊣ ⊢--------^-----------⊣
-    http://spf13.com/extras/indexes/example
-
-
-
-**section** = which type the content is by default
-
-* based on content location 
-* front matter overrides
-
-**slug** = name.ext or name/
-
-* based on content-name.md 
-* front matter overrides
-
-**path** = section + path to file excluding slug
-
-* based on path to content location
-
-
-**url** = relative URL
-
-* defined in front matter
-* overrides all the above
-

docs/content/content/sections.md

@@ -1,51 +0,0 @@
----
-date: 2013-07-01
-menu:
-  main:
-    parent: content
-next: /content/types
-notoc: true
-prev: /content/front-matter
-title: Sections
-weight: 30
----
-
-Hugo believes that you organize your content with a purpose. The same structure
-that works to organize your source content is used to organize the rendered
-site (see [Organization](/content/organization/)). Following this pattern Hugo
-uses the top level of your content organization as **the Section**.
-
-The following example site uses two sections, "post" and "quote".
-
-    .
-    └── content
-        ├── post
-        |   ├── firstpost.md       // <- http://1.com/post/firstpost/
-        |   ├── happy
-        |   |   └── ness.md   // <- http://1.com/post/happy/ness/
-        |   └── secondpost.md      // <- http://1.com/post/secondpost/
-        └── quote
-            ├── first.md           // <- http://1.com/quote/first/
-            └── second.md          // <- http://1.com/quote/second/
-
-
-## Section Lists
-
-Hugo will automatically create pages for each section root that list all
-of the content in that section. See [List Templates](/templates/list/)
-for details on customizing the way they appear.
-
-## Sections and Types
-
-By default everything created within a section will use the content type
-that matches the section name.
-
-Section defined in the front matter have the same impact.
-
-To change the type of a given piece of content, simply define the type
-in the front matter.
-
-If a layout for a given type hasn't been provided, a default type template will
-be used instead provided it exists.
-
-

docs/content/content/summaries.md

@@ -1,52 +0,0 @@
----
-date: 2013-07-01
-menu:
-  main:
-    parent: content
-next: /content/example
-notoc: true
-prev: /content/ordering
-title: Summaries
-weight: 65
----
-
-With the use of the `.Summary` [page variable](/templates/variables/), Hugo can generate summaries of content for easily showing snippets in summary views. The summary view snippets are automatically generated by Hugo. Where a piece of content is split for the content summary depends on whether the split is Hugo-defined or user-defined.
-
-Content summaries may also provide links to the original content, usually in the form of a "Read More..." link, with the help of the `.RelPermalink` or `.Permalink` variable, as well as the `.Truncated` boolean variable to determine whether such "Read More..." link is necessary.
-
-## Hugo-defined: automatic summary split
-
-By default, Hugo automatically takes the first 70 words of your content as its summary and stores it into the `.Summary` variable, which you may use in your templates.
-
-* 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 lumped into one paragraph.  Some people like it, but some people don't.
-
-## User-defined: manual summary split:
-
-Alternatively, you may add the <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> summary divider[^1] where you want to split the article.  Content prior to the summary divider will be used as that content's summary, and stored into the `.Summary` variable with all HTML formatting intact.
-
-[^1]: The **summary divider** is also called "more tag", "excerpt separator", etc. in other literature.
-
-* Pros: Freedom, precision, and improved rendering.  All formatting is preserved.
-* Cons: Need to remember to type <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> in your content file.  :-)
-
-Be careful to enter <code>&#60;&#33;&#45;&#45;more&#45;&#45;&#62;</code> exactly, i.e. all lowercase with no whitespace, otherwise it would be treated as regular comment and ignored.
-
-
-## Showing Summaries
-
-You can show content summaries with the following code. You could do this, for example, on a [list](/templates/list/) node.
-
-    {{ range first 10 .Data.Pages }}
-      <div class="summary">
-        <h4><a href="{{ .RelPermalink }}">{{ .Title }}</a></h4>
-        {{ .Summary }}
-      </div>
-      {{ if .Truncated }}
-      <div class="read-more-link">
-        <a href="{{ .RelPermalink }}">Read More…</a>
-      </div>
-      {{ end }}
-    {{ end }}
-
-Note how the `.Truncated` boolean valuable may be used to hide the "Read More..." link when the content is not truncated, i.e. when the summary contains the entire article.

docs/content/content/types.md

@@ -1,77 +0,0 @@
----
-date: 2013-07-01
-linktitle: Types
-menu:
-  main:
-    parent: content
-next: /content/archetypes
-prev: /content/sections
-title: Content Types
-weight: 40
-toc: true
----
-
-Hugo has full support for different types of content. A content type can have a
-unique set of meta data, template and can be automatically created by the `hugo new`
-command through using content [archetypes](/content/archetypes/).
-
-A good example of when multiple types are needed is to look at [Tumblr](https://www.tumblr.com/). A piece
-of content could be a photo, quote or post, each with different meta data and
-rendered differently.
-
-## Assigning a content type
-
-Hugo assumes that your site will be organized into [sections](/content/sections/)
-and each section will use the corresponding type. If you are taking advantage of
-this, then each new piece of content you place into a section will automatically
-inherit the type.
-
-Alternatively, you can set the type in the meta data under the key "`type`".
-
-
-## Creating new content of a specific type
-
-Hugo has the ability to create a new content file and populate the front matter
-with the data set corresponding to that type. Hugo does this by utilizing
-[archetypes](/content/archetypes/).
-
-To create a new piece of content, use:
-
-    hugo new relative/path/to/content.md
-
-For example, if I wanted to create a new post inside the post section, I would type:
-
-    hugo new post/my-newest-post.md
-
-
-## Defining a content type
-
-Creating a new content type is easy in Hugo. You simply provide the templates and archetype
-that the new type will use. You only need to define the templates, archetypes and/or views
-unique to that content type. Hugo will fall back to using the general templates and default archetype
-whenever a specific file is not present.
-
-*Remember, all of the following are optional:*
-
-### Create Type Directory
-Create a directory with the name of the type in `layouts`. Type is always singular.  *E.g. `/layouts/post`*.
-
-### Create single template
-Create a file called `single.html` inside your directory. *E.g. `/layouts/post/single.html`*.
-
-### Create list template
-Create a file called `list.html` inside your directory. *E.g. `/layouts/post/list.html`*.
-
-### Create views
-Many sites support rendering content in a few different ways, for instance,
-a single page view and a summary view to be used when displaying a list
-of contents on a single page. Hugo makes no assumptions here about how you want
-to display your content, and will support as many different views of a content
-type as your site requires. All that is required for these additional views is
-that a template exists in each layouts/`TYPE` directory with the same name.
-
-### Create a corresponding archetype
-
-Create a file called <code><em>type</em>.md</code> in the `/archetypes` directory. *E.g. `/archetypes/post.md`*.
-
-More details about archetypes can be found at the [archetypes docs](/content/archetypes/).

docs/content/extras/aliases.md

@@ -1,81 +0,0 @@
----
-aliases:
-- /doc/redirects/
-- /doc/alias/
-- /doc/aliases/
-date: 2013-07-09
-menu:
-  main:
-    parent: extras
-next: /extras/builders
-prev: /taxonomies/ordering
-title: Aliases
-weight: 10
----
-
-For people migrating existing published content to Hugo, there's a good chance you need a mechanism to handle redirecting old URLs.
-
-Luckily, redirects can be handled easily with _aliases_ in Hugo.
-
-## Example
-
-Given a post on your current Hugo site, with a path of: 
-
-``content/posts/my-awesome-blog-post.md``
-
-... you create an "aliases" section in the frontmatter of your post, and add previous paths to that. 
-
-### TOML frontmatter
-
-~~~yaml
-+++
-        ...
-aliases = [
-    "/posts/my-original-url/",
-    "/2010/01/01/even-earlier-url.html"
-]
-        ...
-+++
-~~~
-
-### YAML frontmatter
-
-~~~yaml
----
-        ...
-aliases:
-    - /posts/my-original-url/
-    - /2010/01/01/even-earlier-url.html
-        ...
----
-~~~
-
-Now when you visit any of the locations specified in aliases, _assuming the same site domain_, you'll be redirected to the page they are specified on. 
-
-## Important Behaviors
-
-1. *Hugo makes no assumptions about aliases. They also don't change based
-on your UglyUrls setting. You need to provide absolute path to your webroot and the
-complete filename or directory.*
-
-2. *Aliases are rendered prior to any content and will be overwritten by
-any content with the same location.*
-
-## How Hugo Aliases Work
-
-When aliases are specified, Hugo creates a physical folder structure to match the alias entry, and, an html file specifying the canonical URL for the page, and a redirect target. 
-
-Assuming a baseurl of `mysite.tld`, the contents of the html file will look something like: 
-
-~~~html
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="canonical" href="http://mysite.tld/posts/my-original-url"/>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <meta http-equiv="refresh" content="0;url=http://mysite.tld/posts/my-original-url"/>
-  </head>
-</html>
-~~~
-
-The `http-equiv="refresh"` line is what performs the redirect, in 0 seconds in this case.

docs/content/extras/builders.md

@@ -1,58 +0,0 @@
----
-date: 2014-05-26
-linktitle: Builders
-menu:
-  main:
-    parent: extras
-next: /extras/comments
-prev: /extras/aliases
-title: Hugo Builders
-weight: 20
----
-
-Hugo provides the functionality to quickly get a site, theme or page
-started.
-
-
-## New Site
-
-Want to get a site built quickly?
-
-    $ hugo new site /path/to/site
-
-Hugo will create all the needed directories and files to get started
-quickly.
-
-Hugo will only touch the files and create the directories (in the right
-places), [configuration](/overview/configuration/) and content are up to
-you... but luckily we have builders for content (see below).
-
-## New Theme
-
-Want to design a new theme?
-
-    $ hugo new theme THEME_NAME
-
-Run from your working directory, this will create a new theme with all
-the needed files in your themes directory. Hugo will provide you with a
-license and theme.toml file with most of the work done for you.
-
-Follow the [Theme Creation Guide](/themes/creation/) once the builder is
-done.
-
-## New Content
-
-You will use this builder the most of all. Every time you want to create
-a new piece of content, the content builder will get you started right.
-
-Leveraging [content archetypes](/content/archetypes/) the content builder
-will not only insert the current date and appropriate metadata, but it
-will pre-populate values based on the content type.
-
-    $ hugo new relative/path/to/content
-
-This assumes it is being run from your working directory and the content
-path starts from your content directory.
-
-I typically keep two different terminals open, one to run `hugo server
---watch`, and another to use the builders to create new content.

docs/content/extras/comments.md

@@ -1,94 +0,0 @@
----
-date: 2014-05-26
-linktitle: Comments
-menu:
-  main:
-    parent: extras
-next: /extras/crossreferences
-prev: /extras/builders
-title: Comments in Hugo
-weight: 30
----
-
-As Hugo is a static site generator, the content produced is static and doesn’t interact with the users. The most common interaction people ask for is comment capability.
-
-Hugo ships with support for [Disqus](https://disqus.com/), a third-party service that provides comment and community capabilities to website via JavaScript.
-
-Your theme may already support Disqus, but even it if doesn’t, it is easy to add.
-
-# Disqus Support
-
-## Adding Disqus to a template
-
-Hugo comes with all the code you would need to include load Disqus. Simply include the following line where you want your comments to appear:
-
-    {{ template "_internal/disqus.html" . }}
-
-## Configuring Disqus
-
-That template requires you to set a single value in your site config file, e.g. config.yaml.
-
-    disqusShortname = "XYW"
-
-Additionally, you can optionally set the following in the front matter
-for a given piece of content:
-
- * **disqus_identifier**
- * **disqus_title**
- * **disqus_url**
-
-## Conditional Loading of Disqus Comments
-
-Users have noticed that enabling Disqus comments when running the Hugo web server on localhost causes the creation of unwanted discussions on the associated Disqus account. In order to prevent this, a slightly tweaked partial template is required. So, rather than using the built-in `"_internal/disqus.html"` template referenced above, create a template in your `partials` folder that looks like this:
-
-```html
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-
-(function() {
-    // Don't ever inject Disqus on localhost--it creates unwanted
-    // discussions from 'localhost:1313' on your Disqus account...
-    if (window.location.hostname == "localhost")
-        return;
-
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    var disqus_shortname = '{{ .Site.Params.disqusShortname }}';
-    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-})();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-```
-
-Notice that there is a simple `if` statement that detects when you are running on localhost and skips the initialization of the Disqus comment injection.
-
-Now, reference the partial template from your page template:
-
-    {{ partial "disqus.html" . }}
-
-
-# Alternatives
-
-A few alternatives exist to [Disqus](https://disqus.com/):
-
-* [Discourse](http://www.discourse.org)
-* [IntenseDebate](http://intensedebate.com/)
-* [Livefyre](http://livefyre.com/)
-* [Muut](http://muut.com/)
-* [多说](http://duoshuo.com/) ([Duoshuo](http://duoshuo.com/), popular in China)
-* [isso](http://posativ.org/isso/) (Self-hosted, Python)
-* [Kaiju](https://github.com/spf13/kaiju)
-
-## Kaiju 
-
-[Kaiju](https://github.com/spf13/kaiju) is an open-source project started by [spf13](http://spf13.com/) (Hugo’s author) to bring easy and fast real time discussions to the web.
-
-Written using Go, Socket.io and MongoDB, it is very fast and easy to deploy.
-
-It is in early development but shows promise. If you have interest, please help by contributing whether via a pull request, an issue or even just a tweet. Everything helps.
-
-## Discourse
-
-Additionally, you may recognize [Discourse](http://www.discourse.org) as the system that powers the [Hugo Discussion Forum](http://discuss.gohugo.io).
-

docs/content/extras/crossreferences.md

@@ -1,151 +0,0 @@
----
-date: 2014-11-25
-menu:
-  main:
-    parent: extras
-next: /extras/livereload
-prev: /extras/comments
-title: Cross-References
-toc: true
-weight: 40
----
-
-Hugo makes it easy to link documents together with the `ref` and `relref` shortcodes. These shortcodes are also used to safely provide links to headings inside of your content, whether across documents or within a document. The only difference between `ref` and `relref` is whether the resulting URL is absolute (`http://1.com/about/`) or relative (`/about/`).
-
-## Using `ref` and `relref`
-
-    {{</* ref "document" */>}}
-    {{</* ref "#anchor" */>}}
-    {{</* ref "document#anchor" */>}}
-    {{</* relref "document" */>}}
-    {{</* relref "#anchor" */>}}
-    {{</* relref "document#anchor" */>}}
-
-The single parameter to `ref` is a string with a content _document name_ (`about.md`), an in-document _anchor_ (`#who`), or both (`about.md#who`).
-
-### Document Names
-
-The _document name_ is the name of a document including the format extension; this may be just the filename, or the relative path from the `content/` directory. With a document `content/blog/post.md`, either format will produce the same result.
-
-    {{</* relref "blog/post.md" */>}} ⇒ `/blog/post/`
-    {{</* relref "post.md" */>}} ⇒ `/blog/post/`
-
-If you have multiple sections with the same filename, you should only use the relative path format, because the behaviour is _undefined_. So, if I also have a document `link/post.md`, the output of `ref` is unknown for `post.md`.
-
-    {{</* relref "blog/post.md" */>}} ⇒ `/blog/post/`
-    {{</* relref "post.md" */>}} ⇒ `/blog/post/` (maybe)
-    {{</* relref "post.md" */>}} ⇒ `/link/post/` (maybe)
-    {{</* relref "link/post.md" */>}} ⇒ `/link/post/`
-
-A relative document name must *not* begin with a slash (`/`).
-
-    {{</* relref "/blog/post.md" */>}} ⇒ `""`
-
-### Anchors
-
-When an _anchor_ is provided by itself, the current page’s unique identifier will be appended; when an _anchor_ is provided with a document name, the found page's unique identifier will be appended.
-
-    {{</* relref "#who" */>}} ⇒ `#who:9decaf7`
-    {{</* relref "blog/post.md#who" */>}} ⇒ `/blog/post/#who:badcafe`
-
-More information about document unique identifiers and headings can be found [below]({{< ref "#hugo-heading-anchors" >}}).
-
-### Examples
-
-* `{{</* ref "blog/post.md" */>}}` ⇒ `http://1.com/blog/post/`
-* `{{</* ref "post.md#tldr" */>}}` ⇒ `http://1.com/blog/post/#tldr:caffebad`
-* `{{</* relref "post.md" */>}}` ⇒ `/blog/post/`
-* `{{</* relref "blog/post.md#tldr" */>}}` ⇒ `/blog/post/#tldr:caffebad`
-* `{{</* ref "#tldr" */>}}` ⇒ `#tldr:badcaffe`
-* `{{</* relref "#tldr" */>}}` ⇒ `#tldr:badcaffe`
-
-## Hugo Heading Anchors
-
-When using Markdown document types, Hugo generates heading anchors automatically. The generated anchor for this section is `hugo-heading-anchors`. Because the heading anchors are generated automatically, Hugo takes some effort to ensure that heading anchors are unique both inside a document and across the entire site.
-
-Ensuring heading uniqueness across the site is accomplished with a unique identifier for each document based on its path. Unless a document is renamed or moved between sections *in the filesystem*, the unique identifier for the document will not change: `blog/post.md` will always have a unique identifier of `81df004c333b392d34a49fd3a91ba720`.
-
-`ref` and `relref` were added so you can make these reference links without having to know the document’s unique identifier. (The links in document tables of contents are automatically up-to-date with this value.)
-
-    {{</* relref "extras/crossreferences.md#hugo-heading-anchors" */>}}
-    /extras/crossreferences/#hugo-heading-anchors:77cd9ea530577debf4ce0f28c8dca242
-
-> What follows is a deeper discussion of *why* and *how* Hugo generates heading anchors. It is not necessary to know this to use `ref` and `relref`, but it may be useful in understanding how some anchors may not match your expectations.
-
-### How to Generate a Heading Anchor
-
-Convert the text of the heading to lowercase.
-
-    Hugo: A Fast & Modern Static Web Engine
-    hugo: a fast & modern static web engine
-
-Replace anything that isn't an ASCII letter (`a-z`) or number (`0-9`) with a dash (`-`).
-
-    hugo: a fast & modern static web engine
-    hugo--a-fast---modern-static-web-engine
-
-Get rid of extra dashes.
-
-    hugo--a-fast---modern-static-web-engine
-    hugo-a-fast-modern-static-web-engine
-
-You have just converting the text of a heading to a suitable anchor. If your document has unique heading text, all of the anchors will be unique, too.
-
-#### Specifying Heading Anchors
-
-You can also tell Hugo to use a particular heading anchor.
-
-    # Hugo: A Fast & Modern Static Web Engine {#hugo-main}
-
-Hugo will use `hugo-main` as the heading anchor.
-
-### What About Duplicate Heading Anchors?
-
-The technique outlined above works well enough, but some documents have headings with identical text, like the [shortcodes](/extras/shortcodes/) page—there are three headings with the text "Example". You can specify heading anchors manually:
-
-    ### Example {#example-1}
-    ### Example {#example-2}
-    ### Example {#example-3}
-
-It’s easy to forget to do that all the time, and Hugo is smart enough to do it for you. It just adds `-x` to the end of each heading it has already seen.
-
-* `### Example` ⇒ `example`
-* `### Example` ⇒ `example-1`
-* `### Example` ⇒ `example-2`
-
-Sometimes it's a little harder, but Hugo can recover from those, too, by adding more suffixes:
-
-* `# Heading` ⇒ `heading`
-* `# Heading 1` ⇒ `heading-1`
-* `# Heading` ⇒ `heading-1-1`
-* `# Heading` ⇒ `heading-1-2`
-* `# Heading 1` ⇒ `heading-2`
-
-This can even affect specified heading anchors that come after a generated heading anchor.
-
-* `# My Heading` ⇒ `my-heading`
-* `# My Heading {#my-heading}` ⇒ `my-heading-1`
-
-> This particular collision and override is unfortunate, but unavoidable because Hugo processes each heading for collision detection as it sees it during conversion.
-
-This technique works well for documents rendered on individual pages, like blog posts. What about on Hugo list pages?
-
-### Unique Heading Anchors in Lists
-
-Hugo converts each document from Markdown independently. it doesn’t know that `blog/post.md` has an "Example" heading that will collide with the "Example" heading in `blog/post2.md`. Even if it did know this, the addition of `blog/post3.md` should not cause the anchors for the headings in the other blog posts to change.
-
-Enter the document’s unique identifier. To prevent this sort of collision on
-list pages, Hugo always appends the document's to a generated heading anchor.
-So, the "Example" heading in `blog/post.md` actually turns into
-`#example:81df004…`, and the "Example" heading in `blog/post2.md` actually
-turns into `#example:8cf1599…`. All you have to know is the heading anchor that
-was generated, not the document identifier; `ref` and `relref` take care of the
-rest for you.
-
-    <a href='{{</* relref "blog/post.md#example" */>}}'>Post Example</a>
-    <a href='/blog/post.md#81df004…'>Post Example</a>
-
-    [Post Two Example]({{</* relref "blog/post2.md#example" */>}})
-    <a href='/blog/post2.md#8cf1599…'>Post Two Example</a>
-
-Now you know.

docs/content/extras/datafiles.md

@@ -1,83 +0,0 @@
----
-aliases:
-- /doc/datafiles/
-date: 2015-01-22
-menu:
-  main:
-    parent: extras
-next: /extras/dynamiccontent
-prev: /extras/scratch
-title: Data Files
-weight: 90
----
-
-In addition to the [built-in variables](/templates/variables/) available from Hugo, you can specify your own custom data that can be accessed via templates or shortcodes.
-
-Hugo supports loading data from [YAML](http://yaml.org/), [JSON](http://www.json.org/), and [TOML](https://github.com/toml-lang/toml) files located in the `data` directory.
-
-**It even works with [LiveReload](/extras/livereload/).**
-
-Data Files can also be used in [themes](/themes/overview/), but note: If the same `key` is used in both the main data folder and in the theme's data folder, the main one will win. So, for theme authors,  for theme specific data items that shouldn't be overridden, it can be wise to prefix the folder structure with a namespace, e.g. `mytheme/data/mytheme/somekey/...`. To check if any such duplicate exists, run hugo with the `-v` flag, e.g. `hugo -v`.
-
-## The Data Folder
-
-As explained in [Source Organization](/overview/source-directory/), the `data` folder is where you can store additional data for Hugo to use when generating your site. These files must be YAML, JSON or TOML files (using either the `.yml`, `.yaml`, `.json` or `toml` extension) and the data will be accessible as a `map` in `.Site.Data`.
-
-**The keys in this map will be a dot chained set of _path_, _filename_ and _key_ in file (if applicable).** 
-
-This is best explained with an example:
-
-## Example: Jaco Pastorius' Solo Discography
-
-[Jaco Pastorius](http://en.wikipedia.org/wiki/Jaco_Pastorius_discography) was a great bass player, but his solo discography is short enough to use as an example. [John Patitucci](http://en.wikipedia.org/wiki/John_Patitucci) is another bass giant.
-
-The example below is a bit constructed, but it illustrates the flexibility of Data Files. It uses TOML as file format.
-
-Given the files:
-
-* `data/jazz/bass/jacopastorius.toml`
-* `data/jazz/bass/johnpatitucci.toml`
-
-`jacopastorius.toml` contains the content below, `johnpatitucci.toml` contains a similar list:
-
-```
-discography = [
-"1974 – Modern American Music … Period! The Criteria Sessions",
-"1974 – Jaco",
-"1976 - Jaco Pastorius",
-"1981 - Word of Mouth",
-"1981 - The Birthday Concert (released in 1995)",
-"1982 - Twins I & II (released in 1999)",
-"1983 - Invitation",
-"1986 - Broadway Blues (released in 1998)",
-"1986 - Honestly Solo Live (released in 1990)",
-"1986 - Live In Italy (released in 1991)",
-"1986 - Heavy'n Jazz (released in 1992)",
-"1991 - Live In New York City, Volumes 1-7.",
-"1999 - Rare Collection (compilation)",
-"2003 - Punk Jazz: The Jaco Pastorius Anthology (compilation)",
-"2007 - The Essential Jaco Pastorius (compilation)" 
-]
-```
-
-The list of bass players can be accessed via `.Site.Data.jazz.bass`, a single bass player by adding the filename without the suffix, e.g. `.Site.Data.jazz.bass.jacopastorius`.
-
-You can now render the list of recordings for all the bass players in a template:
-
-```
-{{ range $.Site.Data.jazz.bass }}
-   {{ partial "artist.html" . }}
-{{ end }}
-```
-
-And then in `partial/artist.html`:
-
-```
-<ul>
-{{ range .discography }}
-  <li>{{ . }}</li>
-{{ end }}
-</ul>
-```
-
-Discover a new favourite bass player? Just add another TOML-file.

docs/content/extras/dynamiccontent.md

@@ -1,141 +0,0 @@
----
-aliases:
-- /doc/dynamiccontent/
-date: 2015-02-14
-menu:
-  main:
-    parent: extras
-next: /extras/highlighting
-prev: /extras/datafiles
-title: Dynamic Content
-weight: 91
-toc: true
----
-
-Dynamic content with a static site generator? Yes, it is possible!
-
-In addition to the [data files](/extras/datafiles/) feature, we have also
-implemented the feature "Dynamic Content", which lets you load
-any [JSON](http://www.json.org/) or
-[CSV](http://en.wikipedia.org/wiki/Comma-separated_values) file
-from nearly any resource.
-
-"Dynamic Content" currently consists of two functions, `getJSON`
-and `getCSV`, which are available in **all template files**.
-
-## Implementation details
-
-### Calling the functions with an URL
-
-In any HTML template or Markdown document, call the functions like this:
-
-	{{ $dataJ := getJSON "url" }}
-	{{ $dataC := getCSV "separator" "url" }}
-
-or, if you use a prefix or postfix for the URL, the functions
-accept [variadic arguments](http://en.wikipedia.org/wiki/Variadic_function):
-
-	{{ $dataJ := getJSON "url prefix" "arg1" "arg2" "arg n" }}
-	{{ $dataC := getCSV  "separator" "url prefix" "arg1" "arg2" "arg n" }}
-
-The separator for `getCSV` must be put in the first position and can only
-be one character long.
-
-All passed arguments will be joined to the final URL; for example:
-
-	{{ $urlPre := "https://api.github.com" }}
-	{{ $gistJ := getJSON $urlPre "/users/GITHUB_USERNAME/gists" }}
-
-will resolve internally to:
-
-	{{ $gistJ := getJSON "https://api.github.com/users/GITHUB_USERNAME/gists" }}
-
-Finally, you can range over an array. This example will output the
-first 5 gists for a GitHub user:
-
-	<ul>
-	  {{ $urlPre := "https://api.github.com" }}
-	  {{ $gistJ := getJSON $urlPre "/users/GITHUB_USERNAME/gists" }}
-	  {{ range first 5 $gistJ }}
-	    {{ if .public }}
-	      <li><a href="{{ .html_url }}" target="_blank">{{ .description }}</a></li>
-	    {{ end }}
-	  {{ end }}
-	</ul>
-
-
-### Example for CSV files
-
-For `getCSV`, the one-character long separator must be placed in the
-first position followed by the URL.
-
-	<table>
-	  <thead>
-	    <tr>
-		<th>Name</th>
-		<th>Position</th>
-		<th>Salary</th>
-	    </tr>
-	  </thead>
-	  <tbody>
-	  {{ $url := "http://a-big-corp.com/finance/employee-salaries.csv" }}
-	  {{ $sep := "," }}
-	  {{ range $i, $r := getCSV $sep $url }}
-	    <tr>
-	      <td>{{ index $r 0 }}</td>
-	      <td>{{ index $r 1 }}</td>
-	      <td>{{ index $r 2 }}</td>
-	    </tr>
-	  {{ end }}
-	  </tbody>
-	</table>
-
-The expression `{{index $r number}}` must be used to output the nth-column from
-the current row.
-
-### Caching of URLs
-
-Each downloaded URL will be cached in the default folder `$TMPDIR/hugo_cache/`.
-The variable `$TMPDIR` will be resolved to your system-dependent
-temporary directory.
-
-With the command-line flag `--cacheDir`, you can specify any folder on
-your system as a caching directory.
-
-If you don't like caching at all, you can fully disable to read from the
-cache with the command line flag `--ignoreCache`. However, Hugo will always
-write, on each build of the site, to the cache folder (silent backup).
-
-### Authentication when using REST URLs
-
-Currently, you can only use those authentication methods that can
-be put into an URL. [OAuth](http://en.wikipedia.org/wiki/OAuth) or
-other authentication methods are not implemented.
-
-### Loading local files
-
-To load local files with the two functions `getJSON` and `getCSV`, the
-source files must reside within Hugo's working directory. The file
-extension does not matter but the content.
-
-It applies the same output logic as in the topic: *Calling the functions with an URL*.
-
-## LiveReload
-
-There is no chance to trigger a [LiveReload](/extras/livereload/) when
-the content of an URL changes. However, when a local JSON/CSV file changes,
-then a LiveReload will be triggered of course. Symlinks not supported.
-
-**URLs and LiveReload**: If you change any local file and the LiveReload
-got triggered, Hugo will either read the URL content from the cache or, if
-you have disabled the cache, Hugo will re-download the content.
-This can create huge traffic and you may also reach API limits quickly.
-
-As downloading of content takes a while, Hugo stops with processing
-your Markdown files until the content has been downloaded.
-
-## Examples
-
-- Photo gallery JSON powered: [https://github.com/pcdummy/hugo-lightslider-example](https://github.com/pcdummy/hugo-lightslider-example)
-- GitHub Starred Repositories [in a posts](https://github.com/SchumacherFM/blog-cs/blob/master/content%2Fposts%2Fgithub-starred.md) with the related [short code](https://github.com/SchumacherFM/blog-cs/blob/master/layouts%2Fshortcodes%2FghStarred.html).
-- More?  Please tell us!

docs/content/extras/highlighting.md

@@ -1,180 +0,0 @@
----
-aliases:
-- /extras/highlight/
-date: 2013-07-01
-menu:
-  main:
-    parent: extras
-next: /extras/toc
-prev: /extras/shortcodes
-title: Syntax Highlighting
-weight: 90
-toc: true
----
-
-Hugo provides the ability for you to highlight source code in _two different ways_ — either pre-processed server side from your content, or to defer the processing to the client side, using a JavaScript library. 
-
-**The advantage of server side** is that it doesn’t depend on a JavaScript library and consequently works very well when read from an RSS feed. 
-
-**The advantage of client side** is that it doesn’t cost anything when building your site and some of the highlighting scripts available cover more languages than Pygments does.
-
-## Server-side
-
-For the pre-processed approach, highlighting is performed by an external Python-based program called [Pygments](http://pygments.org/) and is triggered via an embedded Hugo shortcode (see example below). If Pygments is absent from the path, it will silently simply pass the content along unhighlighted.
-
-### Pygments
-
-If you have never worked with Pygments before, here is a brief primer:
-
-+ Install Python from [python.org](https://www.python.org/downloads/). Version 2.7.x is already sufficient.
-+ Run `pip install Pygments` in order to install Pygments. Once installed, Pygments gives you a command `pygmentize`. Make sure it sits in your PATH, otherwise Hugo cannot find it.
-
-On Debian and Ubuntu systems, you may also install Pygments by running `sudo apt-get install python3-pygments`.
-
-Hugo gives you two options that you can set with the variable `pygmentsuseclasses` (default `false`) in `config.toml` (or `config.yaml`).
-
-1. Color-codes for highlighting keywords are directly inserted if `pygmentsuseclasses = false` (default). See in the example below. The color-codes depend on your choice of the `pygmentsstyle` (default `"monokai"`). You can explore the different color styles on [pygments.org](http://pygments.org/) after inserting some example code.
-2. If you choose `pygmentsuseclasses = true`, Hugo includes class names in your code instead of color-codes. For class-names to be meaningful, you need to include a `.css`-file in your website representing your color-scheme. You can either generate this `.css`-files according to this [description](http://pygments.org/docs/cmdline/) or download the standard ones from the [GitHub pygments-css repository](https://github.com/richleland/pygments-css).
-
-### Usage
-
-Highlighting is carried out via the in-built shortcode `highlight`. `highlight` takes exactly one required parameter of language, and requires a closing shortcode. Note that `highlight` is _not_ used for client-side javascript highlighting. 
-
-### Example
-
-```
-{{</* highlight html */>}}
-<section id="main">
-  <div>
-    <h1 id="title">{{ .Title }}</h1>
-    {{ range .Data.Pages }}
-      {{ .Render "summary"}}
-    {{ end }}
-  </div>
-</section>
-{{</* /highlight */>}}
-```
-
-### Example Output
-
-```
-<span style="color: #f92672">&lt;section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;main&quot;</span><span style="color: #f92672">&gt;</span>
-  <span style="color: #f92672">&lt;div&gt;</span>
-    <span style="color: #f92672">&lt;h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;title&quot;</span><span style="color: #f92672">&gt;</span>{{ .Title }}<span style="color: #f92672">&lt;/h1&gt;</span>
-    {{ range .Data.Pages }}
-      {{ .Render &quot;summary&quot;}}
-    {{ end }}
-  <span style="color: #f92672">&lt;/div&gt;</span>
-<span style="color: #f92672">&lt;/section&gt;</span>
-```
-
-### Options
-
-Options to control highlighting can be added as a quoted, comma separated key-value list as the second argument in the shortcode. The example below will highlight as language `go` with inline line numbers, with line number 2 and 3 highlighted.
-
-```
-{{</* highlight go "linenos=inline,hl_lines=2 3" */>}}
-var a string
-var b string
-var c string
-var d string
-{{</* / highlight */>}}
-```
-
-Supported keywords:  `style`, `encoding`, `noclasses`, `hl_lines`, `linenos`. Note that `style` and `noclasses` will override the similar setting in the global config.
-
-The keywords are the same you would using with Pygments from the command line, see the [Pygments doc](http://pygments.org/docs/) for more info.
-
-
-### Disclaimers
-
- * Pygments is relatively slow and _causes a performance hit when building your site_, but Hugo has been designed to cache the results to disk. 
- * Languages available depends on your Pygments installation.
-
-## Client-side
-
-Alternatively, code highlighting can be done in client-side JavaScript.
-
-Client-side syntax highlighting is very simple to add. You'll need to pick
-a library and a corresponding theme. Some popular libraries are:
-
-- [Highlight.js]
-- [Prism]
-- [Rainbow]
-- [Syntax Highlighter]
-- [Google Prettify]
-
-### Highlight.js example
-
-This example uses the popular [Highlight.js] library, hosted by [Yandex], a popular Russian search engine.
-
-In your `./layouts/partials/` (or `./layouts/chrome/`) folder, depending on your specific theme, there will be a snippet that will be included in every generated HTML page, such as `header.html` or `header.includes.html`. Simply add the css and js to initialize [Highlight.js]:
-
-~~~
-<link rel="stylesheet" href="https://yandex.st/highlightjs/8.0/styles/default.min.css">
-<script src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
-<script>hljs.initHighlightingOnLoad();</script>
-~~~
-
-### Prism example
-
-Prism is another popular highlighter library, used on some major sites. Similar to Highlight.js, you simply load `prism.css` in your `<head>` via whatever Hugo partial template is creating that part of your pages, like so: 
-
-```html
-...
-<link href="/css/prism.css" rel="stylesheet" />
-...
-```
-
-... and add `prism.js` near the bottom of your `<body>` tag, again in whatever Hugo partial template is appropriate for your site or theme. 
-
-```html
-...
-<script src="/js/prism.js"></script>
-...
-</body>
-```
-
-In this example, the local paths indicate that your own copy of these files are being added to the site, typically under `./static/`.
-
-### Using Client-side highlighting
-
-To use client-side highlighting, most of these javascript libraries expect your code to be wrapped in semantically correct `<code>` tags, with the language expressed in a class attribute on the `<code>` tag, such as `class="language-abc"`, where the `abc` is the code the highlighter script uses to represent that language. 
-
-The script would be looking for classes like `language-go`, `language-html`, or `language-css`. If you look at the page's source, it would be marked up like so: 
-
-~~~html
-<pre>
-<code class="language-css">
-body {
-  font-family: "Noto Sans", sans-serif;
-}
-</code>
-</pre>
-~~~
-
-The markup in your content pages (e.g. `my-css-tutorial.md`) needs to look like the following, with the name of the language to be highlighted entered directly after the first "fence", in a fenced code block:
-
-<pre><code class="language-css">&#126;&#126;&#126;css
-body {
-  font-family: "Noto Sans", sans-serif;
-}
-&#126;&#126;&#126;</code></pre>
-
-When passed through the highlighter script, it would yield something like this output when viewed on your rendered page:
-
-~~~css
-body {
-  font-family: "Noto Sans", sans-serif;
-}
-~~~
-
-Please see individual libraries' documentation for how to implement each of the JavaScript-based libraries.
-
-[Prism]: http://prismjs.com
-[Highlight.js]: http://highlightjs.org/
-[Rainbow]: http://craig.is/making/rainbows
-[Syntax Highlighter]: http://alexgorbatchev.com/SyntaxHighlighter/
-[Google Prettify]: https://code.google.com/p/google-code-prettify/
-[Yandex]: http://yandex.ru/
-

docs/content/extras/livereload.md

@@ -1,58 +0,0 @@
----
-date: 2014-05-26
-menu:
-  main:
-    parent: extras
-next: /extras/menus
-prev: /extras/crossreferences
-title: LiveReload
-weight: 50
----
-
-Hugo may not be the first static site generator to utilize LiveReload
-technology, but it’s the first to do it right.
-
-The combination of Hugo’s insane build speed and LiveReload make
-crafting your content pure joy. Virtually instantly after you hit save
-your rebuilt content will appear in your browser.
-
-## Using LiveReload
-
-Hugo comes with LiveReload built in. There are no additional packages to
-install. A common way to use Hugo while developing a site is to have
-Hugo run a server and watch for changes:
-
-    $ hugo server --watch
-
-This will run a full functioning web server while simultaneously
-watching your file system for additions, deletions or changes within
-your:
-
- * static files
- * content
- * data files
- * layouts
- * current theme
-
-Whenever anything changes Hugo will rebuild the site, continue to serve
-the content and as soon as the build is finished it will tell the
-browser and silently reload the page. Because most hugo builds are so
-fast they are barely noticeable, you merely need to glance at your open
-browser and you will see the change already there.
-
-This means that keeping the site open on a second monitor (or another
-half of your current monitor) allows you to see exactly what your
-content looks like without even leaving your text editor.
-
-## Disabling LiveReload
-
-LiveReload works by injecting JavaScript into the pages it
-creates that creates a web socket client to the hugo web socket server.
-
-Awesome for development, but not something you would want to do in
-production. Since many people use `hugo server --watch` in production to
-instantly display any updated content, we’ve made it easy to disable the
-LiveReload functionality.
-
-    $ hugo server --watch --disableLiveReload
-

docs/content/extras/menus.md

@@ -1,228 +0,0 @@
----
-date: 2014-05-14T02:36:37Z
-toc: true
-menu:
-  main:
-    parent: extras
-next: /extras/permalinks
-prev: /extras/livereload
-title: Menus
-weight: 60
----
-
-Hugo has a simple yet powerful menu system that permits content to be
-placed in menus with a good degree of control without a lot of work. 
-
-
-*TIP:* If all you want is a simple menu for your sections, see [Section Menu for "the Lazy Blogger"]({{< relref "#section-menu-for-the-lazy-blogger" >}}).
-
-Some of the features of Hugo Menus:
-
-* Place content in one or many menus
-* Handle nested menus with unlimited depth
-* Create menu entries without being attached to any content
-* Distinguish active element (and active branch)
-
-## What is a menu?
-
-A menu is a named array of menu entries accessible on the site under
-`.Site.Menus` by name. For example, if I have a menu called `main`, I would
-access it via `.Site.Menus.main`.
-
-A menu entry has the following properties:
-
-* **URL**        string
-* **Name**       string
-* **Menu**       string
-* **Identifier** string
-* **Pre**        template.HTML
-* **Post**       template.HTML
-* **Weight**     int
-* **Parent**     string
-* **Children**   Menu
-
-And the following functions:
-
-* **HasChildren** bool
-
-Additionally, there are some relevant functions available on the page:
-
-* **IsMenuCurrent** (menu string, menuEntry *MenuEntry ) bool
-* **HasMenuCurrent** (menu string, menuEntry *MenuEntry) bool
-
-
-## Adding content to menus
-
-Hugo supports a couple of different methods of adding a piece of content
-to the front matter.
-
-### Simple
-
-If all you need to do is add an entry to a menu, the simple form works
-well.
-
-**A single menu:**
-
-    ---
-    menu: "main"
-    ---
-
-**Multiple menus:**
-
-    ---
-    menu: ["main", "footer"]
-    ---
-
-
-### Advanced
-
-If more control is required, then the advanced approach gives you the
-control you want. All of the menu entry properties listed above are
-available.
-
-    ---
-    menu:
-      main:
-        parent: 'extras'
-        weight: 20
-    ---
-
-
-## Adding (non-content) entries to a menu
-
-You can also add entries to menus that aren’t attached to a piece of
-content. This takes place in the sitewide [config file](/overview/configuration/).
-
-Here’s an example `config.toml`:
-
-    [[menu.main]]
-        name = "about hugo"
-        pre = "<i class='fa fa-heart'></i>"
-        weight = -110
-        identifier = "about"
-        url = "/about/"
-    [[menu.main]]
-        name = "getting started"
-        pre = "<i class='fa fa-road'></i>"
-        weight = -100
-        url = "/getting-started/"
-
-And the equivalent example `config.yaml`:
-
-    ---
-    menu:
-      main:
-          - Name: "about hugo"
-            Pre: "<i class='fa fa-heart'></i>"
-            Weight: -110
-            Identifier: "about"
-            URL: "/about/"
-          - Name: "getting started"
-            Pre: "<i class='fa fa-road'></i>"
-            Weight: -100
-            URL: "/getting-started/"
-    ---            
-
-
-**NOTE:** The URLs must be relative to the context root. If the `BaseURL` is `http://example.com/mysite/`, then the URLs in the menu must not include the context root `mysite`.
-  
-## Nesting
-
-All nesting of content is done via the `parent` field.
-
-The parent of an entry should be the identifier of another entry.
-Identifier should be unique (within a menu).
-
-The following order is used to determine identity Identifier > Name >
-LinkTitle > Title. This means that the title will be used unless
-linktitle is present, etc. In practice Name and Identifier are never
-displayed and only used to structure relationships.
-
-In this example, the top level of the menu is defined in the config file
-and all content entries are attached to one of these entries via the
-`parent` field.
-
-## Rendering menus
-
-Hugo makes no assumptions about how your rendered HTML will be
-structured. Instead, it provides all of the functions you will need to be
-able to build your menu however you want. 
-
-
-The following is an example:
-
-    <!--sidebar start-->
-    <aside>
-        <div id="sidebar" class="nav-collapse">
-            <!-- sidebar menu start-->
-            <ul class="sidebar-menu">
-              {{ $currentNode := . }}
-              {{ range .Site.Menus.main }}
-                  {{ if .HasChildren }}
-
-                <li class="sub-menu{{if $currentNode.HasMenuCurrent "main" . }} active{{end}}">
-                <a href="javascript:;" class="">
-                    {{ .Pre }}
-                    <span>{{ .Name }}</span>
-                    <span class="menu-arrow arrow_carrot-right"></span>
-                </a>
-                <ul class="sub">
-                    {{ range .Children }}
-                    <li{{if $currentNode.IsMenuCurrent "main" . }} class="active"{{end}}><a href="{{.URL}}"> {{ .Name }} </a> </li>
-                    {{ end }}
-                </ul>
-              {{else}}
-                <li>
-                <a class="" href="{{.URL}}">
-                    {{ .Pre }}
-                    <span>{{ .Name }}</span>
-                </a>
-              {{end}}
-              </li>
-              {{end}}
-                <li> <a href="https://github.com/spf13/hugo/issues" target="blank">Questions and Issues</a> </li>
-                <li> <a href="#" target="blank">Edit this Page</a> </li>
-            </ul>
-            <!-- sidebar menu end-->
-        </div>
-    </aside>
-    <!--sidebar end-->
-
-
-## Section Menu for "the Lazy Blogger"
-
-To enable this menu, add this to your site config, i.e. `config.toml`:
-
-```
-SectionPagesMenu = "main"
-```
-
-The menu name can be anything, but take a note of what it is.
-
-This will create a menu with all the sections as menu items and all the sections' pages as "shadow-members". The _shadow_ implies that the pages isn't represented by a menu-item themselves, but this enables you to create a top-level menu like this:
-
-```
-  <nav class="sidebar-nav">
-        {{ $currentNode := . }}
-        {{ range .Site.Menus.main }}
-        <a class="sidebar-nav-item{{if or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .) }} active{{end}}" href="{{.URL}}">{{ .Name }}</a>
-        {{ end }}
-    </nav>
-
-```
-
-In the above, the menu item is marked as active if on the current section's list page or on a page in that section.
-
-The above is all that's needed. But if you want custom menu items, e.g. changing weight or name, you can define them manually in the site config, i.e. `config.toml`: 
-
-```
- [[menu.main]]
-        name = "This is the blog section"
-        weight = -110
-        identifier = "blog"
-        url = "/blog/"
-
-```
-
-**Note** that the `identifier` must match the section name.
-

docs/content/extras/pagination.md

@@ -1,101 +0,0 @@
----
-aliases:
-- /doc/pagination/
-date: 2014-01-01
-menu:
-  main:
-    parent: extras
-next: /extras/scratch
-prev: /extras/shortcodes
-title: Pagination
-weight: 80
----
-
-Hugo supports pagination for the home page, sections and taxonomies. It's built to be easy use, but with loads of flexibility when needed. The real power shines when you combine it with [`where`](/templates/functions/), with its SQL-like operators, `first` and others --- you can even [order the content](/templates/list/) the way you've become used to with Hugo.
-
-## Configuration
-
-Pagination can be configured in the site configuration (e.g. `config.toml`):
-
-* `Paginate` (default `10`) (this setting can be overridden in the template)
-* `PaginatePath` (default `page`)
-
-Setting `Paginate` to a positive value will split the list pages for the home page, sections and taxonomies into chunks of that size. But note that the generation of the pagination pages for sections, taxonomies and home page is *lazy* --- the pages will not be created if not referenced by a `.Paginator` (see below).
-
-`PaginatePath` is used to adapt the `URL` to the pages in the paginator (the default setting will produce URLs on the form `/page/1/`.
-
-## List the pages
-
-**A `.Paginator` is provided to help building a pager menu. This is only relevant for the templates for the home page and the list pages (sections and taxonomies).**
-
-There are two ways to configure and use a `.Paginator`:
-
-1. The simplest way is just to call `.Paginator.Pages` from a template. It will contain the pages for *that page* .
-2. Select a sub-set of the pages with the available template functions and ordering options, and pass the slice to `.Paginate`, e.g. `{{ range (.Paginate ( first 50 .Data.Pages.ByTitle )).Pages }}`.
-
-For a given **Node**, it's one of the options above. The `.Paginator` is static and cannot change once created.
-
-
-The global page size setting (`Paginate`) can be overridden by providing a positive integer as the last argument. The examples below will give five items per page:
-
-* `{{ range (.Paginator 5).Pages }}`
-* `{{ $paginator := .Paginate (where .Data.Pages "Type" "post") 5 }}`
-
-## Build the navigation
-
-The `.Paginator` contains enough information to build a paginator interface.
-
-The easiest way to add this to your pages is to include the built-in template (with `Bootstrap`-compatible styles):
-
-```
-{{ template "_internal/pagination.html" . }}
-```
-
-**Note:** If you use any filters or ordering functions to create your `.Paginator` **and** you want the navigation buttons to be shown before the page listing, you must create the `.Paginator` before it's used:
-
-```
-{{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
-{{ template "_internal/pagination.html" . }}
-{{ range $paginator.Pages }}
-   {{ .Title }}
-{{ end }}
-```
-
-Without the where-filter, the above is simpler:
-
-```
-{{ template "_internal/pagination.html" . }}
-{{ range .Paginator.Pages }}
-   {{ .Title }}
-{{ end }}
-```
-
-If you want to build custom navigation, you can do so using the `.Paginator` object:
-
-* `PageNumber`: The current page's number in the pager sequence
-* `URL`: The relative URL to the current pager
-* `Pages`: The pages in the current pager
-* `NumberOfElements`: The number of elements on this page
-* `HasPrev`: Whether there are page(s) before the current
-* `Prev`: The pager for the previous page
-* `HasNext`: Whether there are page(s) after the current
-* `Next`: The pager for the next page
-* `First`: The pager for the first page
-* `Last`: The pager for the last page
-* `Pagers`: A list of pagers that can be used to build a pagination menu
-* `PageSize`: Size of each pager
-* `TotalPages`: The number of pages in the paginator
-* `TotalNumberOfElements`: The number of elements on all pages in this paginator
-
-## Additional information
-
-The pages are built on the following form (`BLANK` means no value):
-
-```
-[SECTION/TAXONOMY/BLANK]/index.html
-[SECTION/TAXONOMY/BLANK]/page/1/index.html => redirect to  [SECTION/TAXONOMY/BLANK]/index.html
-[SECTION/TAXONOMY/BLANK]/page/2/index.html
-....
-```
-
-

docs/content/extras/permalinks.md

@@ -1,53 +0,0 @@
----
-aliases:
-- /doc/permalinks/
-date: 2013-11-18
-menu:
-  main:
-    parent: extras
-next: /extras/shortcodes
-notoc: true
-prev: /extras/menus
-title: Permalinks
-weight: 70
----
-
-By default, content is laid out into the target `publishdir` (public)
-namespace matching its layout within the `contentdir` hierarchy.
-The `permalinks` site configuration option allows you to adjust this on a
-per-section basis.
-This will change where the files are written to and will change the page's
-internal "canonical" location, such that template references to
-`.RelPermalink` will honour the adjustments made as a result of the mappings
-in this option.
-
-For instance, if one of your sections is called `post`, and you want to adjust
-the canonical path to be hierarchical based on the year and month, then you
-might use:
-
-```yaml
-permalinks:
-  post: /:year/:month/:title/
-```
-
-Only the content under `post/` will be so rewritten.
-A file named `content/post/sample-entry` which contains a line
-`date: 2013-11-18T19:20:00-05:00` might end up with the rendered page
-appearing at `public/2013/11/sample-entry/index.html` and be reachable via
-the URL <http://yoursite.example.com/2013/11/sample-entry/>.
-
-The following is a list of values that can be used in a permalink definition.
-All references to time are dependent on the content's date.
-
-  * **:year** the 4-digit year
-  * **:month** the 2-digit month
-  * **:monthname** the name of the month
-  * **:day** the 2-digit day
-  * **:weekday** the 1-digit day of the week (Sunday = 0)
-  * **:weekdayname** the name of the day of the week
-  * **:yearday** the 1- to 3-digit day of the year
-  * **:section** the content's section
-  * **:title** the content's title
-  * **:slug** the content's slug (or title if no slug)
-  * **:filename** the content's filename (without extension)
-

docs/content/extras/scratch.md

@@ -1,44 +0,0 @@
----
-aliases:
-- /doc/scratch/
-date: 2015-01-22
-menu:
-  main:
-    parent: extras
-next: /extras/datafiles
-prev: /extras/pagination
-title: Scratch
-weight: 80
----
-
-`Scratch` -- a "scratchpad" for your node- or page-scoped variables. In most cases you can do well without `Scratch`, but there are some use cases that aren't solvable with Go's templates without `Scratch`'s help, due to scoping issues.
-
-
-`Scratch` is added to both `Node` and `Page` -- with the three methods `Set`, `Get` and `Add`. `Set` and `Add` takes a `key` and the `value` to add. Get returns the `value` for the `key` given.
-
-`Set` can store values of any type. `Add` accepts values that support Go's `+` operator.
-
-The scope of the backing data is global for the given `Node` or `Page`, and spans partial and shortcode includes.
-
-## Sample usage
-
-The usage is best illustrated with some samples:
-
-```
-{{ $.Scratch.Add "a1" 12 }}
-{{ $.Scratch.Get "a1" }} {{/* => 12 */}}
-{{ $.Scratch.Add "a1" 1 }}
-{{ $.Scratch.Get "a1" }} // {{/* => 13 */}}
-
-{{ $.Scratch.Add "a2" "AB" }}
-{{ $.Scratch.Get "a2" }} {{/* => AB */}}
-{{ $.Scratch.Add "a2" "CD" }}
-{{ $.Scratch.Get "a2" }} {{/* => ABCD */}}
-
-{{ $.Scratch.Set "v1" 123 }}
-{{ $.Scratch.Get "v1" }}  {{/* => 123 */}}
-```
-
-**Note:** The examples above uses the special `$` variable, which refers to the top-level node. This is the behavior you most likely want, and will help remove some confusion when using `Scratch` inside page range loops -- and you start inadvertently calling the wrong `Scratch`. But there may be use cases for `{{ .Scratch.Add "key" "some value" }}`.
-
-

docs/content/extras/shortcodes.md

@@ -1,283 +0,0 @@
----
-aliases:
-- /doc/shortcodes/
-date: 2013-07-01
-menu:
-  main:
-    parent: extras
-next: /extras/pagination
-prev: /extras/permalinks
-title: Shortcodes
-weight: 80
-toc: true
----
-
-Hugo uses Markdown for its simple content format. However, there are a lot
-of things that Markdown doesn’t support well.
-
-We are unwilling to accept being constrained by our simple format. Also
-unacceptable is writing raw HTML in our Markdown every time we want to include
-unsupported content such as a video. To do so is in complete opposition to the
-intent of using a bare bones format for our content and utilizing templates to
-apply styling for display.
-
-To avoid both of these limitations, Hugo created shortcodes.
-
-A shortcode is a simple snippet inside a content file that Hugo will render
-using a predefined template. Note that shortcodes will not work in template
-files---if you need a functionality like that in a template, you most likely
-want a [partial template](/templates/partials/) instead.
-
-## Using a shortcode
-
-In your content files, a shortcode can be called by using '`{{%/* name parameters
-*/%}}`' respectively. Shortcodes are space delimited (parameters with spaces
-can be quoted).
-
-The first word is always the name of the shortcode. Parameters follow the name.
-The format for named parameters models that of HTML with the format
-`name="value"`.
-
-Some shortcodes use or require closing shortcodes. Like HTML, the opening and closing
-shortcodes match (name only), the closing being prepended with a slash.
-
-Example of a paired shortcode:
-
-    {{</* highlight go */>}} A bunch of code here {{</* /highlight */>}}
-
-The examples above use two different delimiters, the difference being the `%` and the `<` character:
-
-### Shortcodes with Markdown
-
-The `%` characters indicates that the shortcode's inner content needs further processing by the page's rendering processor (i.e. Markdown), needed to get the **bold** text in the example below:
-
- ```
-{{%/* myshortcode */%}}Hello **World!**{{%/* /myshortcode */%}}
-```
-
-### Shortcodes without Markdown
-
-The `<` character indicates that the shortcode's inner content doesn't need any further rendering, this will typically be pure HTML:
-
- ```
-{{</* myshortcode */>}}<p>Hello <strong>World!</strong></p>{{</* /myshortcode */>}}
-```
-
-## Hugo Shortcodes
-
-Hugo ships with a set of predefined shortcodes.
-
-### highlight
-
-This shortcode will convert the source code provided into syntax highlighted
-HTML. Read more on [highlighting](/extras/highlighting/).
-
-#### Usage
-`highlight` takes exactly one required parameter of _language_ and requires a
-closing shortcode.
-
-#### Example
-
-    {{</* highlight html */>}}
-    <section id="main">
-      <div>
-       <h1 id="title">{{ .Title }}</h1>
-        {{ range .Data.Pages }}
-            {{ .Render "summary"}}
-        {{ end }}
-      </div>
-    </section>
-    {{</* /highlight */>}}
-
-
-#### Example Output
-
-    <span style="color: #f92672">&lt;section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;main&quot;</span><span style="color: #f92672">&gt;</span>
-      <span style="color: #f92672">&lt;div&gt;</span>
-       <span style="color: #f92672">&lt;h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;title&quot;</span><span style="color: #f92672">&gt;</span>{{ .Title }}<span style="color: #f92672">&lt;/h1&gt;</span>
-        {{ range .Data.Pages }}
-            {{ .Render &quot;summary&quot;}}
-        {{ end }}
-      <span style="color: #f92672">&lt;/div&gt;</span>
-    <span style="color: #f92672">&lt;/section&gt;</span>
-
-### figure
-`figure` is simply an extension of the image capabilities present with Markdown.
-`figure` provides the ability to add captions, CSS classes, alt text, links etc.
-
-#### Usage
-
-`figure` can use the following parameters:
-
- * src
- * link
- * title
- * caption
- * class
- * attr (attribution)
- * attrlink
- * alt
-
-#### Example
-
-    {{</* figure src="/media/spf13.jpg" title="Steve Francia" */>}}
-
-#### Example output
-
-    <figure>
-        <img src="/media/spf13.jpg"  />
-        <figcaption>
-            <h4>Steve Francia</h4>
-        </figcaption>
-    </figure>
-
-### ref, relref
-
-These shortcodes will look up the pages by their relative path (e.g.,
-`blog/post.md`) or their logical name (`post.md`) and return the permalink
-(`ref`) or relative permalink (`relref`) for the found page.
-
-`ref` and `relref` also make it possible to make fragmentary links that work
-for the header links generated by Hugo.
-
-Read more on [cross-references]({{% ref "extras/crossreferences.md" %}}).
-
-#### Usage
-
-`ref` and `relref` take exactly one required parameter of _reference_.
-
-#### Example
-
-    [Neat]({{</* ref "blog/neat.md" */>}})
-    [Who]({{</* relref "about.md#who" */>}})
-
-#### Example Output
-
-Assuming that standard Hugo pretty URLs are turned on.
-
-    <a href="/blog/neat">Neat</a>
-    <a href="/about/#who:c28654c202e73453784cfd2c5ab356c0">Who</a>
-
-## Creating your own shortcodes
-
-To create a shortcode, place a template in the layouts/shortcodes directory. The
-template name will be the name of the shortcode.
-
-In creating a shortcode, you can choose if the shortcode will use _positional
-parameters_ or _named parameters_ (but not both). A good rule of thumb is that if a
-shortcode has a single required value in the case of the `youtube` example below,
-then positional works very well. For more complex layouts with optional
-parameters, named parameters work best.
-
-**Inside the template**
-
-To access a parameter by position, the `.Get` method can be used:
-
-    {{ .Get 0 }}
-
-To access a parameter by name, the `.Get` method should be utilized:
-
-    {{ .Get "class" }}
-
-`with` is great when the output depends on a parameter being set:
-
-    {{ with .Get "class"}} class="{{.}}"{{ end }}
-
-`.Get` can also be used to check if a parameter has been provided. This is
-most helpful when the condition depends on either one value or another...
-or both:
-
-    {{ or .Get "title" | .Get "alt" | if }} alt="{{ with .Get "alt"}}{{.}}{{else}}{{.Get "title"}}{{end}}"{{ end }}
-
-If a closing shortcode is used, the variable `.Inner` will be populated with all
-of the content between the opening and closing shortcodes. If a closing
-shortcode is required, you can check the length of `.Inner` and provide a warning
-to the user.
-
-A shortcode with `.Inner` content can be used wihout the inline content, and without the closing shortcode, by using the self-closing syntax:
-
-    {{</* innershortcode /*/>}}
-
-The variable `.Params` contains the list of parameters in case you need to do more complicated things than `.Get`.
-
-You can also use the variable `.Page` to access all the normal [Page Variables](/templates/variables/). 
-
-## Single Positional Example: youtube
-
-    {{</* youtube 09jf3ow9jfw */>}}
-
-Would load the template /layouts/shortcodes/youtube.html
-
-    <div class="embed video-player">
-    <iframe class="youtube-player" type="text/html" width="640" height="385" src="http://www.youtube.com/embed/{{ index .Params 0 }}" allowfullscreen frameborder="0">
-    </iframe>
-    </div>
-
-This would be rendered as:
-
-    <div class="embed video-player">
-    <iframe class="youtube-player" type="text/html"
-        width="640" height="385"
-        src="http://www.youtube.com/embed/09jf3ow9jfw"
-        allowfullscreen frameborder="0">
-    </iframe>
-    </div>
-
-## Single Named Example: image with caption
-
-    {{</* img src="/media/spf13.jpg" title="Steve Francia" */>}}
-
-Would load the template /layouts/shortcodes/img.html
-
-    <!-- image -->
-    <figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
-        {{ with .Get "link"}}<a href="{{.}}">{{ end }}
-            <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }} />
-        {{ if .Get "link"}}</a>{{ end }}
-        {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
-        <figcaption>{{ if isset .Params "title" }}
-            <h4>{{ .Get "title" }}</h4>{{ end }}
-            {{ if or (.Get "caption") (.Get "attr")}}<p>
-            {{ .Get "caption" }}
-            {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
-                {{ .Get "attr" }}
-            {{ if .Get "attrlink"}}</a> {{ end }}
-            </p> {{ end }}
-        </figcaption>
-        {{ end }}
-    </figure>
-    <!-- image -->
-
-Would be rendered as:
-
-    <figure >
-        <img src="/media/spf13.jpg"  />
-        <figcaption>
-            <h4>Steve Francia</h4>
-        </figcaption>
-    </figure>
-
-## Paired Example: Highlight
-*Hugo already ships with the `highlight` shortcode*
-
-    {{</* highlight html */>}}
-    <html>
-        <body> This HTML </body>
-    </html>
-    {{</* /highlight */>}}
-
-The template for this utilizes the following code (already include in Hugo)
-
-    {{ .Get 0 | highlight .Inner  }}
-
-And will be rendered as:
-
-    <div class="highlight" style="background: #272822"><pre style="line-height: 125%"><span style="color: #f92672">&lt;html&gt;</span>
-        <span style="color: #f92672">&lt;body&gt;</span> This HTML <span style="color: #f92672">&lt;/body&gt;</span>
-    <span style="color: #f92672">&lt;/html&gt;</span>
-    </pre></div>
-
-Please notice that this template makes use of a Hugo-specific template function
-called `highlight` which uses Pygments to add the highlighting code.
-
-More shortcode examples can be found at [spf13.com](https://github.com/spf13/spf13.com/tree/master/layouts/shortcodes).

docs/content/extras/toc.md

@@ -1,37 +0,0 @@
----
-date: 2013-07-09
-menu:
-  main:
-    parent: extras
-next: /extras/urls
-prev: /extras/highlighting
-title: Table of Contents
-weight: 100
----
-
-Hugo will automatically parse the Markdown for your content and create
-a Table of Contents you can use to guide readers to the sections within
-your content.
-
-## Usage
-
-Simply create content like you normally would with the appropriate
-headers.
-
-Hugo will take this Markdown and create a table of contents stored in the
-[content variable](/layout/variables/) `.TableOfContents`
-
-
-## Template Example
-
-This is example code of a [single.html template](/layout/content/).
-
-    {{ partial "header.html" . }}
-        <div id="toc" class="well col-md-4 col-sm-6">
-        {{ .TableOfContents }}
-        </div>
-        <h1>{{ .Title }}</h1>
-        {{ .Content }}
-    {{ partial "footer.html" . }}
-
-

docs/content/extras/urls.md

@@ -1,62 +0,0 @@
----
-aliases:
-- /doc/urls/
-date: 2014-01-03
-menu:
-  main:
-    parent: extras
-next: /community/mailing-list
-notoc: true
-prev: /extras/toc
-title: URLs
-weight: 110
----
-
-## Pretty URLs
-
-By default, Hugo create content with 'pretty' URLs. For example,
-content created at `/content/extras/urls.md` will be rendered at
-`/public/extras/urls/index.html`, thus accessible from the browser
-at http://example.com/extras/urls/.  No non-standard server-side
-configuration is required for these pretty URLs to work.
-
-If you would like to have what we call "ugly URLs",
-e.g. http://example.com/extras/urls.html, you are in luck.
-Hugo supports the ability to create your entire site with ugly URLs.
-Simply add `uglyurls = true` to your site-wide `config.toml`,
-or use the `--uglyUrls=true` flag on the command line.
-
-If you want a specific piece of content to have an exact URL, you can
-specify this in the front matter under the `url` key. See [Content
-Organization](/content/organization/) for more details. 
-
-## Canonicalization
-
-By default, all relative URLs encountered in the input are left unmodified,
-e.g. `/css/foo.css` would stay as `/css/foo.css`,
-i.e. `canonifyurls` defaults to `false`.
-
-By setting `canonifyurls` to `true`, all relative URLs would instead
-be *canonicalized* using `baseurl`.  For example, assuming you have
-`baseurl = http://yoursite.example.com/` defined in the site-wide
-`config.toml`, the relative URL `/css/foo.css` would be turned into
-the absolute URL `http://yoursite.example.com/css/foo.css`.
-
-Benefits of canonicalization include fixing all URLs to be absolute, which may
-aid with some parsing tasks.  Note though that all real browsers handle this
-client-side without issues.
-
-Benefits of non-canonicalization include being able to have resource inclusion
-be scheme-relative, so that http vs https can be decided based on how this
-page was retrieved.
-
-> Note: In the May 2014 release of Hugo v0.11, the default value of `canonifyurls` was switched from `true` to `false`, which we think is the better default and should continue to be the case going forward. So, please verify and adjust your website accordingly if you are upgrading from v0.10 or older versions.
-
-To find out the current value of `canonifyurls` for your website, you may use the handy `hugo config` command added in v0.13:
-
-    hugo config | grep -i canon
-
-Or, if you are on Windows and do not have `grep` installed:
-
-    hugo config | FINDSTR /I canon
-

docs/content/meta/license.md

@@ -1,80 +0,0 @@
----
-aliases:
-- /doc/license/
-- /license/
-- /meta/license/
-date: 2013-07-01
-menu:
-  main:
-    parent: about
-title: License
-weight: 50
----
-
-Hugo is released under the Simple Public License.
-
-> *Note: There is a plan to switch to [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0), for future Hugo releases.  This change would only apply forward.  Existing versions of Hugo will remain released under the SimPL-2.0 license.  For more information, see [the "Switching to Apache 2 license" thread in the public forum](http://discuss.gohugo.io/t/switching-to-apache-2-license/173).*
-
-## Simple Public License (SimPL-2.0)
-
-### Preamble
-
-This Simple Public License 2.0 (SimPL-2.0 for short) is a plain language
-implementation of GPL 2.0.  The words are different, but the goal is the
-same - to guarantee for all users the freedom to share and change
-software.  If anyone wonders about the meaning of the SimPL, they should
-interpret it as consistent with GPL 2.0.
-
-
-## Simple Public License (SimPL) 2.0
-
-The SimPL applies to the software's source and object code and comes
-with any rights that I have in it (other than trademarks). You agree to
-the SimPL by copying, distributing, or making a derivative work of the
-software.
-
- You get the royalty free right to:
-
--   Use the software for any purpose;
--   Make derivative works of it (this is called a "Derived Work");
--   Copy and distribute it and any Derived Work.
-
-If you distribute the software or a Derived Work, you must give back to
-the community by:
-
--   Prominently noting the date of any changes you make;
--   Leaving other people's copyright notices, warranty disclaimers, and
-    license terms in place;
--   Providing the source code, build scripts, installation scripts, and
-    interface definitions in a form that is easy to get and best to
-    modify;
--   Licensing it to everyone under SimPL, or substantially similar terms
-    (such as GPL 2.0), without adding further restrictions to the rights
-    provided;
--   Conspicuously announcing that it is available under that license.
-
-There are some things that you must shoulder:
-
--   You get NO WARRANTIES. None of any kind;
--   If the software damages you in any way, you may only recover direct
-    damages up to the amount you paid for it (that is zero if you did
-    not pay anything). You may not recover any other damages, including
-    those called "consequential damages." (The state or country where
-    you live may not allow you to limit your liability in this way, so
-    this may not apply to you);
-
-The SimPL continues perpetually, except that your license rights end
-automatically if:
-
--   You do not abide by the "give back to the community" terms (your
-    licensees get to keep their rights if they abide);
--   Anyone prevents you from distributing the software under the terms
-    of the SimPL.
-
-## License for the License
-
-You may do anything that you want with the SimPL text; it's a license
-form to use in any way that you find helpful.  To avoid confusion,
-however, if you change the terms in any way then you may not call your
-license the Simple Public License or the SimPL (but feel free to
-acknowledge that your license is "based on the Simple Public License").

docs/content/meta/release-notes.md

@@ -1,328 +0,0 @@
----
-aliases:
-- /doc/release-notes/
-- /meta/release-notes/
-date: 2013-07-01
-menu:
-  main:
-    parent: about
-title: Release Notes
-weight: 10
----
-
-## **0.14.0** May 25, 2015
-
-The v0.14.0 Hugo release brings of the most demanded features to Hugo. The
-foundation of Hugo is stabilizing nicely and a lot of polish has been added.
-We’ve expanded support for additional content types with support for AsciiDoc,
-Restructured Text, HTML and Markdown. Some of these types depend on external
-libraries as there does not currently exist native support in Go. We’ve tried
-to make the experience as seamless as possible. Look for more improvements here
-in upcoming releases.
-
-A lot of work has been done to improve the user experience, with extra polish
-to the Windows experience. Hugo errors are more helpful overall and Hugo now
-can detect if it’s being run in Windows Explorer and provide additional
-instructions to run it via the command prompt.
-
-The Hugo community continues to grow. Hugo has over 4000 stars on github, 165
-contributors, 35 themes and 1000s of happy users. It is now the 5th most
-popular static site generator (by Stars) and has the 3rd largest contributor
-community.
-
-This release represents over **240 contributions by 36 contributors** to the main
-Hugo codebase.
-
-Big shout out to [@bep](https://github.com/bep) who led the development of Hugo
-this release, [@anthonyfok](https://github.com/anthonyfok),
-[@eparis](https://github.com/eparis),
-[@SchumacherFM](https://github.com/SchumacherFM),
-[@RickCogley](https://github.com/RickCogley) &
-[@mdhender](https://github.com/mdhender) for their significant contributions
-and [@tatsushid](https://github.com/tatsushid) for his continuous improvements
-to the templates. Also a big thanks to all the theme creators. 11 new themes
-have been added since last release and the [hugoThemes repo now has previews of
-all of
-them](https://github.com/spf13/hugoThemes/blob/master/README.md#theme-list).
-
-Hugo also depends on a lot of other great projects. A big thanks to all of our dependencies inclding:
-[cobra](https://github.com/spf13/cobra),
-[viper](https://github.com/spf13/viper), 
-[blackfriday](https://github.com/russross/blackfriday),
-[pflag](https://github.com/spf13/pflag),
-[HugoThemes](https://github.com/spf13/hugothemes),
-[BurntSushi](github.com/BurntSushi/toml),
-[goYaml](https://github.com/go-yaml/yaml/tree/v2), and the Go standard library.
-
-## New features
-* Support for all file types in content directory. 
-    * If dedicated file type handler isn’t found it will be copied to the destination.
-* Add `AsciiDoc` support using external helpers.
-* Add experimental support for [`Mmark`](https://github.com/miekg/mmark) markdown processor 
-* Bash autocomplete support via `genautocomplete` command
-* Add section menu support for a [Section Menu for "the Lazy Blogger"]({{< relref "extras/menus.md#section-menu-for-the-lazy-blogger" >}})
-* Add support for `Ace` base templates
-* Adding `RelativeURLs = true` to site config will now make all the relative URLs relative to the content root.
-* New template functions:
-  * `getenv`
-  * The string functions `substr` and `slicestr`
-  *`seq`, a sequence generator very similar to its Gnu countepart
-  * `absURL` and `relURL`, both of which takes the `BaseURL` setting into account
-
-## Improvements
-* Highlighting with `Pygments` is now cached to disk -- expect a major speed boost if you use it! 
-* More Pygments highlighting options, including `line numbers`
-* Show help information to Windows users who try to double click on `hugo.exe`.
-* Add `bind` flag to `hugo server` to set the interface to which the server will bind
-* Add support for `canonifyurls` in `srcset`
-* Add shortcode support for HTML (content) files
-* Allow the same `shortcode` to  be used with or without inline content
-* Configurable RSS output filename
-
-## Bugfixes
-* Fix panic with paginator and zero pages in result set.
-* Fix crossrefs on Windows.
-* Fix `eq` and `ne` template functions when used with a raw number combined with the result of `add`, `sub` etc. 
-* Fix paginator with uglyurls
-* Fix [#998](https://github.com/spf13/hugo/issues/988), supporting UTF8 characters in Permalinks.
-
-## Notices
-* To get variable and function names in line with the rest of the Go community,
-  a set of variable and function names has been deprecated: These will still
-  work in 0.14, but will be removed in 0.15. What to do should be obvious by
-  the build log; `getJson` to `getJSON`, `getCsv` to `getCSV`, `safeHtml` to
-  `safeHTML`, `safeCss` to `safeCSS`, `safeUrl` to `safeURL`, `Url` to `URL`,
-  `UrlPath` to `URLPath`, `BaseUrl` to `BaseURL`, `Recent` to `Pages`,
-  `Indexes` to `Taxonomies`.
-
-## **0.13.0** Feb 21, 2015
-
-The v0.13.0 release is the largest Hugo release to date. The release introduced
-some long sought after features (pagination, sequencing, data loading, tons of
-template improvements) as well as major internal improvements. In addition to
-the code changes, the Hugo community has grown significantly and now has over
-3000 stars on github, 134 contributors, 24 themes and 1000s of happy users.
-
-This release represents **448 contributions by 65 contributors**
-
-A special shout out to [@bep](https://github.com/bep) and
-[@anthonyfok](https://github.com/anthonyfok) for their new role as Hugo
-maintainers and their tremendous contributions this release.
-
-### New major features
-* Support for [data files](/extras/datafiles/) in [YAML](http://yaml.org/),
-  [JSON](http://www.json.org/), or [TOML](https://github.com/toml-lang/toml)
-  located in the `data` directory ([#885][])
-* Support for [dynamic content](/extras/dynamiccontent/) by loading JSON & CSV
-  from remote sources via GetJson and GetCsv in short codes or other layout
-  files ([#748][])
-* [Pagination support](/extras/pagination/) for home page, sections and
-  taxonomies ([#750][])
-* Universal sequencing support
-    * A new, generic Next/Prev functionality is added to all lists of pages
-      (sections, taxonomies, etc.)
-    * Add in-section [Next/Prev](/templates/variables/) content pointers
-* `Scratch` -- [a "scratchpad"](/extras/scratch) for your node- and page-scoped
-  variables
-* [Cross Reference](/extras/crossreferences/) support to easily link documents
-  together with the ref and relref shortcodes. 
-* [Ace](http://ace.yoss.si/) template engine support ([#541][])
-* A new [shortcode](/extras/shortcodes/) token of `{{</* */>}}` (raw HTML)
-  alongside the existing `{{%/* */%}}` (Markdown)
-* A top level `Hugo` variable (on Page & Node) is added with various build
-  information
-* Several new ways to order and group content:
-    * `ByPublishDate`
-    * `GroupByPublishDate(format, order)`
-    * `GroupByParam(key, order)`
-    * `GroupByParamDate(key, format, order)`
-* Hugo has undergone a major refactoring, with a new handler system and a
-  generic file system. This sounds and is technical, but will pave the way for
-  new features and make Hugo even speedier
-
-### Notable enhancements to existing features
-
-* The [shortcode](/extras/shortcodes/) handling is rewritten for speed and
-  better error messages. 
-* Several improvements to the [template functions](/templates/functions/):
-    * `where` is now even more powerful and accepts SQL-like syntax with the
-      operators `==`, `eq`; `!=`, `<>`, `ne`; `>=`, `ge`; `>`, `gt`; `<=`,
-      `le`; `<`, `lt`; `in`, `not in`
-    * `where` template function now also accepts dot chaining key argument
-      (e.g. `"Params.foo.bar"`)
-* New template functions:
-    * `apply`
-    * `chomp`
-    * `delimit`
-    * `sort`
-    * `markdownify`
-    * `in` and `intersect` 
-    * `trim`
-    * `replace`
-    * `dateFormat`
-* Several [configurable improvements related to Markdown
-  rendering](/overview/configuration/#configure-blackfriday-rendering:a66b35d20295cb764719ac8bd35837ec):
-    * Configuration of footnote rendering
-    * Optional support for smart angled quotes, e.g. `"Hugo"` → «Hugo»
-    * Enable descriptive header IDs
-* URLs in XML output is now correctly canonified ([#725][], [#728][], and part
-  of [#789][])
-
-### Other improvements
-
-* Internal change to use byte buffer pool significantly lowering memory usage
-  and providing measurable performance improvements overall
-* Changes to docs:
-    * A new [Troubleshooting](/troubleshooting/overview/) section is added
-    * It's now searchable through Google Custom Search ([#753][])
-    * Some new great tutorials:
-        * [Automated deployments with
-          Wercker](/tutorials/automated-deployments/)
-        * [Creating a new theme](/tutorials/creating-a-new-theme/)
-* [`hugo new`](/content/archetypes/) now copies the content in addition to the front matter
-* Improved unit test coverage
-* Fixed a lot of Windows-related path issues
-* Improved error messages for template and rendering errors
-* Enabled soft LiveReload of CSS and images ([#490][])
-* Various fixes in RSS feed generation ([#789][])
-* `HasMenuCurrent` and `IsMenuCurrent` is now supported on Nodes
-* A bunch of [bug fixes](https://github.com/spf13/hugo/commits/master)
-
-[#490]: https://github.com/spf13/hugo/pull/490 "Pull Request #490: Livereload CSS and images without browser refresh"
-[#541]: https://github.com/spf13/hugo/pull/541 "Pull Request #541: Add Ace template engine support"
-[#725]: https://github.com/spf13/hugo/issues/725 "Issue #725: CanonifyUrls does not canonicalize urls in RSS"
-[#728]: https://github.com/spf13/hugo/issues/728 "Pull Request #728: Add ability to canonify URLs in rendered XML output."
-[#748]: https://github.com/spf13/hugo/issues/748 "Feature: GetJson and GetJson in short codes or other layout files"
-[#750]: https://github.com/spf13/hugo/issues/750 "Pull Request: Add pagination support for home page, sections and taxonomies"
-[#753]: https://github.com/spf13/hugo/issues/753 "Add search to documentation"
-[#789]: https://github.com/spf13/hugo/issues/789 "Issue #789: RSS feeds do not validate"
-[#885]: https://github.com/spf13/hugo/issues/885 "Feature/datadir"
-
-
-## **0.12.0** Sept 1, 2014
-
-A lot has happened since Hugo v0.11.0 was released. Most of the work has been
-focused on polishing the theme engine and adding critical functionality to the
-templates.
-
-This release represents over 90 code commits from 28 different contributors.
-
-  * 10 [new themes](https://github.com/spf13/hugoThemes) created by the community
-  * Fully themable [Partials](/templates/partials/)
-  * [404 template](/templates/404/) support in themes
-  * [Shortcode](/extras/shortcodes/) support in themes
-  * [Views](/templates/views/) support in themes
-  * Inner [shortcode](/extras/shortcodes/) content now treated as Markdown
-  * Support for header ids in Markdown (# Header {#myid})
-  * [Where](/templates/list/) template function to filter lists of content, taxonomies, etc.
-  * [GroupBy](/templates/list/) & [GroupByDate](/templates/list/) methods to group pages
-  * Taxonomy [pages list](/taxonomies/methods/) now sortable, filterable, limitable & groupable
-  * General cleanup to taxonomies & documentation to make it more clear and consistent
-  * [Showcase](/showcase/) returned and has been expanded
-  * Pretty links now always have trailing slashes
-  * [BaseUrl](/overview/configuration/) can now include a subdirectory
-  * Better feedback about draft & future post rendering
-  * A variety of improvements to [the website](http://gohugo.io/)
-
-## **0.11.0** May 28, 2014
-
-This release represents over 110 code commits from 29 different contributors.
-
-  * Considerably faster... about 3 - 4x faster on average
-  * [LiveReload](/extras/livereload/). Hugo will automatically reload the browser when the build is complete
-  * Theme engine w/[Theme Repository](https://github.com/spf13/hugoThemes)
-  * [Menu system](/extras/menus/) with support for active page
-  * [Builders](/extras/builders/) to quickly create a new site, content or theme
-  * [XML sitemap](/templates/sitemap/) generation
-  * [Integrated Disqus](/extras/comments/) support
-  * Streamlined [template organization](/templates/overview/)
-  * [Brand new docs site](http://gohugo.io/)
-  * Support for publishDate which allows for posts to be dated in the future
-  * More [sort](/content/ordering/) options
-  * Logging support
-  * Much better error handling
-  * More informative verbose output
-  * Renamed Indexes > [Taxonomies](/taxonomies/overview/)
-  * Renamed Chrome > [Partials](/templates/partials/)
-
-## **0.10.0** March 1, 2014
-
-This release represents over 110 code commits from 29 different contributors.
-
-  * [Syntax highlighting](/extras/highlighting/) powered by pygments (**slow**)
-  * Ability to [sort content](/content/ordering/) many more ways
-  * Automatic [table of contents](/extras/toc/) generation
-  * Support for Unicode URLs, aliases and indexes
-  * Configurable per-section [permalink](/extras/permalinks/) pattern support
-  * Support for [paired shortcodes](/extras/shortcodes/)
-  * Shipping with some [shortcodes](/extras/shortcodes/) (highlight & figure)
-  * Adding [canonify](/extras/urls/) option to keep urls relative
-  * A bunch of [additional template functions](/layout/functions/)
-  * Watching very large sites now works on Mac
-  * RSS generation improved. Limited to 50 items by default, can limit further in [template](/layout/rss/)
-  * Boolean params now supported in [frontmatter](/content/front-matter/)
-  * Launched website [showcase](/showcase/). Show off your own hugo site!
-  * A bunch of [bug fixes](https://github.com/spf13/hugo/commits/master)
-
-## **0.9.0** November 15, 2013
-
-This release represents over 220 code commits from 22 different contributors.
-
-  * New [command based interface](/overview/usage/) similar to git (`hugo server -s ./`)
-  * Amber template support
-  * [Aliases](/extras/aliases/) (redirects)
-  * Support for top level pages (in addition to homepage)
-  * Complete overhaul of the documentation site
-  * Full Windows support
-  * Better index support including [ordering by content weight](/content/ordering/)
-  * Add params to site config, available in .Site.Params from templates
-  * Friendlier json support
-  * Support for html & xml content (with frontmatter support)
-  * Support for [summary](/content/summaries/) content divider (<code>&lt;!&#45;&#45;more&#45;&#45;&gt;</code>)
-  * HTML in [summary](/content/summaries/) (when using divider)
-  * Added ["Minutes to Read"](/layout/variables/) functionality
-  * Support for a custom 404 page
-  * Cleanup of how content organization is handled
-  * Loads of unit and performance tests
-  * Integration with travis ci
-  * Static directory now watched and copied on any addition or modification
-  * Support for relative permalinks
-  * Fixed watching being triggered multiple times for the same event
-  * Watch now ignores temp files (as created by Vim)
-  * Configurable number of posts on [homepage](/layout/homepage/)
-  * [Front matter](/content/front-matter/) supports multiple types (int, string, date, float)
-  * Indexes can now use a default template
-  * Addition of truncated bool to content to determine if should show 'more' link
-  * Support for [linkTitles](/layout/variables/)
-  * Better handling of most errors with directions on how to resolve
-  * Support for more date / time formats
-  * Support for go 1.2
-  * Support for `first` in templates
-
-## **0.8.0** August 2, 2013
-
-This release represents over 65 code commits from 6 different contributors.
-
-  * Added support for pretty urls (filename/index.html vs filename.html)
-  * Hugo supports a destination directory
-  * Will efficiently sync content in static to destination directory
-  * Cleaned up options.. now with support for short and long options
-  * Added support for TOML
-  * Added support for YAML
-  * Added support for Previous & Next
-  * Added support for indexes for the indexes
-  * Better Windows compatibility
-  * Support for series
-  * Adding verbose output
-  * Loads of bugfixes
-
-## **0.7.0** July 4, 2013
-  * Hugo now includes a simple server
-  * First public release
-
-## **0.6.0** July 2, 2013
-  * Hugo includes an example documentation site which it builds
-
-## **0.5.0** June 25, 2013
-  * Hugo is quite usable and able to build spf13.com
-