Merge pull request #1613 from alex/bump-year

Bump some years that were missed.

4 files changed, 6 insertions, 6 deletions

diff --git a/docs/conf.py b/docs/conf.py
index fc16b38a..f674ebe8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -69,7 +69,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Cryptography'
-copyright = '2013-2014, Individual Contributors'
+copyright = '2013-2015, Individual Contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index e9ee9467..052e397f 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -299,7 +299,7 @@ A specific ``backend`` may provide one or more of these interfaces.
     .. method:: generate_dsa_parameters(key_size)
 
         :param int key_size: The length of the modulus in bits. It should be
-            either 1024, 2048 or 3072. For keys generated in 2014 this should
+            either 1024, 2048 or 3072. For keys generated in 2015 this should
             be at least 2048.
             Note that some applications (such as SSH) have not yet gained
             support for larger key sizes specified in FIPS 186-3 and are still
@@ -327,7 +327,7 @@ A specific ``backend`` may provide one or more of these interfaces.
     .. method:: generate_dsa_private_key_and_parameters(key_size)
 
         :param int key_size: The length of the modulus in bits. It should be
-            either 1024, 2048 or 3072. For keys generated in 2014 this should
+            either 1024, 2048 or 3072. For keys generated in 2015 this should
             be at least 2048.
             Note that some applications (such as SSH) have not yet gained
             support for larger key sizes specified in FIPS 186-3 and are still
diff --git a/docs/hazmat/primitives/asymmetric/dsa.rst b/docs/hazmat/primitives/asymmetric/dsa.rst
index df3c99fc..c2197d10 100644
--- a/docs/hazmat/primitives/asymmetric/dsa.rst
+++ b/docs/hazmat/primitives/asymmetric/dsa.rst
@@ -18,7 +18,7 @@ Generation
     generate a new set of parameters and key in one step.
 
     :param int key_size: The length of the modulus in bits. It should be
-        either 1024, 2048 or 3072. For keys generated in 2014 this should
+        either 1024, 2048 or 3072. For keys generated in 2015 this should
         be `at least 2048`_ (See page 41).  Note that some applications
         (such as SSH) have not yet gained support for larger key sizes
         specified in FIPS 186-3 and are still restricted to only the
@@ -42,7 +42,7 @@ Generation
     Generate DSA parameters using the provided ``backend``.
 
     :param int key_size: The length of the modulus in bits. It should be
-        either 1024, 2048 or 3072. For keys generated in 2014 this should
+        either 1024, 2048 or 3072. For keys generated in 2015 this should
         be `at least 2048`_ (See page 41).  Note that some applications
         (such as SSH) have not yet gained support for larger key sizes
         specified in FIPS 186-3 and are still restricted to only the
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst
index 837059bd..fa72cced 100644
--- a/docs/hazmat/primitives/asymmetric/rsa.rst
+++ b/docs/hazmat/primitives/asymmetric/rsa.rst
@@ -39,7 +39,7 @@ mathematical properties`_.
         Usually one of the small Fermat primes 3, 5, 17, 257, 65537. If in
         doubt you should `use 65537`_.
     :param int key_size: The length of the modulus in bits. For keys
-        generated in 2014 it is strongly recommended to be
+        generated in 2015 it is strongly recommended to be
         `at least 2048`_ (See page 41). It must not be less than 512.
         Some backends may have additional limitations.
     :param backend: A backend which provides