Merge commit '807c551922707fc5ae0eb26e8f01638c0c63fdb3'

6 files changed, 16 insertions, 15 deletions

diff --git a/docs/content/en/content-management/comments.md b/docs/content/en/content-management/comments.md
index 17914ba2c..dad5d0786 100644
--- a/docs/content/en/content-management/comments.md
+++ b/docs/content/en/content-management/comments.md
@@ -60,6 +60,7 @@ There are a few alternatives to commenting on static sites for those who do not
 * [isso](http://posativ.org/isso/) (Self-hosted, Python)
     * [Tutorial on Implementing Isso with Hugo][issotutorial]
 * [Utterances](https://utteranc.es/) (Open source, Github comments widget built on Github issues)
+* [Remark](https://github.com/umputun/remark) (Open source, Golang, Easy to run docker)
 
 <!-- I don't think this is worth including in the documentation since it seems that Steve is no longer supporting or developing this project. rdwatters - 2017-02-29.-->
 <!-- * [Kaiju](https://github.com/spf13/kaiju) -->
diff --git a/docs/content/en/getting-started/code-toggle.md b/docs/content/en/getting-started/code-toggle.md
index b304d2c5b..51c887a47 100644
--- a/docs/content/en/getting-started/code-toggle.md
+++ b/docs/content/en/getting-started/code-toggle.md
@@ -15,6 +15,10 @@ toc: true
 This is an example for the Config Toggle shortcode. 
 Its purpose is to let users choose a Config language by clicking on its corresponding tab. Upon doing so, every Code toggler on the page will be switched to the target language. Also, target language will be saved in user's `localStorage` so when they go to a different pages, Code Toggler display their last "toggled" config language.
 
+{{% note %}}
+The `code-toggler` shortcode is not an internal Hugo shortcode. This page's purpose is to test out a custom feature that we use throughout this site. See: https://github.com/gohugoio/gohugoioTheme/blob/master/layouts/shortcodes/code-toggle.html
+{{% /note %}}
+
 ## That Config Toggler
 
 {{< code-toggle file="config">}}
diff --git a/docs/content/en/getting-started/configuration.md b/docs/content/en/getting-started/configuration.md
index 3f36eb28c..f43c51b9b 100644
--- a/docs/content/en/getting-started/configuration.md
+++ b/docs/content/en/getting-started/configuration.md
@@ -358,7 +358,7 @@ The above will try first to extract the value for `.Lastmod` starting with the `
 
 
 `:filename`
-: Fetches the date from the content file's filename. For example, `218-02-22-mypage.md` will extract the date `218-02-22`. Also, if `slug` is not set, `mypage` will be used as the value for `.Slug`.
+: Fetches the date from the content file's filename. For example, `2018-02-22-mypage.md` will extract the date `2018-02-22`. Also, if `slug` is not set, `mypage` will be used as the value for `.Slug`.
 
 An example:
 
diff --git a/docs/content/en/getting-started/installing.md b/docs/content/en/getting-started/installing.md
index ccf96317b..b5b210d3e 100644
--- a/docs/content/en/getting-started/installing.md
+++ b/docs/content/en/getting-started/installing.md
@@ -75,22 +75,18 @@ scoop install hugo
 #### Prerequisite Tools
 
 * [Git][installgit]
-* [Go (latest or previous version)][installgo]
-
-#### Vendored Dependencies
-
-Hugo uses [dep][] to vendor dependencies, but we don't commit the vendored packages themselves to the Hugo git repository. Therefore, a simple `go get` is *not* supported because the command is not vendor aware.
-
-The simplest way is to use [mage][] (a Make alternative for Go projects.)
+* [Go (at least Go 1.11)](https://golang.org/dl/)
 
 #### Fetch from GitHub
 
+Since Hugo 0.48, Hugo uses the Go Modules support built into Go 1.11 to build. The easiest way to get started is to clone Hugo in a directory outside of the GOPATH, as in the following example:
+
 {{< code file="from-gh.sh" >}}
-go get github.com/magefile/mage
-go get -d github.com/gohugoio/hugo
-cd ${GOPATH:-$HOME/go}/src/github.com/gohugoio/hugo
-mage vendor
-HUGO_BUILD_TAGS=extended mage install
+mkdir $HOME/src
+cd $HOME/src
+git clone https://github.com/gohugoio/hugo.git
+cd hugo
+go install
 {{< /code >}}
 
 Remove `HUGO_BUILD_TAGS=extended` if you do not want Sass/SCSS support.
diff --git a/docs/content/en/getting-started/quick-start.md b/docs/content/en/getting-started/quick-start.md
index 59a8513c8..16b69d7c1 100644
--- a/docs/content/en/getting-started/quick-start.md
+++ b/docs/content/en/getting-started/quick-start.md
@@ -127,7 +127,7 @@ theme = "ananke"
 Replace the `title` above with something more personal. Also, if you already have a domain ready, set the `baseURL`. Note that this value is not needed when running the local development server. 
 
 {{% note %}}
-**Tip:** Make the changes to the site configuration or any other file in your site while the Hugo server is running, and you will see the changes in the browser right away.
+**Tip:** Make the changes to the site configuration or any other file in your site while the Hugo server is running, and you will see the changes in the browser right away, though you may need to [clear your cache](https://kb.iu.edu/d/ahic).
 {{% /note %}}
 
 
diff --git a/docs/content/en/hosting-and-deployment/deployment-with-wercker.md b/docs/content/en/hosting-and-deployment/deployment-with-wercker.md
index ac9d7a3e6..1fed46430 100644
--- a/docs/content/en/hosting-and-deployment/deployment-with-wercker.md
+++ b/docs/content/en/hosting-and-deployment/deployment-with-wercker.md
@@ -128,7 +128,7 @@ git push -u origin master
 
 ## Set Up Wercker
 
-To sign up for a free Wercker account, go to <https://wercker.com> and click the **Sign Up** button on the top right of the home screen.
+To sign up for a free Wercker account, go to <https://www.wercker.com> and click the **Sign Up** button on the top right of the home screen.
 
 ![][3]