summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMartin Geisler <martin@geisler.net>2014-06-29 15:23:29 +0200
committerMartin Geisler <martin@geisler.net>2014-06-29 15:23:29 +0200
commit727028f1507f5ef5a45d0e7d8ec80664800c7a84 (patch)
tree0b9420c49d6a65183735a1916fb4d018647a94c9 /docs
parent05c7cae789e02ca84310f745b689f89312494a47 (diff)
downloadpython-setuptools-bitbucket-727028f1507f5ef5a45d0e7d8ec80664800c7a84.tar.gz
Fixed capitalization of "Bitbucket"
Bitbucket is normally spelled with exactly one capital "b".
Diffstat (limited to 'docs')
-rw-r--r--docs/merge-faq.txt2
-rw-r--r--docs/releases.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
index 52013098..ea45f30c 100644
--- a/docs/merge-faq.txt
+++ b/docs/merge-faq.txt
@@ -58,7 +58,7 @@ Who is invited to contribute? Who is excluded?
While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the community, especially those most familiar with Python packaging and its challenges to join us in the effort.
-We have lots of ideas for how we'd like to improve the codebase, release process, everything. Like distribute, the post-merge setuptools will have its source hosted on bitbucket. (So if you're currently a distribute contributor, about the only thing that's going to change is the URL of the repository you follow.) Also like distribute, it'll support Python 3, and hopefully we'll soon merge Vinay Sajip's patches to make it run on Python 3 without needing 2to3 to be run on the code first.
+We have lots of ideas for how we'd like to improve the codebase, release process, everything. Like distribute, the post-merge setuptools will have its source hosted on Bitbucket. (So if you're currently a distribute contributor, about the only thing that's going to change is the URL of the repository you follow.) Also like distribute, it'll support Python 3, and hopefully we'll soon merge Vinay Sajip's patches to make it run on Python 3 without needing 2to3 to be run on the code first.
While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the community, especially those most familiar with Python packaging and its challenges to join us in the effort.
diff --git a/docs/releases.txt b/docs/releases.txt
index 41a814bc..66c0896f 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -10,7 +10,7 @@ module. The script does some checks (some interactive) and fully automates
the release process.
A Setuptools release manager must have maintainer access on PyPI to the
-project and administrative access to the BitBucket project.
+project and administrative access to the Bitbucket project.
To make a release, run the following from a Mercurial checkout at the
revision slated for release::