aboutsummaryrefslogtreecommitdiffstats
path: root/docs/doing-a-release.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-02-08 13:41:36 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-02-08 13:41:36 -0800
commitae17250910ef1bd660552ea0ba7d92020bde325b (patch)
tree3eff61c22485d909dac3d1ae30fe938254c4b95b /docs/doing-a-release.rst
parent3d38f7a68b4ffc4cab920a82f1d6d225b906be22 (diff)
parent63b3de2fa82729022d2c97e54b4c5e1a7ceff8f4 (diff)
downloadcryptography-ae17250910ef1bd660552ea0ba7d92020bde325b.tar.gz
cryptography-ae17250910ef1bd660552ea0ba7d92020bde325b.tar.bz2
cryptography-ae17250910ef1bd660552ea0ba7d92020bde325b.zip
Merge pull request #579 from public/words
s/which/that/
Diffstat (limited to 'docs/doing-a-release.rst')
-rw-r--r--docs/doing-a-release.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/doing-a-release.rst b/docs/doing-a-release.rst
index 194e82f4..15583afb 100644
--- a/docs/doing-a-release.rst
+++ b/docs/doing-a-release.rst
@@ -18,7 +18,7 @@ software.
Performing the release
----------------------
-The commit which merged the version number bump is now the official release
+The commit that merged the version number bump is now the official release
commit for this release. You will need to have ``gpg`` installed and a ``gpg``
key in order to do a release. Once this has happened: