Ninja: fix grammar for tuple type in CQL docs

Follow up for CASSANDRA-7527
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk