svn commit: r953948 - in /websites/staging/thrift/trunk/content: ./ tutorial/js.html

[bu...@apache.org]

Author: buildbot
Date: Fri Jun  5 20:18:55 2015
New Revision: 953948

Log:
Staging update by buildbot for thrift

Modified:
    websites/staging/thrift/trunk/content/   (props changed)
    websites/staging/thrift/trunk/content/tutorial/js.html

Propchange: websites/staging/thrift/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun  5 20:18:55 2015
@@ -1 +1 @@
-1683023
+1683859

Modified: websites/staging/thrift/trunk/content/tutorial/js.html
==============================================================================
--- websites/staging/thrift/trunk/content/tutorial/js.html (original)
+++ websites/staging/thrift/trunk/content/tutorial/js.html Fri Jun  5 20:18:55 2015
@@ -92,7 +92,7 @@
 </ol>
 <h3 id="prerequisites">Prerequisites</h3>
 <ul>
-<li>This tutorial depends on an existing Thrift server. See either the <a href="/tutorial/java">Java tutorial</a> or <a href="/tutorial/nodejs">node.js tutorial</a> for how to build and setup one of these servers.</li>
+<li>This tutorial depends on an existing Thrift server. See either the <a href="/tutorial/java">Java tutorial</a> or <a href="/tutorial/nodejs">node.js tutorial</a> for how to build and setup one of these servers. Out of the box, a Thrift HTTP server using the JSON protocol is expected. To learn more about how to use other transports and/or protocols refer to the "Additional Information" section below.</li>
 </ul>
 <h3 id="client">Client</h3>
 <pre><code class="language-js">
@@ -121,7 +121,7 @@ function calc() {
 <p>Use either the <a href="/tutorial/java">Java tutorial</a> or <a href="/tutorial/cpp">C++ tutorial</a> server </p>
 <h2 id="additional-information">Additional Information</h2>
 <h3 id="inspecting-the-generated-javascript-code-and-html-code">Inspecting the generated Javascript code and HTML code</h3>
-<p>Inside the html file is the entry point of using the Thrift.js and compiled Javascript files. The main section code from the tutorial.html fileis the Thrift client as shown above.</p>
+<p>Inside the html file is the entry point of using the Thrift.js and compiled Javascript files. The main section code from the tutorial.html file is the Thrift client as shown above.</p>
 <p>The first thing for using the Thrift files is setting up your Transport protocol. At this time, it only supports AJAX and is as follows:</p>
 <div class="codehilite"><pre><span class="n">var</span> <span class="n">transport</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Thrift</span><span class="p">.</span><span class="n">Transport</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">thrift</span><span class="o">/</span><span class="n">service</span><span class="o">/</span><span class="n">tutorial</span><span class="o">/</span>&quot;<span class="p">);</span>
 </pre></div>