Merge branch 'doc-fix' of https://github.com/brandonblack/hugo into brandonblack-doc-fix

Conflicts:
	README.md
This commit is contained in:
spf13 2013-07-24 11:27:03 -04:00
commit 3ad3f2f0e0

View file

@ -37,6 +37,7 @@ is the most probable location.
## Installing from source ## Installing from source
<<<<<<< HEAD
### Dependencies ### Dependencies
Make sure you have a recent version of go installed. Hugo requires go 1.1+. Make sure you have a recent version of go installed. Hugo requires go 1.1+.
@ -45,11 +46,26 @@ Make sure you have a recent version of go installed. Hugo requires go 1.1+.
### Cloning and Installing dependencies ### Cloning and Installing dependencies
Pre-requisites:
* Git
* Go 1.1+
* Mercurial
* Bazaar
### Getting locally (for contributors):
# clone and build
git clone https://github.com/spf13/hugo git clone https://github.com/spf13/hugo
cd hugo cd hugo
go get go get
go build -o hugo main.go go build -o hugo main.go
### Install directly from Github:
go get github.com/spf13/hugo
go build -o hugo main.go
### Running Hugo ### Running Hugo
cd hugo cd hugo