Merge branch '3.0.0-wip' into bs3_theme

9 files changed, 10 insertions, 10 deletions

diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html
index c8b0fe920..2c70f9148 100644
--- a/examples/jumbotron-narrow/index.html
+++ b/examples/jumbotron-narrow/index.html
@@ -31,7 +31,7 @@
       <div class="jumbotron">
         <h1>Jumbotron heading</h1>
         <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-        <p><a class="btn btn-large btn-success" href="#">Sign up today</a></p>
+        <p><a class="btn btn-lg btn-success" href="#">Sign up today</a></p>
       </div>
 
       <div class="row marketing">
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index 1f8129128..23db4b6e6 100644
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -65,7 +65,7 @@
       <div class="jumbotron">
         <h1>Hello, world!</h1>
         <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-        <p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
+        <p><a class="btn btn-primary btn-lg">Learn more &raquo;</a></p>
       </div>
 
       <div class="body-content">
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
index 431b2780d..46ebb6d69 100644
--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -36,7 +36,7 @@
       <div class="jumbotron">
         <h1>Marketing stuff!</h1>
         <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet.</p>
-        <p><a class="btn btn-large btn-success" href="#">Get started today</a></p>
+        <p><a class="btn btn-lg btn-success" href="#">Get started today</a></p>
       </div>
 
 
diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
index 2340bcfae..d1f1944e1 100644
--- a/examples/navbar-fixed-top/index.html
+++ b/examples/navbar-fixed-top/index.html
@@ -64,7 +64,7 @@
         <p>This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>To see the difference between static and fixed top navbars, just scroll.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-lg btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 
diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html
index 7bf1deccb..753e916a4 100644
--- a/examples/navbar-static-top/index.html
+++ b/examples/navbar-static-top/index.html
@@ -65,7 +65,7 @@
         <p>This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>To see the difference between static and fixed top navbars, just scroll.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-lg btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 
diff --git a/examples/navbar/index.html b/examples/navbar/index.html
index ee2ba19b6..6f4cefe31 100644
--- a/examples/navbar/index.html
+++ b/examples/navbar/index.html
@@ -62,7 +62,7 @@
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-lg btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 
diff --git a/examples/signin/index.html b/examples/signin/index.html
index fefb73386..7c491ae9c 100644
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -27,7 +27,7 @@
         <label class="checkbox">
           <input type="checkbox" value="remember-me"> Remember me
         </label>
-        <button class="btn btn-large btn-primary btn-block" type="submit">Sign in</button>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
 
     </div> <!-- /container -->
diff --git a/getting-started.html b/getting-started.html
index 85555ff02..3c26f719c 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -262,7 +262,7 @@ bootstrap/
     <div class="page-header">
       <h1 id="disable-responsive">Disabling responsiveness</h1>
     </div>
-    <p class="lead">Don't want your site or application to be scale on different device? With a little bit of work, you can disable the responsive features of Bootstrap so that mobile users see your full desktop-version site.</p>
+    <p class="lead">Don't want your site or application to be scaled on different devices? With a little bit of work, you can disable the responsive features of Bootstrap so that mobile users see your full desktop-version site.</p>
 
     <h3>Steps to disable responsive views</h3>
     <p>To disable responsive features, follow these steps. See it in action in the modified template below.</p>
@@ -383,7 +383,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
 
     <h3>Modals and mobile devices</h3>
     <p>Support for <code>overflow: hidden</code> on the <code>&lt;body&gt;</code> element is quite limited in iOS and Android. To that end, when you scroll past the top or bottom of a modal in either of those devices' browsers, the <code>&lt;body&gt;</code> content will begin to scroll.</p>
-    <p>Also, note that if you're using inputs in your modal – iOS has a rendering bug which doesn't update the position of fixed elements when the virtual keyboard is triggered. There are a few work arounds for this including transforming your elements to position absolute or invoking a timer on focus to try to correct the positioning manually. This is not handled by Bootstrap, so it is up to you to decide which solution is best for your application.</p>
+    <p>Also, note that if you're using inputs in your modal – iOS has a rendering bug which doesn't update the position of fixed elements when the virtual keyboard is triggered. There are a few work arounds for this, including transforming your elements to <code>position: absolute</code> or invoking a timer on focus to try to correct the positioning manually. This is not handled by Bootstrap, so it is up to you to decide which solution is best for your application.</p>
 
     <h3>Browser zooming</h3>
     <p>Page zooming inevitably presents rendering artifacts in some components, both in Bootstrap and the rest of the web. Depending on the issue, we may be able to fix it (search first and then open an issue if need be). However, we tend to ignore these as they often have no direct solution other than hacky workarounds.</p>
diff --git a/javascript.html b/javascript.html
index 1d4604afc..c9228c211 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1104,7 +1104,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
             <td>string | false</td>
             <td>false</td>
             <td>
-             <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful inthat it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p>
+             <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p>
             </td>
           </tr>
         </tbody>