Merge branch 'develop'
Conflicts:
README.md
diff --git a/README.md b/README.md
index 91ed9e4..b7ea4ae 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
* [Examples](#examples)
* [Build](#build)
* [Install](#install)
- * [Contribute](#contribute)
+ * [Contribute](#contribute) - Read if you're planning to submit patches
meck
====
@@ -180,16 +180,13 @@
<a name='install'>
-Install & Usage
----------------
+Install
+-------
-Meck is best used via [rebar][1]. Add the following dependency t
-your `rebar.config` in your project root:
+To install meck permanently, use of [Agner][2] is recommended:
-```erlang
-{deps, [
- {meck, ".*", {git, "https://github.com/eproxus/meck.git"}}
-]}.
+```sh
+agner install meck
```
If you want to install your own built version of meck add the ebin
@@ -197,6 +194,7 @@
release folder and make sure that folder is in your `ERL_LIBS`
environment variable.
+
<a name='contribute'>
Contribute
@@ -204,8 +202,24 @@
Patches are greatly appreciated!
-Should you find yourself using meck and have issues, comments or
-feedback please [create an issue here on GitHub.] [2]
+meck uses the [git flow][3] model (tip: install and use the
+[`git-flow`][4] command). Use the branch name `feature/...` for easier
+integration when developing new features or fixes for meck.
- [1]: https://github.com/basho/rebar "Rebar - A build tool for Erlang"
- [2]: http://github.com/eproxus/meck/issues "meck issues"
+For a much nicer history, please [write good commit messages][5].
+
+Should you find yourself using meck and have issues, comments or
+feedback please [create an issue here on GitHub.] [6]
+
+ [1]: https://github.com/basho/rebar
+ "Rebar - A build tool for Erlang"
+ [2]: http://erlagner.org/
+ "Agner - Erlang Package Index & Package Manager"
+ [3]: http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/
+ "Why Aren't You Using git-flow?"
+ [4]: https://github.com/nvie/gitflow
+ "git-flow on GitHub"
+ [5]: https://github.com/erlang/otp/wiki/Writing-good-commit-messages
+ "Erlang/OTP commit messages"
+ [6]: http://github.com/eproxus/meck/issues
+ "meck issues"
