From: Mark Otto <markotto@twitter.com>
Date: Mon, 1 Oct 2012 06:26:51 +0000 (-0700)
Subject: change notes about responsive in Scaffolding page: no longer separate file
X-Git-Tag: v3.0.0-rc1~919
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6f6235e9bc31a4e5910077c1c7a0f43a0562216;p=thirdparty%2Fbootstrap.git

change notes about responsive in Scaffolding page: no longer separate file
---

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 6e6c0b9924..18d4fb0416 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -280,12 +280,10 @@
           </div>
 
           <h2>Enabling responsive features</h2>
-          <p>Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <code>&lt;head&gt;</code> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.</p>
+          <p>Responsive CSS requires the following meta tag in the <code>&lt;head&gt;</code> of your pages.</p>
 <pre class="prettyprint linenums">
 &lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;
-&lt;link href="assets/css/bootstrap-responsive.css" rel="stylesheet"&gt;
 </pre>
-          <p><span class="label label-info">Heads up!</span>  Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.</p>
 
           <h2>About responsive Bootstrap</h2>
           <img src="assets/img/responsive-illustrations.png" alt="Responsive devices" style="float: right; margin: 0 0 20px 20px;">
@@ -298,7 +296,7 @@
           <p>Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.</p>
 
           <h2>Supported devices</h2>
-          <p>Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
+          <p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
           <table class="table table-bordered table-striped">
             <thead>
               <tr>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index c1ca2da929..c4c5322b1d 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -212,12 +212,10 @@
 
           {{! Enabling }}
           <h2>{{_i}}Enabling responsive features{{/i}}</h2>
-          <p>{{_i}}Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <code>&lt;head&gt;</code> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.{{/i}}</p>
+          <p>{{_i}}Responsive CSS requires the following meta tag in the <code>&lt;head&gt;</code> of your pages.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;
-&lt;link href="assets/css/bootstrap-responsive.css" rel="stylesheet"&gt;
 </pre>
-          <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}} Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.{{/i}}</p>
 
           {{! About }}
           <h2>{{_i}}About responsive Bootstrap{{/i}}</h2>
@@ -232,7 +230,7 @@
 
           {{! Supported }}
           <h2>{{_i}}Supported devices{{/i}}</h2>
-          <p>{{_i}}Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}</p>
+          <p>{{_i}}Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}</p>
           <table class="table table-bordered table-striped">
             <thead>
               <tr>