Merge branch 'master' into docs_derp

This commit is contained in:
Mark Otto 2014-01-03 13:18:12 -08:00
commit 0b75e2d738
3 changed files with 7 additions and 8 deletions

View file

@ -98,12 +98,11 @@ bootstrap/
│ ├── css/
│ ├── js/
│ └── fonts/
├── docs/assets/
├── examples/
└── *.html
└── docs/
└── examples/
{% endhighlight %}
</div>
<p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. <code>docs/assets/</code>, <code>examples/</code>, and all <code>*.html</code> files are for our documentation. Beyond that, any other included file provides support for packages, license information, and development.</p>
<p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p>
<!-- Template