Merge commit 'c2037f0c9a3a35b9db9c404f6b5f94ec8b690a53'

docs/content/en/getting-started/configuration.md

@@ -114,6 +114,9 @@ defaultContentLanguage ("en")
 defaultContentLanguageInSubdir (false)
 : Render the default content language in subdir, e.g. `content/en/`. The site root `/` will then redirect to `/en/`.
 
+disableAliases (false)
+: Will disable generation of alias redirects. Note that even if `disableAliases` is set, the aliases themselves are preserved on the page. The motivation with this is to be able to generate 301 redirects in an `.htacess`, a Netlify `_redirects` file or similar using a custom output format.
+
 disableHugoGeneratorInject (false)
 : Hugo will, by default, inject a generator meta tag in the HTML head on the _home page only_. You can turn it off, but we would really appreciate if you don't, as this is a good way to watch Hugo's popularity on the rise.
 
@@ -251,7 +254,7 @@ stepAnalysis (false)
 : Display memory and timing of different steps of the program.
 
 summaryLength (70)
-: The length of text to show in a [`.Summary`](/content-management/summaries/#hugo-defined-automatic-summary-splitting).
+: The length of text in words to show in a [`.Summary`](/content-management/summaries/#hugo-defined-automatic-summary-splitting).
 
 taxonomies
 : See [Configure Taxonomies](/content-management/taxonomies#configure-taxonomies).

docs/content/en/getting-started/quick-start.md

@@ -43,7 +43,7 @@ hugo version
 ```
 
 
-{{< asciicast HDlKrUrbfT7yiWsbd6QoxzRTN >}}
+{{< asciicast ItACREbFgvJ0HjnSNeTknxWy9 >}}
 
 
 ## Step 2: Create a New Site
@@ -54,7 +54,7 @@ hugo new site quickstart
 
 The above will create a new Hugo site in a folder named `quickstart`.
 
-{{< asciicast 1PH9A2fs14Dnyarx5v8OMYQer >}}
+{{< asciicast 3mf1JGaN0AX0Z7j5kLGl3hSh8 >}}
 
 
 ## Step 3: Add a Theme
@@ -81,7 +81,7 @@ echo 'theme = "ananke"' >> config.toml
 ```
 
 
-{{< asciicast WJM2LEZQs8VRhNeuZ5NiGPp9I >}}
+{{< asciicast 7naKerRYUGVPj8kiDmdh5k5h9 >}}
 
 ## Step 4: Add Some Content
 
@@ -89,6 +89,8 @@ echo 'theme = "ananke"' >> config.toml
 hugo new posts/my-first-post.md
 ```
 
+{{< asciicast eUojYCfRTZvkEiqc52fUsJRBR >}}
+
 
 Edit the newly created content file if you want.
 
@@ -97,23 +99,30 @@ Edit the newly created content file if you want.
 
 Now, start the Hugo server with [drafts](/getting-started/usage/#draft-future-and-expired-content) enabled:
 
+{{< asciicast BvJBsF6egk9c163bMsObhuNXj >}}
+
+
+
 ```
 ▶ hugo server -D
 
-Started building sites ...
-Built site for language en:
-1 of 1 draft rendered
-0 future content
-0 expired content
-1 regular pages created
-8 other pages created
-0 non-page files copied
-1 paginator pages created
-0 categories created
-0 tags created
-total in 18 ms
-Watching for changes in /Users/bep/sites/quickstart/{data,content,layouts,static,themes}
+                   | EN
++------------------+----+
+  Pages            | 10
+  Paginator pages  |  0
+  Non-page files   |  0
+  Static files     |  3
+  Processed images |  0
+  Aliases          |  1
+  Sitemaps         |  1
+  Cleaned          |  0
+
+Total in 11 ms
+Watching for changes in /Users/bep/quickstart/{content,data,layouts,static,themes}
+Watching for config changes in /Users/bep/quickstart/config.toml
+Environment: "development"
 Serving pages from memory
+Running in Fast Render Mode. For full rebuilds on change: hugo server --disableFastRender
 Web Server is available at http://localhost:1313/ (bind address 127.0.0.1)
 Press Ctrl+C to stop
 ```
@@ -148,6 +157,3 @@ For theme specific configuration options, see the [theme site](https://github.co
 
 **For further theme customization, see [Customize a Theme](/themes/customizing/).**
 
-## Recapitulation
-
-{{< asciicast pWp4uvyAkdWgQllD9RCfeBL5k >}}