aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2014-06-05 14:20:47 -0700
committerDavid Reid <dreid@dreid.org>2014-06-05 14:20:47 -0700
commita7abb4bec5a06f2d1d6cd896b2f362cd79c4d5a3 (patch)
tree520e7a2163f5c5cb5bb8b40f27ed792a09ae6a77
parent0d1b260632b35a60d9337fce8a8d9a2b1901566d (diff)
parente2f523ad1e752a0d8f037fe5262ae302503af00a (diff)
downloadcryptography-a7abb4bec5a06f2d1d6cd896b2f362cd79c4d5a3.tar.gz
cryptography-a7abb4bec5a06f2d1d6cd896b2f362cd79c4d5a3.tar.bz2
cryptography-a7abb4bec5a06f2d1d6cd896b2f362cd79c4d5a3.zip
Merge pull request #1098 from alex/oxford-comma
Use an oxford comma
-rw-r--r--docs/security.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/security.rst b/docs/security.rst
index a31a2fc3..3d44cd3d 100644
--- a/docs/security.rst
+++ b/docs/security.rst
@@ -44,7 +44,7 @@ containing:
* The steps we will be taking to remedy the issue.
* The patches, if any, that will be applied to ``cryptography``.
* The date on which the ``cryptography`` team will apply these patches, issue
- new releases and publicly disclose the issue.
+ new releases, and publicly disclose the issue.
Simultaneously, the reporter of the issue will receive notification of the date
on which we plan to take the issue public.