summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorCameron Moore <moorereason@gmail.com>2016-03-12 17:35:06 -0600
committerCameron Moore <moorereason@gmail.com>2016-06-16 16:31:22 -0500
commit373ca66287eb66c76832cf62159efbf58138353b (patch)
treee0425109ae17be8f05ad48e530815bca5dc626c7 /README.md
parentc52bb4efbe40fe91e3dd7db81432702392550991 (diff)
hugo: Update contribution guidelines
Refactor the contribution guidelines in the README and CONTRIBUTING files. Simplify the contribution guide in the README and move most of the complex stuff into CONTRIBUTING. Add an explicit commit message guidelines section to CONTRIBUTING. Keep all of the guidelines from Chris Beams except for the 72 character line limit (we don't follow that, nor does the Go team). Add three new guidelines: package prefix in subject, references in body, and encouragement of message body in general. Add a new section to CONTRIBUTING on using Git Remotes.
Diffstat (limited to 'README.md')
-rw-r--r--README.md104
1 files changed, 26 insertions, 78 deletions
diff --git a/README.md b/README.md
index 536637fac..b223d58f6 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ A Fast and Flexible Static Site Generator built with love by [spf13](http://spf1
[Dev Chat](https://gitter.im/spf13/hugo) |
[Documentation](https://gohugo.io/overview/introduction/) |
[Installation Guide](https://gohugo.io/overview/installing/) |
+[Contribution Guide](CONTRIBUTING.md) |
[Twitter](http://twitter.com/spf13)
[![GoDoc](https://godoc.org/github.com/spf13/hugo?status.svg)](https://godoc.org/github.com/spf13/hugo)
@@ -52,42 +53,6 @@ Building the binaries is an easy task for an experienced `go` getter.
Use the [installation instructions in the Hugo documentation](https://gohugo.io/overview/installing/).
-### Clone the Hugo Project (Contributor)
-
-1. Make sure your local environment has the following software installed:
-
- * [Git](https://git-scm.com/)
- * [Go][] 1.5+
-
-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. Install the test dependencies (needed if you want to run tests):
-
- go get -v -t -d ./...
-
-7. Use a symbolic link to add your locally cloned Hugo repository to your `$GOPATH`, assuming you prefer doing development work outside of `$GOPATH`:
-
- ```bash
- 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`.
-
-You can also find a [detailed guide](https://www.gohugo.io/tutorials/how-to-contribute-to-hugo/) in our documentation.
-
### Build and Install the Binaries from Source (Advanced Install)
Add Hugo and its package dependencies to your go `src` directory.
@@ -100,59 +65,42 @@ To update Hugo’s dependencies, use `go get` with the `-u` option.
go get -u -v github.com/spf13/hugo
-## Contribute 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.
-
-[![Throughput Graph](https://graphs.waffle.io/spf13/hugo/throughput.svg)](https://waffle.io/spf13/hugo/metrics)
+## Contributing to Hugo
-If you have any questions about how to contribute or what to contribute, please ask on the [forum](https://discuss.gohugo.io).
+For a complete guide to contributing to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
-## Code Contribution Guideline
+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.
-We welcome your contributions.
-To make the process as seamless as possible, we ask for the following:
+The Hugo community and maintainers are very active and helpful, and the project benefits greatly from this activity.
-* 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:
- * Sign the [CLA](https://cla-assistant.io/spf13/hugo)
- * 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.
- * **Write a good commit message.** 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."
- * Make sure `go test ./...` passes, and `go build` completes. Our [Travis CI loop](https://travis-ci.org/spf13/hugo) (Linux and OS&nbsp;X) and [AppVeyor](https://ci.appveyor.com/project/spf13/hugo/branch/master) (Windows) will catch most things that are missing.
-
-### Build Hugo with Your Changes
-
-```bash
-cd /path/to/hugo
-go build -o hugo main.go
-mv hugo /usr/local/bin/
-```
-
-### Add Compile Information to Hugo
-
-To add compile information to Hugo, replace the `go build` command with the following *(replace `/path/to/hugo` with the actual path)*:
+[![Throughput Graph](https://graphs.waffle.io/spf13/hugo/throughput.svg)](https://waffle.io/spf13/hugo/metrics)
- 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`"
+### Asking Support Questions
-This will result in `hugo version` output that looks similar to:
+We have an active [discussion forum](http://discuss.gohugo.io) where users and developers can ask questions.
+Please don't use the Github issue tracker to ask questions.
- Hugo Static Site Generator v0.13-DEV-8042E77 buildDate: 2014-12-25T03:25:57-07:00
+### Reporting Issues
-Alternatively, just run `make` &mdash; all the “magic” above is already in the `Makefile`. :wink:
+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](http://discuss.gohugo.io).
+When reporting the issue, please provide the version of Hugo in use (`hugo version`).
-### Run Hugo
+### Submitting Patches
-```bash
-cd /path/to/hugo
-go install github.com/spf13/hugo/hugolib
-go run main.go
-```
+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.
-**Complete documentation is available at [Hugo Documentation][].**
+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")