diff options
| author | Mark Otto <[email protected]> | 2013-08-23 22:56:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 22:56:23 -0700 |
| commit | b86cd3bc3d866838127e7af15f665c70e7f50847 (patch) | |
| tree | 0044cbd39cc9927c8a48ca178b019c049520e2ca /getting-started.html | |
| parent | 22ce6499102c2ab87bbd8a303b5d26531c6e7df2 (diff) | |
| parent | d5a27855459325290ace93538f5ceafb22dee27a (diff) | |
| download | bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.tar.xz bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.zip | |
Merge branch 'master' into deprecate-screen-device-vars
Conflicts:
less/variables.less
Diffstat (limited to 'getting-started.html')
| -rw-r--r-- | getting-started.html | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/getting-started.html b/getting-started.html index 908ccbcc3..6cddf379f 100644 --- a/getting-started.html +++ b/getting-started.html @@ -17,7 +17,7 @@ base_url: "../" <h3 id="download-compiled">Compiled CSS, JS, and fonts</h3> <p>The fastest way to get Bootstrap is to download the compiled and minified versions of our CSS and JavaScript, along with the included fonts. No documentation or original source files are included.</p> - <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p> + <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download precompiled Bootstrap</a></p> <h3 id="download-additional">Additional downloads</h3> <div class="bs-docs-dl-options"> @@ -297,7 +297,7 @@ bootstrap/ <div class="page-header"> <h1 id="migration">Migrating from 2.x to 3.0</h1> </div> - <p class="lead">Folks looking to upgrade to v3 should use this section as a general upgrade guide. We've outlined some of the major changes and provided tables that highlight key changes. For an overview, <a href="http://blog.getbootstrap.com/2013/08/19/bootstrap-3-released/">read the announcement blog post</a>.</p> + <p class="lead">Bootstrap 3 is not backwards compatible with v2.x. Folks looking to upgrade to v3 should use this section as a general upgrade guide. We've outlined some of the major changes and provided tables that highlight key changes. For an overview, <a href="http://blog.getbootstrap.com/2013/08/19/bootstrap-3-released/">read the announcement blog post</a>.</p> <h2 id="migration-classes">Major class changes</h2> @@ -423,6 +423,10 @@ bootstrap/ <td><code>ul.inline</code></td> <td><code>.list-inline</code></td> </tr> + <tr> + <td><code>.muted</code></td> + <td><code>.text-muted</code></td> + </tr> </tbody> </table> </div><!-- /.table-responsive --> |