Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/statusgossip.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/statusgossip.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/statusgossip.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/statusgossip.txt Tue May 
16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _statusgossip
+.. _nodetool_statusgossip:
 
 statusgossip
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/statushandoff.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/statushandoff.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/statushandoff.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/statushandoff.txt Tue 
May 16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _statushandoff
+.. _nodetool_statushandoff:
 
 statushandoff
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/stop.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/stop.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/stop.txt (original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/stop.txt Tue May 16 
02:01:22 2017
@@ -1,4 +1,4 @@
-.. _stop
+.. _nodetool_stop:
 
 stop
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/stopdaemon.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/stopdaemon.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/stopdaemon.txt (original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/stopdaemon.txt Tue May 
16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _stopdaemon
+.. _nodetool_stopdaemon:
 
 stopdaemon
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablehistograms.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablehistograms.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablehistograms.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablehistograms.txt Tue 
May 16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _tablehistograms
+.. _nodetool_tablehistograms:
 
 tablehistograms
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablestats.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablestats.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablestats.txt (original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/tablestats.txt Tue May 
16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _tablestats
+.. _nodetool_tablestats:
 
 tablestats
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/toppartitions.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/toppartitions.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/toppartitions.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/toppartitions.txt Tue 
May 16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _toppartitions
+.. _nodetool_toppartitions:
 
 toppartitions
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/tpstats.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/tpstats.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/tpstats.txt (original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/tpstats.txt Tue May 16 
02:01:22 2017
@@ -1,4 +1,4 @@
-.. _tpstats
+.. _nodetool_tpstats:
 
 tpstats
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/truncatehints.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/truncatehints.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/truncatehints.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/truncatehints.txt Tue 
May 16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _truncatehints
+.. _nodetool_truncatehints:
 
 truncatehints
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/upgradesstables.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/upgradesstables.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/upgradesstables.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/upgradesstables.txt Tue 
May 16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _upgradesstables
+.. _nodetool_upgradesstables:
 
 upgradesstables
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/verify.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/verify.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/verify.txt (original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/verify.txt Tue May 16 
02:01:22 2017
@@ -1,4 +1,4 @@
-.. _verify
+.. _nodetool_verify:
 
 verify
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/version.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/version.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/version.txt (original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/version.txt Tue May 16 
02:01:22 2017
@@ -1,4 +1,4 @@
-.. _version
+.. _nodetool_version:
 
 version
 -------

Modified: cassandra/site/src/doc/4.0/_sources/tools/nodetool/viewbuildstatus.txt
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_sources/tools/nodetool/viewbuildstatus.txt?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_sources/tools/nodetool/viewbuildstatus.txt 
(original)
+++ cassandra/site/src/doc/4.0/_sources/tools/nodetool/viewbuildstatus.txt Tue 
May 16 02:01:22 2017
@@ -1,4 +1,4 @@
-.. _viewbuildstatus
+.. _nodetool_viewbuildstatus:
 
 viewbuildstatus
 -------

Modified: cassandra/site/src/doc/4.0/_static/basic.css
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_static/basic.css?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_static/basic.css (original)
+++ cassandra/site/src/doc/4.0/_static/basic.css Tue May 16 02:01:22 2017
@@ -494,6 +494,13 @@ pre {
     overflow-y: hidden;  /* fixes display issues on Chrome browsers */
 }
 
+span.pre {
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    -webkit-hyphens: none;
+    hyphens: none;
+}
+
 td.linenos pre {
     padding: 5px 0px;
     border: 0;

Modified: cassandra/site/src/doc/4.0/_static/searchtools.js
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/_static/searchtools.js?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/_static/searchtools.js (original)
+++ cassandra/site/src/doc/4.0/_static/searchtools.js Tue May 16 02:01:22 2017
@@ -226,6 +226,106 @@ var Scorer = {
 };
 
 
+
+
+
+var splitChars = (function() {
+    var result = {};
+    var singles = [96, 180, 187, 191, 215, 247, 749, 885, 903, 907, 909, 930, 
1014, 1648,
+         1748, 1809, 2416, 2473, 2481, 2526, 2601, 2609, 2612, 2615, 2653, 
2702,
+         2706, 2729, 2737, 2740, 2857, 2865, 2868, 2910, 2928, 2948, 2961, 
2971,
+         2973, 3085, 3089, 3113, 3124, 3213, 3217, 3241, 3252, 3295, 3341, 
3345,
+         3369, 3506, 3516, 3633, 3715, 3721, 3736, 3744, 3748, 3750, 3756, 
3761,
+         3781, 3912, 4239, 4347, 4681, 4695, 4697, 4745, 4785, 4799, 4801, 
4823,
+         4881, 5760, 5901, 5997, 6313, 7405, 8024, 8026, 8028, 8030, 8117, 
8125,
+         8133, 8181, 8468, 8485, 8487, 8489, 8494, 8527, 11311, 11359, 11687, 
11695,
+         11703, 11711, 11719, 11727, 11735, 12448, 12539, 43010, 43014, 43019, 
43587,
+         43696, 43713, 64286, 64297, 64311, 64317, 64319, 64322, 64325, 65141];
+    var i, j, start, end;
+    for (i = 0; i < singles.length; i++) {
+        result[singles[i]] = true;
+    }
+    var ranges = [[0, 47], [58, 64], [91, 94], [123, 169], [171, 177], [182, 
184], [706, 709],
+         [722, 735], [741, 747], [751, 879], [888, 889], [894, 901], [1154, 
1161],
+         [1318, 1328], [1367, 1368], [1370, 1376], [1416, 1487], [1515, 1519], 
[1523, 1568],
+         [1611, 1631], [1642, 1645], [1750, 1764], [1767, 1773], [1789, 1790], 
[1792, 1807],
+         [1840, 1868], [1958, 1968], [1970, 1983], [2027, 2035], [2038, 2041], 
[2043, 2047],
+         [2070, 2073], [2075, 2083], [2085, 2087], [2089, 2307], [2362, 2364], 
[2366, 2383],
+         [2385, 2391], [2402, 2405], [2419, 2424], [2432, 2436], [2445, 2446], 
[2449, 2450],
+         [2483, 2485], [2490, 2492], [2494, 2509], [2511, 2523], [2530, 2533], 
[2546, 2547],
+         [2554, 2564], [2571, 2574], [2577, 2578], [2618, 2648], [2655, 2661], 
[2672, 2673],
+         [2677, 2692], [2746, 2748], [2750, 2767], [2769, 2783], [2786, 2789], 
[2800, 2820],
+         [2829, 2830], [2833, 2834], [2874, 2876], [2878, 2907], [2914, 2917], 
[2930, 2946],
+         [2955, 2957], [2966, 2968], [2976, 2978], [2981, 2983], [2987, 2989], 
[3002, 3023],
+         [3025, 3045], [3059, 3076], [3130, 3132], [3134, 3159], [3162, 3167], 
[3170, 3173],
+         [3184, 3191], [3199, 3204], [3258, 3260], [3262, 3293], [3298, 3301], 
[3312, 3332],
+         [3386, 3388], [3390, 3423], [3426, 3429], [3446, 3449], [3456, 3460], 
[3479, 3481],
+         [3518, 3519], [3527, 3584], [3636, 3647], [3655, 3663], [3674, 3712], 
[3717, 3718],
+         [3723, 3724], [3726, 3731], [3752, 3753], [3764, 3772], [3774, 3775], 
[3783, 3791],
+         [3802, 3803], [3806, 3839], [3841, 3871], [3892, 3903], [3949, 3975], 
[3980, 4095],
+         [4139, 4158], [4170, 4175], [4182, 4185], [4190, 4192], [4194, 4196], 
[4199, 4205],
+         [4209, 4212], [4226, 4237], [4250, 4255], [4294, 4303], [4349, 4351], 
[4686, 4687],
+         [4702, 4703], [4750, 4751], [4790, 4791], [4806, 4807], [4886, 4887], 
[4955, 4968],
+         [4989, 4991], [5008, 5023], [5109, 5120], [5741, 5742], [5787, 5791], 
[5867, 5869],
+         [5873, 5887], [5906, 5919], [5938, 5951], [5970, 5983], [6001, 6015], 
[6068, 6102],
+         [6104, 6107], [6109, 6111], [6122, 6127], [6138, 6159], [6170, 6175], 
[6264, 6271],
+         [6315, 6319], [6390, 6399], [6429, 6469], [6510, 6511], [6517, 6527], 
[6572, 6592],
+         [6600, 6607], [6619, 6655], [6679, 6687], [6741, 6783], [6794, 6799], 
[6810, 6822],
+         [6824, 6916], [6964, 6980], [6988, 6991], [7002, 7042], [7073, 7085], 
[7098, 7167],
+         [7204, 7231], [7242, 7244], [7294, 7400], [7410, 7423], [7616, 7679], 
[7958, 7959],
+         [7966, 7967], [8006, 8007], [8014, 8015], [8062, 8063], [8127, 8129], 
[8141, 8143],
+         [8148, 8149], [8156, 8159], [8173, 8177], [8189, 8303], [8306, 8307], 
[8314, 8318],
+         [8330, 8335], [8341, 8449], [8451, 8454], [8456, 8457], [8470, 8472], 
[8478, 8483],
+         [8506, 8507], [8512, 8516], [8522, 8525], [8586, 9311], [9372, 9449], 
[9472, 10101],
+         [10132, 11263], [11493, 11498], [11503, 11516], [11518, 11519], 
[11558, 11567],
+         [11622, 11630], [11632, 11647], [11671, 11679], [11743, 11822], 
[11824, 12292],
+         [12296, 12320], [12330, 12336], [12342, 12343], [12349, 12352], 
[12439, 12444],
+         [12544, 12548], [12590, 12592], [12687, 12689], [12694, 12703], 
[12728, 12783],
+         [12800, 12831], [12842, 12880], [12896, 12927], [12938, 12976], 
[12992, 13311],
+         [19894, 19967], [40908, 40959], [42125, 42191], [42238, 42239], 
[42509, 42511],
+         [42540, 42559], [42592, 42593], [42607, 42622], [42648, 42655], 
[42736, 42774],
+         [42784, 42785], [42889, 42890], [42893, 43002], [43043, 43055], 
[43062, 43071],
+         [43124, 43137], [43188, 43215], [43226, 43249], [43256, 43258], 
[43260, 43263],
+         [43302, 43311], [43335, 43359], [43389, 43395], [43443, 43470], 
[43482, 43519],
+         [43561, 43583], [43596, 43599], [43610, 43615], [43639, 43641], 
[43643, 43647],
+         [43698, 43700], [43703, 43704], [43710, 43711], [43715, 43738], 
[43742, 43967],
+         [44003, 44015], [44026, 44031], [55204, 55215], [55239, 55242], 
[55292, 55295],
+         [57344, 63743], [64046, 64047], [64110, 64111], [64218, 64255], 
[64263, 64274],
+         [64280, 64284], [64434, 64466], [64830, 64847], [64912, 64913], 
[64968, 65007],
+         [65020, 65135], [65277, 65295], [65306, 65312], [65339, 65344], 
[65371, 65381],
+         [65471, 65473], [65480, 65481], [65488, 65489], [65496, 65497]];
+    for (i = 0; i < ranges.length; i++) {
+        start = ranges[i][0];
+        end = ranges[i][1];
+        for (j = start; j <= end; j++) {
+            result[j] = true;
+        }
+    }
+    return result;
+})();
+
+function splitQuery(query) {
+    var result = [];
+    var start = -1;
+    for (var i = 0; i < query.length; i++) {
+        if (splitChars[query.charCodeAt(i)]) {
+            if (start !== -1) {
+                result.push(query.slice(start, i));
+                start = -1;
+            }
+        } else if (start === -1) {
+            start = i;
+        }
+    }
+    if (start !== -1) {
+        result.push(query.slice(start));
+    }
+    return result;
+}
+
+
+
+
 /**
  * Search Module
  */
@@ -324,7 +424,7 @@ var Search = {
     var searchterms = [];
     var excluded = [];
     var hlterms = [];
-    var tmp = query.split(/\s+/);
+    var tmp = splitQuery(query);
     var objectterms = [];
     for (i = 0; i < tmp.length; i++) {
       if (tmp[i] !== "") {

Modified: cassandra/site/src/doc/4.0/architecture/dynamo.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/architecture/dynamo.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/architecture/dynamo.html (original)
+++ cassandra/site/src/doc/4.0/architecture/dynamo.html Tue May 16 02:01:22 2017
@@ -77,7 +77,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>
@@ -167,7 +167,7 @@ order to consider the operation a succes
 <dt><code class="docutils literal"><span 
class="pre">EACH_QUORUM</span></code></dt>
 <dd>A majority of the replicas in each datacenter must respond.</dd>
 <dt><code class="docutils literal"><span 
class="pre">LOCAL_ONE</span></code></dt>
-<dd>Only a single replica must respond.  In a multi-datacenter cluster, this 
also guarantees that read requests are not
+<dd>Only a single replica must respond.  In a multi-datacenter cluster, this 
also gaurantees that read requests are not
 sent to replicas in a remote datacenter.</dd>
 <dt><code class="docutils literal"><span class="pre">ANY</span></code></dt>
 <dd>A single replica may respond, or the coordinator may store a hint. If a 
hint is stored, the coordinator will later
@@ -217,4 +217,4 @@ throughput, latency, and availability.</
     <div class="col-md-2">
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file

Modified: cassandra/site/src/doc/4.0/architecture/guarantees.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/architecture/guarantees.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/architecture/guarantees.html (original)
+++ cassandra/site/src/doc/4.0/architecture/guarantees.html Tue May 16 02:01:22 
2017
@@ -70,7 +70,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>

Modified: cassandra/site/src/doc/4.0/architecture/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/architecture/index.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/architecture/index.html (original)
+++ cassandra/site/src/doc/4.0/architecture/index.html Tue May 16 02:01:22 2017
@@ -67,7 +67,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>

Modified: cassandra/site/src/doc/4.0/architecture/overview.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/architecture/overview.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/architecture/overview.html (original)
+++ cassandra/site/src/doc/4.0/architecture/overview.html Tue May 16 02:01:22 
2017
@@ -70,7 +70,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>

Modified: cassandra/site/src/doc/4.0/architecture/storage_engine.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/architecture/storage_engine.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/architecture/storage_engine.html (original)
+++ cassandra/site/src/doc/4.0/architecture/storage_engine.html Tue May 16 
02:01:22 2017
@@ -75,7 +75,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>
@@ -95,10 +95,53 @@ extra-footer: '
 <h1>Storage Engine<a class="headerlink" href="#storage-engine" 
title="Permalink to this headline">¶</a></h1>
 <div class="section" id="commitlog">
 <span id="commit-log"></span><h2>CommitLog<a class="headerlink" 
href="#commitlog" title="Permalink to this headline">¶</a></h2>
-<div class="admonition-todo admonition" id="index-0">
-<p class="first admonition-title">Todo</p>
-<p class="last">todo</p>
+<p>Commitlogs are an append only log of all mutations local to a Cassandra 
node. Any data written to Cassandra will first be written to a commit log 
before being written to a memtable. This provides durability in the case of 
unexpected shutdown. On startup, any mutations in the commit log will be 
applied to memtables.</p>
+<p>All mutations write optimized by storing in commitlog segments, reducing 
the number of seeks needed to write to disk. Commitlog Segments are limited by 
the &#8220;commitlog_segment_size_in_mb&#8221; option, once the size is 
reached, a new commitlog segment is created. Commitlog segments can be 
archived, deleted, or recycled once all its data has been flushed to SSTables.  
Commitlog segments are truncated when Cassandra has written data older than a 
certain point to the SSTables. Running &#8220;nodetool drain&#8221; before 
stopping Cassandra will write everything in the memtables to SSTables and 
remove the need to sync with the commitlogs on startup.</p>
+<ul class="simple">
+<li><code class="docutils literal"><span 
class="pre">commitlog_segment_size_in_mb</span></code>: The default size is 32, 
which is almost always fine, but if you are archiving commitlog segments (see 
commitlog_archiving.properties), then you probably want a finer granularity of 
archiving; 8 or 16 MB is reasonable. Max mutation size is also configurable via 
max_mutation_size_in_kb setting in cassandra.yaml. The default is half the size 
commitlog_segment_size_in_mb * 1024.</li>
+</ul>
+<p><strong>*NOTE: If max_mutation_size_in_kb is set explicitly then 
commitlog_segment_size_in_mb must be set to at least twice the size of 
max_mutation_size_in_kb / 1024*</strong></p>
+<p><em>Default Value:</em> 32</p>
+<p>Commitlogs are an append only log of all mutations local to a Cassandra 
node. Any data written to Cassandra will first be written to a commit log 
before being written to a memtable. This provides durability in the case of 
unexpected shutdown. On startup, any mutations in the commit log will be 
applied.</p>
+<ul>
+<li><p class="first"><code class="docutils literal"><span 
class="pre">commitlog_sync</span></code>: may be either “periodic” or 
“batch.”</p>
+<ul>
+<li><p class="first"><code class="docutils literal"><span 
class="pre">batch</span></code>: In batch mode, Cassandra won’t ack writes 
until the commit log has been fsynced to disk. It will wait 
&#8220;commitlog_sync_batch_window_in_ms&#8221; milliseconds between fsyncs. 
This window should be kept short because the writer threads will be unable to 
do extra work while waiting. You may need to increase concurrent_writes for the 
same reason.</p>
+<ul class="simple">
+<li><code class="docutils literal"><span 
class="pre">commitlog_sync_batch_window_in_ms</span></code>: Time to wait 
between &#8220;batch&#8221; fsyncs</li>
+</ul>
+<p><em>Default Value:</em> 2</p>
+</li>
+<li><p class="first"><code class="docutils literal"><span 
class="pre">periodic</span></code>: In periodic mode, writes are immediately 
ack&#8217;ed, and the CommitLog is simply synced every 
&#8220;commitlog_sync_period_in_ms&#8221; milliseconds.</p>
+<ul class="simple">
+<li><code class="docutils literal"><span 
class="pre">commitlog_sync_period_in_ms</span></code>: Time to wait between 
&#8220;periodic&#8221; fsyncs</li>
+</ul>
+<p><em>Default Value:</em> 10000</p>
+</li>
+</ul>
+</li>
+</ul>
+<p><em>Default Value:</em> batch</p>
+<p><strong>* NOTE: In the event of an unexpected shutdown, Cassandra can lose 
up to the sync period or more if the sync is delayed. If using 
&#8220;batch&#8221; mode, it is recommended to store commitlogs in a separate, 
dedicated device.</strong></p>
+<ul class="simple">
+<li><code class="docutils literal"><span 
class="pre">commitlog_directory</span></code>: This option is commented out by 
default When running on magnetic HDD, this should be a separate spindle than 
the data directories. If not set, the default directory is 
$CASSANDRA_HOME/data/commitlog.</li>
+</ul>
+<p><em>Default Value:</em> /var/lib/cassandra/commitlog</p>
+<ul class="simple">
+<li><code class="docutils literal"><span 
class="pre">commitlog_compression</span></code>: Compression to apply to the 
commitlog. If omitted, the commit log will be written uncompressed.  LZ4, 
Snappy, and Deflate compressors are supported.</li>
+</ul>
+<p>(Default Value: (complex option):</p>
+<div class="highlight-default"><div class="highlight"><pre><span class="c">#   
- class_name: LZ4Compressor</span>
+<span class="c">#     parameters:</span>
+<span class="c">#         -</span>
+</pre></div>
 </div>
+<ul class="simple">
+<li><code class="docutils literal"><span 
class="pre">commitlog_total_space_in_mb</span></code>: Total space to use for 
commit logs on disk.</li>
+</ul>
+<p>If space gets above this value, Cassandra will flush every dirty CF in the 
oldest segment and remove it. So a small total commitlog space will tend to 
cause more flush activity on less-active columnfamilies.</p>
+<p>The default value is the smaller of 8192, and 1/4 of the total space of the 
commitlog volume.</p>
+<p><em>Default Value:</em> 8192</p>
 </div>
 <div class="section" id="memtables">
 <span id="id1"></span><h2>Memtables<a class="headerlink" href="#memtables" 
title="Permalink to this headline">¶</a></h2>

Modified: cassandra/site/src/doc/4.0/bugs.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/bugs.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/bugs.html (original)
+++ cassandra/site/src/doc/4.0/bugs.html Tue May 16 02:01:22 2017
@@ -61,7 +61,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" 
href="#">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="contactus.html">Contact us</a></li>
@@ -84,7 +84,7 @@ extra-footer: '
 ticket through the <a class="reference external" 
href="https://issues.apache.org/jira/browse/CASSANDRA";>Apache Cassandra 
JIRA</a>. Please provide as much
 details as you can on your problem, and don&#8217;t forget to indicate which 
version of Cassandra you are running and on which
 environment.</p>
-<p>Further details on how to contribute can be found at our <a 
class="reference internal" href="development/index.html"><span 
class="doc">Cassandra Development</span></a> section. Please note that the 
source of
+<p>Further details on how to contribute can be found at our <a 
class="reference internal" href="development/index.html"><span 
class="doc">Contributing to Cassandra</span></a> section. Please note that the 
source of
 this documentation is part of the Cassandra git repository and hence 
contributions to the documentation should follow the
 same path.</p>
 </div>

Modified: cassandra/site/src/doc/4.0/configuration/cassandra_config_file.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/configuration/cassandra_config_file.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/configuration/cassandra_config_file.html 
(original)
+++ cassandra/site/src/doc/4.0/configuration/cassandra_config_file.html Tue May 
16 02:01:22 2017
@@ -93,7 +93,6 @@ extra-footer: '
 <li class="toctree-l3"><a class="reference internal" 
href="#disk-failure-policy"><code class="docutils literal"><span 
class="pre">disk_failure_policy</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#commit-failure-policy"><code class="docutils literal"><span 
class="pre">commit_failure_policy</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#prepared-statements-cache-size-mb"><code class="docutils literal"><span 
class="pre">prepared_statements_cache_size_mb</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#thrift-prepared-statements-cache-size-mb"><code class="docutils 
literal"><span 
class="pre">thrift_prepared_statements_cache_size_mb</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#key-cache-size-in-mb"><code class="docutils literal"><span 
class="pre">key_cache_size_in_mb</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#key-cache-save-period"><code class="docutils literal"><span 
class="pre">key_cache_save_period</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#key-cache-keys-to-save"><code class="docutils literal"><span 
class="pre">key_cache_keys_to_save</span></code></a></li>
@@ -146,21 +145,13 @@ extra-footer: '
 <li class="toctree-l3"><a class="reference internal" 
href="#native-transport-max-frame-size-in-mb"><code class="docutils 
literal"><span 
class="pre">native_transport_max_frame_size_in_mb</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#native-transport-max-concurrent-connections"><code class="docutils 
literal"><span 
class="pre">native_transport_max_concurrent_connections</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#native-transport-max-concurrent-connections-per-ip"><code 
class="docutils literal"><span 
class="pre">native_transport_max_concurrent_connections_per_ip</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" href="#start-rpc"><code 
class="docutils literal"><span class="pre">start_rpc</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="#rpc-address"><code 
class="docutils literal"><span class="pre">rpc_address</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#rpc-interface"><code class="docutils literal"><span 
class="pre">rpc_interface</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#rpc-interface-prefer-ipv6"><code class="docutils literal"><span 
class="pre">rpc_interface_prefer_ipv6</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" href="#rpc-port"><code 
class="docutils literal"><span class="pre">rpc_port</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#broadcast-rpc-address"><code class="docutils literal"><span 
class="pre">broadcast_rpc_address</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#rpc-keepalive"><code class="docutils literal"><span 
class="pre">rpc_keepalive</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#rpc-server-type"><code class="docutils literal"><span 
class="pre">rpc_server_type</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#rpc-min-threads"><code class="docutils literal"><span 
class="pre">rpc_min_threads</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#rpc-max-threads"><code class="docutils literal"><span 
class="pre">rpc_max_threads</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#rpc-send-buff-size-in-bytes"><code class="docutils literal"><span 
class="pre">rpc_send_buff_size_in_bytes</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#rpc-recv-buff-size-in-bytes"><code class="docutils literal"><span 
class="pre">rpc_recv_buff_size_in_bytes</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#internode-send-buff-size-in-bytes"><code class="docutils literal"><span 
class="pre">internode_send_buff_size_in_bytes</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#internode-recv-buff-size-in-bytes"><code class="docutils literal"><span 
class="pre">internode_recv_buff_size_in_bytes</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#thrift-framed-transport-size-in-mb"><code class="docutils literal"><span 
class="pre">thrift_framed_transport_size_in_mb</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#incremental-backups"><code class="docutils literal"><span 
class="pre">incremental_backups</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#snapshot-before-compaction"><code class="docutils literal"><span 
class="pre">snapshot_before_compaction</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#auto-snapshot"><code class="docutils literal"><span 
class="pre">auto_snapshot</span></code></a></li>
@@ -181,21 +172,18 @@ extra-footer: '
 <li class="toctree-l3"><a class="reference internal" 
href="#slow-query-log-timeout-in-ms"><code class="docutils literal"><span 
class="pre">slow_query_log_timeout_in_ms</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#cross-node-timeout"><code class="docutils literal"><span 
class="pre">cross_node_timeout</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#streaming-keep-alive-period-in-secs"><code class="docutils 
literal"><span 
class="pre">streaming_keep_alive_period_in_secs</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#streaming-connections-per-host"><code class="docutils literal"><span 
class="pre">streaming_connections_per_host</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#phi-convict-threshold"><code class="docutils literal"><span 
class="pre">phi_convict_threshold</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#endpoint-snitch"><code class="docutils literal"><span 
class="pre">endpoint_snitch</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#dynamic-snitch-update-interval-in-ms"><code class="docutils 
literal"><span 
class="pre">dynamic_snitch_update_interval_in_ms</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#dynamic-snitch-reset-interval-in-ms"><code class="docutils 
literal"><span 
class="pre">dynamic_snitch_reset_interval_in_ms</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#dynamic-snitch-badness-threshold"><code class="docutils literal"><span 
class="pre">dynamic_snitch_badness_threshold</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#request-scheduler"><code class="docutils literal"><span 
class="pre">request_scheduler</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#request-scheduler-options"><code class="docutils literal"><span 
class="pre">request_scheduler_options</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#request-scheduler-id"><code class="docutils literal"><span 
class="pre">request_scheduler_id</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#server-encryption-options"><code class="docutils literal"><span 
class="pre">server_encryption_options</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#client-encryption-options"><code class="docutils literal"><span 
class="pre">client_encryption_options</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#internode-compression"><code class="docutils literal"><span 
class="pre">internode_compression</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#inter-dc-tcp-nodelay"><code class="docutils literal"><span 
class="pre">inter_dc_tcp_nodelay</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#tracetype-query-ttl"><code class="docutils literal"><span 
class="pre">tracetype_query_ttl</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#tracetype-repair-ttl"><code class="docutils literal"><span 
class="pre">tracetype_repair_ttl</span></code></a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#gc-log-threshold-in-ms"><code class="docutils literal"><span 
class="pre">gc_log_threshold_in_ms</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#enable-user-defined-functions"><code class="docutils literal"><span 
class="pre">enable_user_defined_functions</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#enable-scripted-user-defined-functions"><code class="docutils 
literal"><span 
class="pre">enable_scripted_user_defined_functions</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#windows-timer-interval"><code class="docutils literal"><span 
class="pre">windows_timer_interval</span></code></a></li>
@@ -206,10 +194,16 @@ extra-footer: '
 <li class="toctree-l3"><a class="reference internal" 
href="#batch-size-fail-threshold-in-kb"><code class="docutils literal"><span 
class="pre">batch_size_fail_threshold_in_kb</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#unlogged-batch-across-partitions-warn-threshold"><code class="docutils 
literal"><span 
class="pre">unlogged_batch_across_partitions_warn_threshold</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#compaction-large-partition-warning-threshold-mb"><code class="docutils 
literal"><span 
class="pre">compaction_large_partition_warning_threshold_mb</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#gc-log-threshold-in-ms"><code class="docutils literal"><span 
class="pre">gc_log_threshold_in_ms</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#gc-warn-threshold-in-ms"><code class="docutils literal"><span 
class="pre">gc_warn_threshold_in_ms</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#max-value-size-in-mb"><code class="docutils literal"><span 
class="pre">max_value_size_in_mb</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#back-pressure-enabled"><code class="docutils literal"><span 
class="pre">back_pressure_enabled</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="#back-pressure-strategy"><code class="docutils literal"><span 
class="pre">back_pressure_strategy</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#otc-coalescing-strategy"><code class="docutils literal"><span 
class="pre">otc_coalescing_strategy</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#otc-coalescing-window-us"><code class="docutils literal"><span 
class="pre">otc_coalescing_window_us</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#otc-coalescing-enough-coalesced-messages"><code class="docutils 
literal"><span 
class="pre">otc_coalescing_enough_coalesced_messages</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#otc-backlog-expiration-interval-ms"><code class="docutils literal"><span 
class="pre">otc_backlog_expiration_interval_ms</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="#ideal-consistency-level"><code class="docutils literal"><span 
class="pre">ideal_consistency_level</span></code></a></li>
 </ul>
 </li>
 </ul>
@@ -217,7 +211,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>
@@ -360,7 +354,7 @@ PasswordAuthenticator}.</p>
 <ul class="simple">
 <li>AllowAllAuthenticator performs no checks - set it to disable 
authentication.</li>
 <li>PasswordAuthenticator relies on username/password pairs to authenticate
-users. It keeps usernames and hashed passwords in system_auth.credentials 
table.
+users. It keeps usernames and hashed passwords in system_auth.roles table.
 Please increase system_auth keyspace replication factor if you use this 
authenticator.
 If using PasswordAuthenticator, CassandraRoleManager must also be used (see 
below)</li>
 </ul>
@@ -373,7 +367,7 @@ Out of the box, Cassandra provides org.a
 CassandraAuthorizer}.</p>
 <ul class="simple">
 <li>AllowAllAuthorizer allows any action to any user - set it to disable 
authorization.</li>
-<li>CassandraAuthorizer stores permissions in system_auth.permissions table. 
Please
+<li>CassandraAuthorizer stores permissions in system_auth.role_permissions 
table. Please
 increase system_auth keyspace replication factor if you use this 
authorizer.</li>
 </ul>
 <p><em>Default Value:</em> AllowAllAuthorizer</p>
@@ -531,9 +525,9 @@ data at CL.ONE!</dd>
 <p>Policy for commit disk failures:</p>
 <dl class="docutils">
 <dt>die</dt>
-<dd>shut down gossip and Thrift and kill the JVM, so the node can be 
replaced.</dd>
+<dd>shut down the node and kill the JVM, so the node can be replaced.</dd>
 <dt>stop</dt>
-<dd>shut down gossip and Thrift, leaving the node effectively dead, but
+<dd>shut down the node, leaving the node effectively dead, but
 can still be inspected via JMX.</dd>
 <dt>stop_commit</dt>
 <dd>shutdown the commit log, letting writes collect but
@@ -558,13 +552,6 @@ fit in the cache. In most cases it is no
 Constantly re-preparing statements is a performance penalty.</p>
 <p>Default value (&#8220;auto&#8221;) is 1/256th of the heap or 10MB, 
whichever is greater</p>
 </div>
-<div class="section" id="thrift-prepared-statements-cache-size-mb">
-<h2><code class="docutils literal"><span 
class="pre">thrift_prepared_statements_cache_size_mb</span></code><a 
class="headerlink" href="#thrift-prepared-statements-cache-size-mb" 
title="Permalink to this headline">¶</a></h2>
-<p>Maximum size of the Thrift prepared statement cache</p>
-<p>If you do not use Thrift at all, it is safe to leave this value at 
&#8220;auto&#8221;.</p>
-<p>See description of &#8216;prepared_statements_cache_size_mb&#8217; above 
for more information.</p>
-<p>Default value (&#8220;auto&#8221;) is 1/256th of the heap or 10MB, 
whichever is greater</p>
-</div>
 <div class="section" id="key-cache-size-in-mb">
 <h2><code class="docutils literal"><span 
class="pre">key_cache_size_in_mb</span></code><a class="headerlink" 
href="#key-cache-size-in-mb" title="Permalink to this headline">¶</a></h2>
 <p>Maximum size of the key cache in memory.</p>
@@ -1000,8 +987,7 @@ used to allow/disallow connections from
 <div class="section" id="start-native-transport">
 <h2><code class="docutils literal"><span 
class="pre">start_native_transport</span></code><a class="headerlink" 
href="#start-native-transport" title="Permalink to this headline">¶</a></h2>
 <p>Whether to start the native transport server.
-Please note that the address on which the native transport is bound is the
-same as the rpc_address. The port however is different and specified below.</p>
+The address on which the native transport is bound is defined by 
rpc_address.</p>
 <p><em>Default Value:</em> true</p>
 </div>
 <div class="section" id="native-transport-port">
@@ -1025,10 +1011,8 @@ keeping native_transport_port unencrypte
 <div class="section" id="native-transport-max-threads">
 <h2><code class="docutils literal"><span 
class="pre">native_transport_max_threads</span></code><a class="headerlink" 
href="#native-transport-max-threads" title="Permalink to this 
headline">¶</a></h2>
 <p><em>This option is commented out by default.</em>
-The maximum threads for handling requests when the native transport is used.
-This is similar to rpc_max_threads though the default differs slightly (and
-there is no native_transport_min_threads, idle threads will always be stopped
-after 30 seconds).</p>
+The maximum threads for handling requests (note that idle threads are stopped
+after 30 seconds so there is not corresponding minimum setting).</p>
 <p><em>Default Value:</em> 128</p>
 </div>
 <div class="section" id="native-transport-max-frame-size-in-mb">
@@ -1053,15 +1037,9 @@ The default is -1, which means unlimited
 The default is -1, which means unlimited.</p>
 <p><em>Default Value:</em> -1</p>
 </div>
-<div class="section" id="start-rpc">
-<h2><code class="docutils literal"><span class="pre">start_rpc</span></code><a 
class="headerlink" href="#start-rpc" title="Permalink to this 
headline">¶</a></h2>
-<p>Whether to start the thrift rpc server.</p>
-<p><em>Default Value:</em> false</p>
-</div>
 <div class="section" id="rpc-address">
 <h2><code class="docutils literal"><span 
class="pre">rpc_address</span></code><a class="headerlink" href="#rpc-address" 
title="Permalink to this headline">¶</a></h2>
-<p>The address or interface to bind the Thrift RPC service and native transport
-server to.</p>
+<p>The address or interface to bind the native transport server to.</p>
 <p>Set rpc_address OR rpc_interface, not both.</p>
 <p>Leaving rpc_address blank has the same effect as on listen_address
 (i.e. it will be based on the configured hostname of the node).</p>
@@ -1086,11 +1064,6 @@ address will be used. If true the first
 ipv4. If there is only one address it will be selected regardless of 
ipv4/ipv6.</p>
 <p><em>Default Value:</em> false</p>
 </div>
-<div class="section" id="rpc-port">
-<h2><code class="docutils literal"><span class="pre">rpc_port</span></code><a 
class="headerlink" href="#rpc-port" title="Permalink to this 
headline">¶</a></h2>
-<p>port for Thrift to listen for clients on</p>
-<p><em>Default Value:</em> 9160</p>
-</div>
 <div class="section" id="broadcast-rpc-address">
 <h2><code class="docutils literal"><span 
class="pre">broadcast_rpc_address</span></code><a class="headerlink" 
href="#broadcast-rpc-address" title="Permalink to this headline">¶</a></h2>
 <p><em>This option is commented out by default.</em></p>
@@ -1105,54 +1078,6 @@ be set.</p>
 <p>enable or disable keepalive on rpc/native connections</p>
 <p><em>Default Value:</em> true</p>
 </div>
-<div class="section" id="rpc-server-type">
-<h2><code class="docutils literal"><span 
class="pre">rpc_server_type</span></code><a class="headerlink" 
href="#rpc-server-type" title="Permalink to this headline">¶</a></h2>
-<p>Cassandra provides two out-of-the-box options for the RPC Server:</p>
-<dl class="docutils">
-<dt>sync</dt>
-<dd>One thread per thrift connection. For a very large number of clients, 
memory
-will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
-per thread, and that will correspond to your use of virtual memory (but 
physical memory
-may be limited depending on use of stack space).</dd>
-<dt>hsha</dt>
-<dd>Stands for &#8220;half synchronous, half asynchronous.&#8221; All thrift 
clients are handled
-asynchronously using a small number of threads that does not vary with the 
amount
-of thrift clients (and thus scales well to many clients). The rpc requests are 
still
-synchronous (one thread per active request). If hsha is selected then it is 
essential
-that rpc_max_threads is changed from the default value of unlimited.</dd>
-</dl>
-<p>The default is sync because on Windows hsha is about 30% slower.  On Linux,
-sync/hsha performance is about the same, with hsha of course using less 
memory.</p>
-<p>Alternatively,  can provide your own RPC server by providing the 
fully-qualified class name
-of an o.a.c.t.TServerFactory that can create an instance of it.</p>
-<p><em>Default Value:</em> sync</p>
-</div>
-<div class="section" id="rpc-min-threads">
-<h2><code class="docutils literal"><span 
class="pre">rpc_min_threads</span></code><a class="headerlink" 
href="#rpc-min-threads" title="Permalink to this headline">¶</a></h2>
-<p><em>This option is commented out by default.</em></p>
-<p>Uncomment rpc_min|max_thread to set request pool size limits.</p>
-<p>Regardless of your choice of RPC server (see above), the number of maximum 
requests in the
-RPC thread pool dictates how many concurrent requests are possible (but if you 
are using the sync
-RPC server, it also dictates the number of clients that can be connected at 
all).</p>
-<p>The default is unlimited and thus provides no protection against clients 
overwhelming the server. You are
-encouraged to set a maximum that makes sense for you in production, but do 
keep in mind that
-rpc_max_threads represents the maximum number of client requests this server 
may execute concurrently.</p>
-<p><em>Default Value:</em> 16</p>
-</div>
-<div class="section" id="rpc-max-threads">
-<h2><code class="docutils literal"><span 
class="pre">rpc_max_threads</span></code><a class="headerlink" 
href="#rpc-max-threads" title="Permalink to this headline">¶</a></h2>
-<p><em>This option is commented out by default.</em></p>
-<p><em>Default Value:</em> 2048</p>
-</div>
-<div class="section" id="rpc-send-buff-size-in-bytes">
-<h2><code class="docutils literal"><span 
class="pre">rpc_send_buff_size_in_bytes</span></code><a class="headerlink" 
href="#rpc-send-buff-size-in-bytes" title="Permalink to this 
headline">¶</a></h2>
-<p><em>This option is commented out by default.</em></p>
-<p>uncomment to set socket buffer sizes on rpc connections</p>
-</div>
-<div class="section" id="rpc-recv-buff-size-in-bytes">
-<h2><code class="docutils literal"><span 
class="pre">rpc_recv_buff_size_in_bytes</span></code><a class="headerlink" 
href="#rpc-recv-buff-size-in-bytes" title="Permalink to this 
headline">¶</a></h2>
-<p><em>This option is commented out by default.</em></p>
-</div>
 <div class="section" id="internode-send-buff-size-in-bytes">
 <h2><code class="docutils literal"><span 
class="pre">internode_send_buff_size_in_bytes</span></code><a 
class="headerlink" href="#internode-send-buff-size-in-bytes" title="Permalink 
to this headline">¶</a></h2>
 <p><em>This option is commented out by default.</em></p>
@@ -1173,11 +1098,6 @@ and &#8216;man tcp&#8217;</p>
 Note that when setting this, the buffer size is limited by net.core.wmem_max
 and when not setting it it is defined by net.ipv4.tcp_wmem</p>
 </div>
-<div class="section" id="thrift-framed-transport-size-in-mb">
-<h2><code class="docutils literal"><span 
class="pre">thrift_framed_transport_size_in_mb</span></code><a 
class="headerlink" href="#thrift-framed-transport-size-in-mb" title="Permalink 
to this headline">¶</a></h2>
-<p>Frame size for thrift (maximum message length).</p>
-<p><em>Default Value:</em> 15</p>
-</div>
 <div class="section" id="incremental-backups">
 <h2><code class="docutils literal"><span 
class="pre">incremental_backups</span></code><a class="headerlink" 
href="#incremental-backups" title="Permalink to this headline">¶</a></h2>
 <p>Set to true to have Cassandra create a hard link to each sstable
@@ -1349,6 +1269,14 @@ Default value is 300s (5 minutes), which
 times out in 10 minutes by default</p>
 <p><em>Default Value:</em> 300</p>
 </div>
+<div class="section" id="streaming-connections-per-host">
+<h2><code class="docutils literal"><span 
class="pre">streaming_connections_per_host</span></code><a class="headerlink" 
href="#streaming-connections-per-host" title="Permalink to this 
headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>Limit number of connections per host for streaming
+Increase this when you notice that joins are CPU-bound rather that network
+bound (for example a few nodes with big files).</p>
+<p><em>Default Value:</em> 1</p>
+</div>
 <div class="section" id="phi-convict-threshold">
 <h2><code class="docutils literal"><span 
class="pre">phi_convict_threshold</span></code><a class="headerlink" 
href="#phi-convict-threshold" title="Permalink to this headline">¶</a></h2>
 <p><em>This option is commented out by default.</em></p>
@@ -1440,64 +1368,6 @@ expressed as a double which represents a
 until the pinned host was 20% worse than the fastest.</p>
 <p><em>Default Value:</em> 0.1</p>
 </div>
-<div class="section" id="request-scheduler">
-<h2><code class="docutils literal"><span 
class="pre">request_scheduler</span></code><a class="headerlink" 
href="#request-scheduler" title="Permalink to this headline">¶</a></h2>
-<p>request_scheduler &#8211; Set this to a class that implements
-RequestScheduler, which will schedule incoming client requests
-according to the specific policy. This is useful for multi-tenancy
-with a single Cassandra cluster.
-NOTE: This is specifically for requests from the client and does
-not affect inter node communication.
-org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place
-org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of
-client requests to a node with a separate queue for each
-request_scheduler_id. The scheduler is further customized by
-request_scheduler_options as described below.</p>
-<p><em>Default Value:</em> org.apache.cassandra.scheduler.NoScheduler</p>
-</div>
-<div class="section" id="request-scheduler-options">
-<h2><code class="docutils literal"><span 
class="pre">request_scheduler_options</span></code><a class="headerlink" 
href="#request-scheduler-options" title="Permalink to this headline">¶</a></h2>
-<p><em>This option is commented out by default.</em></p>
-<p>Scheduler Options vary based on the type of scheduler</p>
-<dl class="docutils">
-<dt>NoScheduler</dt>
-<dd>Has no options</dd>
-<dt>RoundRobin</dt>
-<dd><dl class="first last docutils">
-<dt>throttle_limit</dt>
-<dd>The throttle_limit is the number of in-flight
-requests per client.  Requests beyond
-that limit are queued up until
-running requests can complete.
-The value of 80 here is twice the number of
-concurrent_reads + concurrent_writes.</dd>
-<dt>default_weight</dt>
-<dd>default_weight is optional and allows for
-overriding the default which is 1.</dd>
-<dt>weights</dt>
-<dd>Weights are optional and will default to 1 or the
-overridden default_weight. The weight translates into how
-many requests are handled during each turn of the
-RoundRobin, based on the scheduler id.</dd>
-</dl>
-</dd>
-</dl>
-<p><em>Default Value (complex option)</em>:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="c">#   
 throttle_limit: 80</span>
-<span class="c">#    default_weight: 5</span>
-<span class="c">#    weights:</span>
-<span class="c">#      Keyspace1: 1</span>
-<span class="c">#      Keyspace2: 5</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="request-scheduler-id">
-<h2><code class="docutils literal"><span 
class="pre">request_scheduler_id</span></code><a class="headerlink" 
href="#request-scheduler-id" title="Permalink to this headline">¶</a></h2>
-<p><em>This option is commented out by default.</em>
-request_scheduler_id &#8211; An identifier based on which to perform
-the request scheduling. Currently the only valid option is keyspace.</p>
-<p><em>Default Value:</em> keyspace</p>
-</div>
 <div class="section" id="server-encryption-options">
 <h2><code class="docutils literal"><span 
class="pre">server_encryption_options</span></code><a class="headerlink" 
href="#server-encryption-options" title="Permalink to this headline">¶</a></h2>
 <p>Enable or disable inter-node encryption
@@ -1585,13 +1455,6 @@ latency if you block for cross-datacente
 <h2><code class="docutils literal"><span 
class="pre">tracetype_repair_ttl</span></code><a class="headerlink" 
href="#tracetype-repair-ttl" title="Permalink to this headline">¶</a></h2>
 <p><em>Default Value:</em> 604800</p>
 </div>
-<div class="section" id="gc-log-threshold-in-ms">
-<h2><code class="docutils literal"><span 
class="pre">gc_log_threshold_in_ms</span></code><a class="headerlink" 
href="#gc-log-threshold-in-ms" title="Permalink to this headline">¶</a></h2>
-<p><em>This option is commented out by default.</em></p>
-<p>By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
-This threshold can be adjusted to minimize logging if necessary</p>
-<p><em>Default Value:</em> 200</p>
-</div>
 <div class="section" id="enable-user-defined-functions">
 <h2><code class="docutils literal"><span 
class="pre">enable_user_defined_functions</span></code><a class="headerlink" 
href="#enable-user-defined-functions" title="Permalink to this 
headline">¶</a></h2>
 <p>If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
@@ -1687,11 +1550,19 @@ Caution should be taken on increasing th
 <p>Log a warning when compacting partitions larger than this value</p>
 <p><em>Default Value:</em> 100</p>
 </div>
+<div class="section" id="gc-log-threshold-in-ms">
+<h2><code class="docutils literal"><span 
class="pre">gc_log_threshold_in_ms</span></code><a class="headerlink" 
href="#gc-log-threshold-in-ms" title="Permalink to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>GC Pauses greater than 200 ms will be logged at INFO level
+This threshold can be adjusted to minimize logging if necessary</p>
+<p><em>Default Value:</em> 200</p>
+</div>
 <div class="section" id="gc-warn-threshold-in-ms">
 <h2><code class="docutils literal"><span 
class="pre">gc_warn_threshold_in_ms</span></code><a class="headerlink" 
href="#gc-warn-threshold-in-ms" title="Permalink to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
 <p>GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
-Adjust the threshold based on your application throughput requirement
-By default, Cassandra logs GC Pauses greater than 200 ms at INFO level</p>
+Adjust the threshold based on your application throughput requirement. Setting 
to 0
+will deactivate the feature.</p>
 <p><em>Default Value:</em> 1000</p>
 </div>
 <div class="section" id="max-value-size-in-mb">
@@ -1723,6 +1594,60 @@ if SLOW at the speed of the slowest one.
 New strategies can be added. Implementors need to implement 
org.apache.cassandra.net.BackpressureStrategy and
 provide a public constructor accepting a Map&lt;String, Object&gt;.</p>
 </div>
+<div class="section" id="otc-coalescing-strategy">
+<h2><code class="docutils literal"><span 
class="pre">otc_coalescing_strategy</span></code><a class="headerlink" 
href="#otc-coalescing-strategy" title="Permalink to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>Coalescing Strategies #
+Coalescing multiples messages turns out to significantly boost message 
processing throughput (think doubling or more).
+On bare metal, the floor for packet processing throughput is high enough that 
many applications won&#8217;t notice, but in
+virtualized environments, the point at which an application can be bound by 
network packet processing can be
+surprisingly low compared to the throughput of task processing that is 
possible inside a VM. It&#8217;s not that bare metal
+doesn&#8217;t benefit from coalescing messages, it&#8217;s that the number of 
packets a bare metal network interface can process
+is sufficient for many applications such that no load starvation is 
experienced even without coalescing.
+There are other benefits to coalescing network messages that are harder to 
isolate with a simple metric like messages
+per second. By coalescing multiple tasks together, a network thread can 
process multiple messages for the cost of one
+trip to read from a socket, and all the task submission work can be done at 
the same time reducing context switching
+and increasing cache friendliness of network message processing.
+See CASSANDRA-8692 for details.</p>
+<p>Strategy to use for coalescing messages in OutboundTcpConnection.
+Can be fixed, movingaverage, timehorizon, disabled (default).
+You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by 
name.</p>
+<p><em>Default Value:</em> DISABLED</p>
+</div>
+<div class="section" id="otc-coalescing-window-us">
+<h2><code class="docutils literal"><span 
class="pre">otc_coalescing_window_us</span></code><a class="headerlink" 
href="#otc-coalescing-window-us" title="Permalink to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>How many microseconds to wait for coalescing. For fixed strategy this is 
the amount of time after the first
+message is received before it will be sent with any accompanying messages. For 
moving average this is the
+maximum amount of time that will be waited as well as the interval at which 
messages must arrive on average
+for coalescing to be enabled.</p>
+<p><em>Default Value:</em> 200</p>
+</div>
+<div class="section" id="otc-coalescing-enough-coalesced-messages">
+<h2><code class="docutils literal"><span 
class="pre">otc_coalescing_enough_coalesced_messages</span></code><a 
class="headerlink" href="#otc-coalescing-enough-coalesced-messages" 
title="Permalink to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>Do not try to coalesce messages if we already got that many messages. This 
should be more than 2 and less than 128.</p>
+<p><em>Default Value:</em> 8</p>
+</div>
+<div class="section" id="otc-backlog-expiration-interval-ms">
+<h2><code class="docutils literal"><span 
class="pre">otc_backlog_expiration_interval_ms</span></code><a 
class="headerlink" href="#otc-backlog-expiration-interval-ms" title="Permalink 
to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>How many milliseconds to wait between two expiration runs on the backlog 
(queue) of the OutboundTcpConnection.
+Expiration is done if messages are piling up in the backlog. Droppable 
messages are expired to free the memory
+taken by expired messages. The interval should be between 0 and 1000, and in 
most installations the default value
+will be appropriate. A smaller value could potentially expire messages 
slightly sooner at the expense of more CPU
+time and queue contention while iterating the backlog of messages.
+An interval of 0 disables any wait time, which is the behavior of former 
Cassandra versions.</p>
+<p><em>Default Value:</em> 200</p>
+</div>
+<div class="section" id="ideal-consistency-level">
+<h2><code class="docutils literal"><span 
class="pre">ideal_consistency_level</span></code><a class="headerlink" 
href="#ideal-consistency-level" title="Permalink to this headline">¶</a></h2>
+<p><em>This option is commented out by default.</em></p>
+<p>Track a metric per keyspace indicating whether replication achieved the 
ideal consistency
+level for writes without timing out. This is different from the consistency 
level requested by
+each write which may be lower in order to facilitate availability.</p>
+<p><em>Default Value:</em> EACH_QUORUM</p>
+</div>
 </div>
 
 

Modified: cassandra/site/src/doc/4.0/configuration/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/configuration/index.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/configuration/index.html (original)
+++ cassandra/site/src/doc/4.0/configuration/index.html Tue May 16 02:01:22 2017
@@ -64,7 +64,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>

Modified: cassandra/site/src/doc/4.0/contactus.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/contactus.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/contactus.html (original)
+++ cassandra/site/src/doc/4.0/contactus.html Tue May 16 02:01:22 2017
@@ -60,7 +60,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" 
href="#">Contact us</a><ul>

Modified: cassandra/site/src/doc/4.0/cql/appendices.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/doc/4.0/cql/appendices.html?rev=1795259&r1=1795258&r2=1795259&view=diff
==============================================================================
--- cassandra/site/src/doc/4.0/cql/appendices.html (original)
+++ cassandra/site/src/doc/4.0/cql/appendices.html Tue May 16 02:01:22 2017
@@ -68,6 +68,7 @@ extra-footer: '
 <li class="toctree-l2"><a class="reference internal" 
href="mvs.html">Materialized Views</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="security.html">Security</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="functions.html">Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="operators.html">Arithmetic Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="json.html">JSON 
Support</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="triggers.html">Triggers</a></li>
 <li class="toctree-l2 current"><a class="current reference internal" 
href="#">Appendices</a><ul>
@@ -82,7 +83,7 @@ extra-footer: '
 <li class="toctree-l1"><a class="reference internal" 
href="../operating/index.html">Operating Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../tools/index.html">Cassandra Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../troubleshooting/index.html">Troubleshooting</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Cassandra Development</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Contributing to Cassandra</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../faq/index.html">Frequently Asked Questions</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../bugs.html">Reporting Bugs and Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../contactus.html">Contact us</a></li>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to