sorted out the documentation a bit (completing merge)

rev22 · Apr 26, 2016 · c39aaf6 · c39aaf6
1 parent 2f16b77
commit c39aaf6
Show file tree

Hide file tree

Showing 51 changed files with 1,580 additions and 5,183 deletions.
diff --git a/documentation/docs/coffee-script.html b/documentation/docs/coffee-script.html
diff --git a/documentation/docs/command.html b/documentation/docs/command.html
@@ -693,23 +693,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-17">
-||||||| merged common ancestors
-        <li id="section-18">
-=======
         <li id="section-19">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-17">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-18">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-19">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>Convenience for cleaner setTimeouts.</p>
 
@@ -720,25 +708,13 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-18">
-||||||| merged common ancestors
-        <li id="section-19">
-=======
         <li id="section-20">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-18">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-19">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-20">&#182;</a>
->>>>>>> 1.9.3
               </div>
-              <p>When watching scripts, it&#39;s useful to log changes with the timestamp.</p>
+              <p>When watching scripts, it’s useful to log changes with the timestamp.</p>
 
             </div>
 
@@ -748,23 +724,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-19">
-||||||| merged common ancestors
-        <li id="section-20">
-=======
         <li id="section-21">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-19">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-20">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-21">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>Pretty-print a stream of tokens, sans location data.</p>
 
@@ -780,23 +744,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-20">
-||||||| merged common ancestors
-        <li id="section-21">
-=======
         <li id="section-22">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-20">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-21">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-22">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>Use the <a href="optparse.html">OptionParser module</a> to extract all options from
 <code>process.argv</code> that are specified in <code>SWITCHES</code>.</p>
@@ -813,23 +765,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-21">
-||||||| merged common ancestors
-        <li id="section-22">
-=======
         <li id="section-23">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-21">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-22">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-23">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>The compile-time options to pass to the CoffeeScript compiler.</p>
 
@@ -864,23 +804,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-22">
-||||||| merged common ancestors
-        <li id="section-23">
-=======
         <li id="section-24">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-22">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-23">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-24">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>Start up a new Node.js instance with the arguments in <code>--nodejs</code> passed to
 the <code>node</code> binary, preserving the other options.</p>
@@ -900,23 +828,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-23">
-||||||| merged common ancestors
-        <li id="section-24">
-=======
         <li id="section-25">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-23">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-24">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-25">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>Print the <code>--help</code> usage message and exit. Deprecated switches are not
 shown.</p>
@@ -929,23 +845,11 @@ <h1>command.coffee</h1>
         </li>
 
 
-<<<<<<< HEAD
-        <li id="section-24">
-||||||| merged common ancestors
-        <li id="section-25">
-=======
         <li id="section-26">
->>>>>>> 1.9.3
             <div class="annotation">
 
               <div class="pilwrap ">
-<<<<<<< HEAD
-                <a class="pilcrow" href="#section-24">&#182;</a>
-||||||| merged common ancestors
-                <a class="pilcrow" href="#section-25">&#182;</a>
-=======
                 <a class="pilcrow" href="#section-26">&#182;</a>
->>>>>>> 1.9.3
               </div>
               <p>Print the <code>--version</code> message and exit.</p>
 

diff --git a/documentation/docs/helpers.html b/documentation/docs/helpers.html
@@ -315,24 +315,6 @@ <h1>helpers.coffee</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-||||||| merged common ancestors
-              <p>Gets the last item of an array(-like) object.</p>
-
-            </div>
-
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.last = <span class="hljs-function"><span class="hljs-title">last</span> = <span class="hljs-params">(array, back)</span> -&gt;</span> array[array.length - (back <span class="hljs-keyword">or</span> <span class="hljs-number">0</span>) - <span class="hljs-number">1</span>]</pre></div></div>
-
-        </li>
-
-
-        <li id="section-13">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-13">&#182;</a>
-              </div>
-=======
->>>>>>> 1.9.3
               <p>Typical Array::some</p>
 
             </div>