Merge branch 'cassandra-5.0' into trunk

Author: smiklosovic

README.asc

@@ -17,7 +17,7 @@ https://cwiki.apache.org/confluence/display/CASSANDRA2/Partitioners[Partitioning
 
 https://cwiki.apache.org/confluence/display/CASSANDRA2/DataModel[Row store] means that like relational databases, Cassandra organizes data by rows and columns. The Cassandra Query Language (CQL) is a close relative of SQL.
 
-For more information, see http://cassandra.apache.org/[the Apache Cassandra web site].
+For more information, see https://cassandra.apache.org/[the Apache Cassandra web site].
 
 Issues should be reported on https://issues.apache.org/jira/projects/CASSANDRA/issues/[The Cassandra Jira].
 
@@ -31,7 +31,7 @@ Getting started
 ---------------
 
 This short guide will walk you through getting a basic one node cluster up
-and running, and demonstrate some simple reads and writes. For a more-complete guide, please see the Apache Cassandra website's https://cassandra.apache.org/doc/latest/cassandra/getting_started/index.html[Getting Started Guide].
+and running, and demonstrate some simple reads and writes. For a more-complete guide, please see the Apache Cassandra website's https://cassandra.apache.org/doc/trunk/cassandra/getting-started/index.html[Getting Started Guide].
 
 First, we'll unpack our archive:
 
@@ -94,5 +94,5 @@ Wondering where to go from here?
     [email protected].
   * Subscribe to the Developer mailing list by sending a mail to
     [email protected].
-  * Visit the http://cassandra.apache.org/community/[community section] of the Cassandra website for more information on getting involved.
-  * Visit the http://cassandra.apache.org/doc/latest/development/index.html[development section] of the Cassandra website for more information on how to contribute.
+  * Visit the https://cassandra.apache.org/community/[community section] of the Cassandra website for more information on getting involved.
+  * Visit the https://cassandra.apache.org/doc/latest/development/index.html[development section] of the Cassandra website for more information on how to contribute.