From a127f3921eea284bb0656da1362fe4f2a45df8fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 21:05:39 -0800 Subject: [PATCH] Fixes #10716: Update what's included docs to add info on both download options --- _includes/nav-getting-started.html | 4 ++++ getting-started.html | 31 ++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 243c05fb05..ce7a718d66 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -8,6 +8,10 @@
  • What's included +
  • Basic template diff --git a/getting-started.html b/getting-started.html index 880d2ee483..b65fc497f1 100644 --- a/getting-started.html +++ b/getting-started.html @@ -62,9 +62,15 @@ base_url: "../" -

    Within the download you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.

    -

    Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:

    +

    Bootstrap is downloadable in two forms, within which you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.

    +
    +

    jQuery required

    +

    Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template. Consult our bower.json to see which versions of jQuery are supported.

    +
    + +

    Precompiled Bootstrap

    +

    Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:

    {% highlight bash %} @@ -85,11 +91,24 @@ bootstrap/ {% endhighlight %}

    This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). Fonts from Glyphicons are included, as is the optional Bootstrap theme.

    -
    -

    jQuery required

    -

    Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template. Consult our bower.json to see which versions of jQuery are supported.

    -
    + +

    Bootstrap source code

    +

    The Bootstrap source code download includes the precompiled CSS, JavaScript, and font assets, along with source LESS, JavaScript, and documentation. More specifically, it includes the following and more:

    +{% highlight bash %} +bootstrap/ +├── less/ +├── js/ +├── fonts/ +├── dist/ +│ ├── css/ +│ ├── js/ +│ └── fonts/ +├── docs-assets/ +├── examples/ +└── *.html +{% endhighlight %} +

    The less/, js/, and fonts/ are the source code for our CSS, JS, and icon fonts (respectively). The dist/ folder includes everything listed in the precompiled download section above. docs-assets/, examples/, and all *.html files are for our documentation. Beyond that, any other included file provides support for packages, license information, and development.