summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Jones <bsdmatburt@gmail.com>2017-08-11 16:55:37 +0200
committerMatthew Jones <bsdmatburt@gmail.com>2017-08-11 16:55:37 +0200
commit4f4293a8cd49a52e985259162697d4d11d35cb43 (patch)
tree2bc772b7f2ca32938f14f00f9235b61399edf949
parentMerge pull request #246 from jlmitch5/fixStdOutOrdering (diff)
downloadawx-4f4293a8cd49a52e985259162697d4d11d35cb43.tar.xz
awx-4f4293a8cd49a52e985259162697d4d11d35cb43.zip
Rewording AWS in contributor doc
Add link to code of conduct
-rw-r--r--CONTRIBUTING.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fa6be6d627..a6ae51ecbc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
-Ansible AWX
+AWX
===========
Hi there! We're excited to have you as a contributor.
@@ -75,6 +75,8 @@ By making a contribution to this project, I certify that:
Code of Conduct
===============
+All contributors are expected to adhere to the Ansible Community Code of Conduct: http://docs.ansible.com/ansible/latest/community/code_of_conduct.html
+
Setting up the development environment
======================================
@@ -117,7 +119,7 @@ For `docker-compose` you may need/choose to install it seperately:
Local Settings
--------------
-In development mode (i.e. when running from a source checkout), Ansible AWX
+In development mode (i.e. when running from a source checkout), AWX
will import the file `awx/settings/local_settings.py` and combine it with defaults in `awx/settings/defaults.py`. This file
is required for starting the development environment and startup will fail if it's not provided