From a0076460dbdad4fc5116f490696251fba6e9815d Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 29 Sep 2015 13:48:38 +0200 Subject: [PATCH] avoid pullrequest picture and fix bugfix/feature target info. I could not get the pullrequest picture to be included correctly in both latex and html sphinx builders due to the "include" directive from doc/en/contributing.rst --- CONTRIBUTING.rst | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8e7055699..b2e78d375 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -209,19 +209,13 @@ but here is a simple overview: are unsure about either of these steps, submit your pull request and we'll help you fix it up. -#. Finally, submit a pull request through the GitHub website: - - .. image:: doc/en/img/pullrequest.png - :width: 700px - :align: center - - :: +#. Finally, submit a pull request through the GitHub website using this data:: head-fork: YOUR_GITHUB_USERNAME/pytest compare: your-branch-name base-fork: pytest-dev/pytest - base: master # if it's a feature - base: pytest-VERSION # if it's a bugfix + base: master # if it's a bugfix + base: feature # if it's a feature