Merge branch 'cassandra-3.0' into cassandra-3.11

README.asc

@@ -49,7 +49,7 @@ be sitting in front of a prompt:
 Connected to Test Cluster at localhost:9160.
 [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
 Use HELP for help.
-cqlsh> 
+cqlsh>
 ----
 
 As the banner says, you can use 'help;' or '?' to see what CQL has to
@@ -57,7 +57,7 @@ offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
 something slightly more interesting:
 
 ----
-cqlsh> CREATE SCHEMA schema1 
+cqlsh> CREATE KEYSPACE schema1
        WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
 cqlsh> USE schema1;
 cqlsh:Schema1> CREATE TABLE users (
@@ -66,17 +66,17 @@ cqlsh:Schema1> CREATE TABLE users (
                  last varchar,
                  age int
                );
-cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
+cqlsh:Schema1> INSERT INTO users (user_id, first, last, age)
                VALUES ('jsmith', 'John', 'Smith', 42);
 cqlsh:Schema1> SELECT * FROM users;
  user_id | age | first | last
 ---------+-----+-------+-------
   jsmith |  42 |  john | smith
- cqlsh:Schema1> 
+cqlsh:Schema1>
 ----
 
 If your session looks similar to what's above, congrats, your single node
-cluster is operational! 
+cluster is operational!
 
 For more on what commands are supported by CQL, see
 http://cassandra.apache.org/doc/latest/cql/[the CQL reference]. A