diff --git a/README-dev.rst b/README-dev.rst
index deb2666f..e790e15b 100644
--- a/README-dev.rst
+++ b/README-dev.rst
@@ -7,6 +7,7 @@ Releasing
   * For beta releases, use a version like ``(2, 1, '0b1')``
   * For release candidates, use a version like ``(2, 1, '0rc1')``
   * When in doubt, follow PEP 440 versioning
+* Update the version in ``docs.yaml``
 
 * Commit the changelog and version changes
 * Tag the release.  For example: ``git tag -a 1.0.0 -m 'version 1.0.0'``
@@ -25,7 +26,7 @@ Releasing
 
 * Commit and push
 * Update 'cassandra-test' branch to reflect new release
-  
+
     * this is typically a matter of merging or rebasing onto master
     * test and push updated branch to origin
 
diff --git a/cassandra/cqlengine/columns.py b/cassandra/cqlengine/columns.py
index 3b5cbe24..064e4a91 100644
--- a/cassandra/cqlengine/columns.py
+++ b/cassandra/cqlengine/columns.py
@@ -699,7 +699,7 @@ class BaseCollectionColumn(Column):
     """
     Base Container type for collection-like columns.
 
-    https://cassandra.apache.org/doc/cql3/CQL.html#collections
+    http://cassandra.apache.org/doc/cql3/CQL-3.0.html#collections
     """
     def __init__(self, types, **kwargs):
         """
diff --git a/cassandra/cqlengine/functions.py b/cassandra/cqlengine/functions.py
index ccfe9de9..ee0fd10a 100644
--- a/cassandra/cqlengine/functions.py
+++ b/cassandra/cqlengine/functions.py
@@ -86,7 +86,7 @@ class MinTimeUUID(TimeUUIDQueryFunction):
     """
     return a fake timeuuid corresponding to the smallest possible timeuuid for the given timestamp
 
-    http://cassandra.apache.org/doc/cql3/CQL.html#timeuuidFun
+    http://cassandra.apache.org/doc/cql3/CQL-3.0.html#timeuuidFun
     """
     format_string = 'MinTimeUUID(%({0})s)'
 
@@ -95,7 +95,7 @@ class MaxTimeUUID(TimeUUIDQueryFunction):
     """
     return a fake timeuuid corresponding to the largest possible timeuuid for the given timestamp
 
-    http://cassandra.apache.org/doc/cql3/CQL.html#timeuuidFun
+    http://cassandra.apache.org/doc/cql3/CQL-3.0.html#timeuuidFun
     """
     format_string = 'MaxTimeUUID(%({0})s)'
 
@@ -104,7 +104,7 @@ class Token(BaseQueryFunction):
     """
     compute the token for a given partition key
 
-    http://cassandra.apache.org/doc/cql3/CQL.html#tokenFun
+    http://cassandra.apache.org/doc/cql3/CQL-3.0.html#tokenFun
     """
     def __init__(self, *values):
         if len(values) == 1 and isinstance(values[0], (list, tuple)):
diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py
index cf682c7a..76c4fe75 100644
--- a/cassandra/cqlengine/query.py
+++ b/cassandra/cqlengine/query.py
@@ -135,7 +135,7 @@ class BatchQuery(object):
     """
     Handles the batching of queries
 
-    http://www.datastax.com/docs/1.2/cql_cli/cql/BATCH
+    http://docs.datastax.com/en/cql/3.0/cql/cql_reference/batch_r.html
 
     See :doc:`/cqlengine/batches` for more details.
     """
diff --git a/docs/cqlengine/queryset.rst b/docs/cqlengine/queryset.rst
index c9c33932..340bc5c5 100644
--- a/docs/cqlengine/queryset.rst
+++ b/docs/cqlengine/queryset.rst
@@ -224,7 +224,7 @@ Token Function
     Token functon may be used only on special, virtual column pk__token, representing token of partition key (it also works for composite partition keys).
     Cassandra orders returned items by value of partition key token, so using cqlengine.Token we can easy paginate through all table rows.
 
-    See http://cassandra.apache.org/doc/cql3/CQL.html#tokenFun
+    See http://cassandra.apache.org/doc/cql3/CQL-3.0.html#tokenFun
 
     *Example*
 
diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index 2fa86b8f..93ac213c 100644
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -250,7 +250,7 @@ See :ref:`query-paging` for full details.
 Protocol-Level Batch Statements
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 With version 1 of the native protocol, batching of statements required
-using a `BATCH cql query <http://cassandra.apache.org/doc/cql3/CQL.html#batchStmt>`_.
+using a `BATCH cql query <http://cassandra.apache.org/doc/cql3/CQL-3.0.html#batchStmt>`_.
 With version 2 of the native protocol, you can now batch statements at
 the protocol level. This allows you to use many different prepared
 statements within a single batch.