Docs changes for 3.20

TheRealFalcon · TheRealFalcon · commit becfbe5996e4 · 2019-10-23T13:11:38.000-05:00
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -793,6 +793,7 @@ def default_retry_policy(self, policy):
     cloud = None
     """
     A dict of the cloud configuration. Example::
+        
         {
             # path to the secure connect bundle
             'secure_connect_bundle': '/path/to/secure-connect-dbname.zip'
diff --git a/docs.yaml b/docs.yaml
@@ -22,38 +22,44 @@ sections:
       # build extensions like libev
       CASS_DRIVER_NO_CYTHON=1 python setup.py build_ext --inplace --force
 versions:
-  - name: '3.19'
-    ref: ac2471f9
-  - name: '3.18'
-    ref: ec36b957
-  - name: '3.17'
-    ref: 38e359e1
-  - name: '3.16'
-    ref: '3.16.0'
-  - name: '3.15'
-    ref: '2ce0bd97'
-  - name: '3.14'
-    ref: '9af8bd19'
-  - name: '3.13'
-    ref: '3.13.0'
-  - name: '3.12'
-    ref: '43b9c995'
-  - name: '3.11'
-    ref: '3.11.0'
-  - name: '3.10'
-    ref: 64572368
-  - name: 3.9
-    ref: 3.9-doc
-  - name: 3.8
-    ref: 3.8-doc
-  - name: 3.7
-    ref: 3.7-doc
-  - name: 3.6
-    ref: 3.6-doc
-  - name: 3.5
-    ref: 3.5-doc
+  - name: '3.20'
+    ref: '38613962'
+#  - name: '3.19'
+#    ref: ac2471f9
+#  - name: '3.18'
+#    ref: ec36b957
+#  - name: '3.17'
+#    ref: 38e359e1
+#  - name: '3.16'
+#    ref: '3.16.0'
+#  - name: '3.15'
+#    ref: '2ce0bd97'
+#  - name: '3.14'
+#    ref: '9af8bd19'
+#  - name: '3.13'
+#    ref: '3.13.0'
+#  - name: '3.12'
+#    ref: '43b9c995'
+#  - name: '3.11'
+#    ref: '3.11.0'
+#  - name: '3.10'
+#    ref: 64572368
+#  - name: 3.9
+#    ref: 3.9-doc
+#  - name: 3.8
+#    ref: 3.8-doc
+#  - name: 3.7
+#    ref: 3.7-doc
+#  - name: 3.6
+#    ref: 3.6-doc
+#  - name: 3.5
+#    ref: 3.5-doc
 redirects:
   - \A\/(.*)/\Z: /\1.html
 rewrites:
   - search: cassandra.apache.org/doc/cql3/CQL.html
     replace: cassandra.apache.org/doc/cql3/CQL-3.0.html
+  - search: http://www.datastax.com/documentation/cql/3.1/
+    replace: https://docs.datastax.com/en/archived/cql/3.1/
+  - search: http://www.datastax.com/docs/1.2/cql_cli/cql/BATCH
+    replace: https://docs.datastax.com/en/dse/6.7/cql/cql/cql_reference/cql_commands/cqlBatch.html
diff --git a/docs/.nav b/docs/.nav
@@ -9,5 +9,6 @@ security
 upgrading
 user_defined_types
 dates_and_times
+cloud
 faq
 api
diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -20,6 +20,7 @@ Core Driver
    cassandra/concurrent
    cassandra/connection
    cassandra/util
+   cassandra/timestamps
    cassandra/io/asyncioreactor
    cassandra/io/asyncorereactor
    cassandra/io/eventletreactor
diff --git a/docs/cloud.rst b/docs/cloud.rst
@@ -23,16 +23,16 @@ Apollo Differences
 ==================
 In most circumstances, the client code for interacting with an Apollo cluster will be the same as interacting with any other Cassandra cluster. The exceptions being:
 
- * A cloud configuration must be passed to a :class:`~.Cluster` instance via the `cloud` attribute (as demonstrated above).
- * An SSL connection will be established automatically. Manual SSL configuration is not allowed, and using `ssl_context` or `ssl_options` will result in an exception.
- * A :class:`~.Cluster`'s `contact_points` attribute should not be used. The cloud config contains all of the necessary contact information.
- * If a consistency level is not specified for an execution profile or query, then :attr:`.ConsistencyLevel.LOCAL_QUORUM` will be used as the default.
+* A cloud configuration must be passed to a :class:`~.Cluster` instance via the `cloud` attribute (as demonstrated above).
+* An SSL connection will be established automatically. Manual SSL configuration is not allowed, and using `ssl_context` or `ssl_options` will result in an exception.
+* A :class:`~.Cluster`'s `contact_points` attribute should not be used. The cloud config contains all of the necessary contact information.
+* If a consistency level is not specified for an execution profile or query, then :attr:`.ConsistencyLevel.LOCAL_QUORUM` will be used as the default.
+
 
 Limitations
 ===========
 
 Event loops
------------
-
+^^^^^^^^^^^
 Twisted and Evenlet aren't supported yet. These event loops are still using the old way to configure
 SSL (ssl_options), which is not compatible with the secure connect bundle provided by Apollo.
diff --git a/docs/cqlengine/queryset.rst b/docs/cqlengine/queryset.rst
diff --git a/docs/index.rst b/docs/index.rst

Original file line number	Diff line number	Diff line change
`@@ -793,6 +793,7 @@ def default_retry_policy(self, policy):`
`793`	`793`	`cloud = None`
`794`	`794`	`"""`
`795`	`795`	`A dict of the cloud configuration. Example::`
	`796`	`+`
`796`	`797`	`{`
`797`	`798`	`# path to the secure connect bundle`
`798`	`799`	`'secure_connect_bundle': '/path/to/secure-connect-dbname.zip'`