Browse files

Fixed some documentation

  • Loading branch information...
1 parent 7aa9605 commit cde19135eb41d7a8792ec9f57fe97f29a1a4689e @Idolf Idolf committed Aug 21, 2016
Showing with 10 additions and 5 deletions.
  1. +6 −1
  2. +3 −3
  3. +1 −1
@@ -19,9 +19,14 @@ Finally, it is probably a good idea to run the test suite locally before doing
the pull-request to make sure everything works, however this is not a
+Once you are ready to do a pull-request, you should figure out if your changes
+constitutes a new feature or a bugfix in stable or beta. If it is a bugfix in
+stable or beta, you should do the pull-request against the branch in question,
+and otherwise your pull-request should be against the dev branch.
Once you do the pull-request Travis CI will run the test-suite on it. Once it
passes one of the core developers will look at your pull request, possibly
-comment on it and then hopefully merge it into master.
+comment on it and then hopefully merge it into the branch in question.
## Automated Testing
@@ -1,12 +1,12 @@
# pwntools - CTF toolkit
-![pwntools logo](
+![pwntools logo](
[![Docs latest](](
[![Docs 2.2.0](](
[![MIT License](](
@@ -79,7 +79,7 @@
author = "Zach Riggle",
author_email = "",
url = '',
- download_url = "",
+ download_url = "",
install_requires = install_requires,
license = "Mostly MIT, some GPL/BSD, see LICENSE-pwntools.txt and LICENSE-pwntools.txt",
classifiers = [

0 comments on commit cde1913

Please sign in to comment.