Fixing typos / grammar in cds2014.

native_client_sdk/doc_generated/cds2014/cpp.html

 {{+bindTo:partials.standard_nacl_article}}
 
 <section id="a-saga-of-fire-and-water-codelab">
 <span id="cds2014-cpp"></span><h1 id="a-saga-of-fire-and-water-codelab"><span id="cds2014-cpp"></span>A Saga of Fire and Water - Codelab</h1>
 <h2 id="introduction">Introduction</h2>
 <p>Learn the basics of using PPAPI to do 2D graphics from
 a C++ program running in Native Client.
 Modify our sample to turn fire into water.
 Develop inside Google Chrome, using our NaCl Development Environment
 Chrome App.
@@ skipping 41 matching lines @@
 <h2 id="setup">Setup</h2>
 <p>For this codelab, you will need to install the our
 Beta NaCl Dev Environment App in your web browser.</p>
 <a href="https://chrome.google.com/webstore/detail/nacl-development-environm/aljpgkjeipgnmdpikaajmnepbcfkglfa"
 target="_blank">Click here to install the environment.</a><p>You will need to click &#8220;Install&#8221; to add the NaCl Dev Environment
 to your browser.</p>
 <p>NOTE: This environment will leave a substantial (800MB) payload in your
 browser. See the cleanup section below to learn how to recover this space.</p>
 <p>Once the installation is complete, run the app.</p>
 <p>On the first run, it will download several packages.
-Once download is complete you should see a bash prompt:</p>
+Once download is complete, you should see a bash prompt:</p>
 <pre class="prettyprint">
 bash.nmf-4.3$
 </pre>
 <h3 id="our-web-based-tools">Our Web-based Tools</h3>
 <p>These development tools are a <a class="reference external" href="nacldev">work in progress</a>.
 At this point, they are a learning tool and demonstration of NaCl&#8217;s
 flexibility, but are not the recommended tools for a production application.
 In the future, that may change, but for the moment,
 to develop a substantial application for Native Client /
 Portable Native Client,
 we recommend you use the
 <a class="reference external" href="/native-client/sdk/download">Native Client SDK</a>.</p>
 <b><font color="#880000">
 NOTE: The NaCl Development Environment is not yet stable.
-Ideally user data is preserved, but currently it can be lost during updates
+Ideally, user data is preserved, but currently it can be lost during updates
 or sporadically. We're working to resolve this.
 </font></b><h3 id="navigating-in-the-dev-environment">Navigating in the Dev Environment</h3>
 <p>The NaCl Dev Environment behaves like a mini-UNIX system.
 You start-up in bash command prompt.
 Standard UNIX commands like cd, ls, mkdir, rm, rmdir, etc.
 can be used to navigate and modify the Dev Environment&#8217;s
 virtual filesystem.</p>
 <p>There are 3 locations mounted by the environment:</p>
 <blockquote>
 <div><ul class="small-gap">
@@ skipping 51 matching lines @@
 <pre class="prettyprint">
 $ vim &lt;filename&gt;
 </pre>
 <p>Here&#8217;s an online <a class="reference external" href="http://www.openvim.com/tutorial.html">vim tutorial</a>.</p>
 </li>
 </ul>
 <h3 id="git-setup">Git Setup</h3>
 <p>This tutorial also uses a revision control program called
 <a class="reference external" href="http://en.wikipedia.org/wiki/Git_(software)">git</a>.
 In order to commit to a git repository,
-you need to setup your environment to with your identity.</p>
+you need to set up your identity.</p>
 <p>Run these commands (with your info) to setup your <cite>~/.gitconfig</cite>
 for use:</p>
 <pre class="prettyprint">
 git config --global user.name &quot;John Doe&quot;
 git config --global user.email johndoe&#64;example.com
 </pre>
 <h2 id="get-the-code">Get the Code!</h2>
 <p>Rather than start from nothing, for this codelab we&#8217;ve provided
 you with a zip file containing a starting point.</p>
 <p>Download the codelab:</p>
