Merge branch 'master' of http://github.com/danvk/dygraphs

[dygraphs.git] / docs / index.html

diff --git a/docs/index.html b/docs/index.html
index 400478b..e06f7e9 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -70,6 +70,7 @@
         <li><a href="tests/two-series.html">Multiple Series</a></li>
         <li><a href="tests/highlighted-region.html">Custom Underlay / background</a></li>
         <li><a href="tests/zoom.html">Tests for zoom operations</a></li>
+        <li><a href="tests/logscale.html">Log scale tests</a></li>
       </ul>
     </div>
 
@@ -1026,6 +1027,7 @@ perl -ne 'BEGIN{print "Month,Nominal,Real\n"} chomp; ($m,$cpi,$low,$close,$high)
         </tr>
 
         <tr>
+<<<<<<< HEAD
           <td><strong>noZoomFlagChange</strong></td>
           <td><code></code></td>
           <td><code></code></td>
@@ -1033,6 +1035,20 @@ perl -ne 'BEGIN{print "Month,Nominal,Real\n"} chomp; ($m,$cpi,$low,$close,$high)
             When this flag is passed along with either the <code>dateWindow</code> or <code>valueRange</code> options, the zoom flags are not changed to reflect a zoomed state.
             This is primarily useful for when the display area of a chart is changed programmatically and also where manual zooming is allowed and use is made of the <code>isZoomed</code> method to determine this.
             <div class="tests">Tests: <a href="tests/no-zoom-change.html">no-zoom-change</a></div>
+=======
+          <td><strong>logscale</strong></td>
+          <td><code>boolean</code></td>
+          <td><code>false</code></td>
+          <td>
+            When set for a y-axis, the graph shows that axis in y-scale. Any values less than or equal
+            to zero are not displayed.</p>
+
+           Not compatible with showZero, and ignores connectSeparatedPoints. Also, showing log scale
+           with valueRanges that are less than zero will result in an unviewable graph.<br/>
+
+            <div class="tests">Tests: <a href="tests/logscale.html">logscale</a>,
+            <a href="tests/stock.html"> stock</div>
+>>>>>>> a6a505d1759f087a1e29ad84fc8510aa4cbc4f6e
           </td>
         </tr>