doc/index.html in iqeo-conf-0.0.11 vs doc/index.html in iqeo-conf-0.0.12
- old
+ new
@@ -173,12 +173,12 @@
<li>referencing existing settings</li>
<li>nested configurations</li>
<li>inheritance & override</li>
<li>read from string, at creation, or after - merged & nested</li>
<li>load from filename, at creation, or after - merged & nested</li>
-<li>todo: merge configurations</li>
-<li>todo: defaults</li>
+<li>defaults</li>
+<li>merge configurations</li>
<li>todo: blank slate</li>
</ul>
<h2>Fancy usage</h2>
@@ -195,10 +195,10 @@
<p>Licensed under GPL Version 3 license.
See LICENSE file.</p>
</div></div>
<div id="footer">
- Generated on Fri May 11 14:53:17 2012 by
+ Generated on Mon May 14 20:37:48 2012 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.8.1 (ruby-1.9.3).
</div>
</body>
\ No newline at end of file