Skip to content

Commit

Permalink
Merge commit '807c551922707fc5ae0eb26e8f01638c0c63fdb3'
Browse files Browse the repository at this point in the history
bep committed Sep 23, 2018

Verified

This commit was signed with the committer’s verified signature.
bep Bjørn Erik Pedersen
2 parents fe6a6f2 + 807c551 commit bc57f5c
Showing 9 changed files with 24 additions and 233 deletions.
1 change: 1 addition & 0 deletions docs/content/en/content-management/comments.md
Original file line number Diff line number Diff line change
@@ -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) -->
4 changes: 4 additions & 0 deletions docs/content/en/getting-started/code-toggle.md
Original file line number Diff line number Diff line change
@@ -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">}}
2 changes: 1 addition & 1 deletion docs/content/en/getting-started/configuration.md
Original file line number Diff line number Diff line change
@@ -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:

20 changes: 8 additions & 12 deletions docs/content/en/getting-started/installing.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion docs/content/en/getting-started/quick-start.md
Original file line number Diff line number Diff line change
@@ -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 %}}


Original file line number Diff line number Diff line change
@@ -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]

7 changes: 7 additions & 0 deletions docs/data/homepagetweets.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[[tweet]]
name = "Joshua Steven‏‏"
twitter_handle = "@jscarto"
quote = "Can't overstate how much I enjoy <a href='https://twitter.com/gohugoio' target='_blank'>@GoHugoIO</a>. My site is relatively small, but *18 ms* to build the whole thing made template development and proofing a breeze."
link = "https://twitter.com/jscarto/status/1039648827815485440"
date = 2018-09-12T00:00:00Z

[[tweet]]
name = "Jens Munch"
twitter_handle = "@jensamunch"
217 changes: 0 additions & 217 deletions docs/data/references.toml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/netlify.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build]
publish = "public"
command = "hugo --minify"
command = "hugo"

[context.production.environment]
HUGO_VERSION = "0.48"

0 comments on commit bc57f5c

Please sign in to comment.