aboutsummaryrefslogtreecommitdiffstats
path: root/README.rst
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-06-19 10:55:32 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-06-21 10:03:32 +0200
commit56af469b5a723146461c89e25e46f66eeae4ddc5 (patch)
tree23009df5c177dd577dd3e939dd7d1701a4f0eb62 /README.rst
parent65955ee45f4b5e66fd433924811f6753e996bea6 (diff)
downloadmitmproxy-56af469b5a723146461c89e25e46f66eeae4ddc5.tar.gz
mitmproxy-56af469b5a723146461c89e25e46f66eeae4ddc5.tar.bz2
mitmproxy-56af469b5a723146461c89e25e46f66eeae4ddc5.zip
add Discourse to README
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst17
1 files changed, 15 insertions, 2 deletions
diff --git a/README.rst b/README.rst
index 983f50fb..2376d9b7 100644
--- a/README.rst
+++ b/README.rst
@@ -19,16 +19,25 @@ that creatively violate the standards.
Documentation & Help
--------------------
-Documentation, tutorials and precompiled binaries can be found on the mitmproxy
+
+General information, tutorials, and precompiled binaries can be found on the mitmproxy
and pathod websites.
|mitmproxy_site| |pathod_site|
+
The latest documentation for mitmproxy is also available on ReadTheDocs.
|mitmproxy_docs|
-You can join our developer chat on Slack.
+
+Join our discussion forum on Discourse to ask questions and help
+each other solving problems and come up with new ideas and solutions.
+
+|mitmproxy_discourse|
+
+
+Join our developer chat on Slack if you plan on hacking on code or working on pull requests.
|slack|
@@ -155,6 +164,10 @@ PR checks will fail and block merging. We are using this command to check for st
:target: http://docs.mitmproxy.org/en/latest/
:alt: mitmproxy documentation
+.. |mitmproxy_discourse| image:: https://shields.mitmproxy.org/api/https%3A%2F%2F-discourse.mitmproxy.org-orange.svg
+ :target: https://discourse.mitmproxy.org
+ :alt: Discourse: mitmproxy
+
.. |slack| image:: http://slack.mitmproxy.org/badge.svg
:target: http://slack.mitmproxy.org/
:alt: Slack Developer Chat