@@ skipping 31 matching lines @@
 make fire
 </pre>
 <p>You should now see a small popup window, smoldering away.
 If you click, you can make more fire!
 I think that&#8217;s pretty cool, but then I selected
 the institution of higher learning I attended based
 on the integral role fire played in its campus life.</p>
 <h2 id="water">Water</h2>
 <p>Remarkably, not everyone enjoys the primal illusion of fire.</p>
 <p>Your task in this codelab is to transform the rising fire
-effect you see before you, into a beautiful, tranquil waterfall.
+effect you see before you into a beautiful, tranquil waterfall.
 This will require digging into some C++ code.</p>
 <p>Before you begin, you&#8217;ll want to copy our fire program to a new name,
 since you might decide later that you like fire better, I know I do:</p>
 <pre class="prettyprint">
 cp fire.cc water.cc
 git add water.cc
 git commit -am &quot;adding water&quot;
 </pre>
 <p>For this codelab, you&#8217;ll only need to change <cite>water.cc</cite>.</p>
 <p>The task of turning fire into water involves two key challenges:</p>
 <blockquote>
 <div><ul class="small-gap">
 <li>Alter the red-yellow palette of fire into a blue-green one.</li>
 <li>Reverse upward rising flame into downward falling water.</li>
 <li>Seed the waterfall from the top instead of the bottom.</li>
 </ul>
 </div></blockquote>
 <p>At this point you&#8217;ll want to open up <cite>water.cc</cite> in the editor you
 picked earlier.</p>
 <h3 id="i-see-a-red-door-and-i-want-it-painted-blue">I see a red door and I want it painted... blue</h3>
 <p>While PPAPI&#8217;s 2D graphics API uses multi-component RGB pixels,
 our flame effect is actually monochrome. A single intensity
 value is used in the flame simulation. This is then converted
 to color based on a multi-color gradient.
 To alter the color-scheme, locate this palette, and exchange
-the red component (first) with blue (third).</p>
+the red component (first) with the blue one (third).</p>
 <p>Hint: Focus your energies on the CreatePalette function.</p>
 <p>You can test you changes at any time with:</p>
 <pre class="prettyprint">
 make water
 </pre>
 <h3 id="what-goes-up">What goes up...</h3>
 <p>Now there&#8217;s the small matter of gravity.
 While smoke, and well flame, rises, we want our water to go down.</p>
 <p>The simulation of fire loops over each pixel,
 bottom row to top row,
@@ skipping 10 matching lines @@
 And while dusting off your C/C++ image manipulation skills,
 you&#8217;ve discovered how easy it is to modify, build,
 and run a NaCl application that uses PPAPI.</p>
 <p>2D graphics is fun, but now you&#8217;re ready to check out the wealth of
 other
 <a class="reference external" href="http://src.chromium.org/viewvc/chrome/trunk/src/ppapi/cpp/">PPAPI interfaces available</a>.</p>
 <p>While our in-browser environment is rapidly evolving
 to become a complete development solution,
 for the broadest range of development options, check out the
 <a class="reference external" href="https://developer.chrome.com/native-client/cpp-api">NaCl SDK</a>.</p>
-<p>For questions, concerns, and help contact us at
+<p>For questions, concerns, or help contact us at
 <a class="reference external" href="https://groups.google.com/forum/#!forum/native-client-discuss">native-client-discuss&#64;googlegroups.com</a>.</p>
 <p>I hope this codelab has lit a fire in you to go out there,
 and bring an awesome C/C++ application to NaCl or PNaCl today!</p>
 <h2 id="cleanup">Cleanup</h2>
 <p>The Chrome Dev Environment App installs &gt;800MB into
 HTML5 Filesystem storage on your device.
 To recover this storage, uninstall the app from the
 <a href="https://chrome.google.com/webstore"
  target="_blank">Chrome Web Store</a>.</p>
 </section>
 
 {{/partials.standard_nacl_article}}