Merge branch 'release/5.17.0'

Author: subsymbolic

CONTRIBUTING.md

@@ -4,16 +4,27 @@ Thank you for taking the time to contribute to DuckDuckGo! :sparkles:
 
 We are pleased to open up the project to you - our community. How can you contribute?
 
-## Share feedback and bug reports
-See [README.md](README.md)
+## Share feedback
+Contact us at https://duckduckgo.com/feedback if you have feedback, questions or want to chat. You can also use the feedback form embedded within our Mobile App - to do so please navigate to Settings and select "Leave Feedback".
+
+## Report an issue
+A great way to contribute to the project is to report an issue when you encounter a problem.
+
+We want our app to be as stable as possible thus your bug reports are immensely valuable. When reporting bugs let us know the:
+* App version
+* Device model
+* Android version
+* Steps to reproduce the bug
+* Expected behavior
+* Actual behavior
+
+If you have encountered a security issue, please reach us through https://hackerone.com/duckduckgo.
 
 ## Contribute Code
 
-We have labeled tasks you can help with as [help wanted](https://github.com/duckduckgo/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).
-As we are still opening up our repo, we cannot yet accept PRs outside this list. If you have a great idea
-you really want to implement, start by logging an issue for us and mention that you are interested in helping.
- If it fits with our product direction and is a good candidate for community development we may be able to bend
- the rules and work with you to develop it.
+We welcome pull requests aimed at fixing bugs and security issues. We have also labeled tasks you can help with as [help wanted](https://github.com/duckduckgo/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).
+
+If you have a great idea you really want to implement, start by logging an issue for us and mention that you are interested in helping. If it fits with our product direction and is a good candidate for community development we may be able to bend the rules and work with you to develop it.
 
 ## Style Guide
 

README.md

@@ -3,11 +3,7 @@
 Welcome to our android application. We are excited to engage the community in development, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## We are hiring!
-Are you a talented cross-platform mobile developer? We are looking for a Senior Cross-Platform or iOS Engineer to help shape our mobile apps. We embrace diverse perspectives, and seek out passionate, self-motivated people, committed to our shared vision of raising the standard of trust online. Visit our [careers](https://duckduckgo.com/hiring/#open) page to find out more!
-
-## Discuss
-
-Contact us at https://duckduckgo.com/feedback if you have feedback, questions or want to chat.
+Are you a talented cross-platform mobile developer? We are looking for a Senior Cross-Platform or Android Engineer to help shape our mobile apps. We embrace diverse perspectives, and seek out passionate, self-motivated people, committed to our shared vision of raising the standard of trust online. Visit our [careers](https://duckduckgo.com/hiring/#open) page to find out more!
 
 ## Building the Project
 We use git submodules and so when you are checking out the app, you'll need to ensure the submodules are initialized properly. You can use the `--recursive` flag when cloning the project to do this.
@@ -18,15 +14,13 @@ Alternatively, if you already have the project checked out, you can initialize t
 
     git submodule update --init
 
-## Reporting Bugs
+## Contribute
+
+Please refer to [contributing](CONTRIBUTING.md).
+
+## Discuss
 
-We want our app to be as stable as possible thus your bug reports are immensely valuable. When reporting bugs let us know the:
-* App version
-* Device make and model
-* Android version
-* Steps to reproduce the bug
-* Expected behavior
-* Actual behavior
+Contact us at https://duckduckgo.com/feedback if you have feedback, questions or want to chat. You can also use the feedback form embedded within our Mobile App - to do so please navigate to Settings and select "Leave Feedback".
 
 ## License
 DuckDuckGo android is distributed under the Apache 2.0 [license](LICENSE).