aboutsummaryrefslogtreecommitdiff
path: root/docs/getting-started/introduction.md
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-01-05 14:53:08 -0800
committerMark Otto <[email protected]>2017-01-05 14:53:08 -0800
commit0c12ccbeb6fdf0dd3818f97260aa43c79108d377 (patch)
tree0c0c0636c91c6ebed1b04dbe21bd00370761c501 /docs/getting-started/introduction.md
parent5d7db507396275fcda96935aff47b09e1d79ddc1 (diff)
parent43d9391fba015f13f06f3af4dc6f5a8205cb548b (diff)
downloadbootstrap-0c12ccbeb6fdf0dd3818f97260aa43c79108d377.tar.xz
bootstrap-0c12ccbeb6fdf0dd3818f97260aa43c79108d377.zip
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'docs/getting-started/introduction.md')
-rw-r--r--docs/getting-started/introduction.md13
1 files changed, 3 insertions, 10 deletions
diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md
index 3b9552278..39f5ba2d0 100644
--- a/docs/getting-started/introduction.md
+++ b/docs/getting-started/introduction.md
@@ -27,7 +27,7 @@ Copy-paste the stylesheet `<link>` into your `<head>` before all other styleshee
<link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">
{% endhighlight %}
-Add our JavaScript plugins, jQuery, and Tether near the end of your pages, right before the closing `</body>` tag. Be sure to place jQuery and Tether first, as our code depends on them.
+Add our JavaScript plugins, jQuery, and Tether near the end of your pages, right before the closing `</body>` tag. Be sure to place jQuery and Tether first, as our code depends on them. While we use [jQuery's slim build](https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/) in our docs, the full version is also supported.
{% highlight html %}
<script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
@@ -39,22 +39,15 @@ And that's it—you're on your way to a fully Bootstrapped site. If you're at al
## Starter template
-Be sure to have your pages set up with the latest design and development standards. That means:
-
-* Using an HTML5 doctype
-* Forcing Internet Explorer to use its latest rendering mode ([read more](https://stackoverflow.com/questions/6771258/what-does-meta-http-equiv-x-ua-compatible-content-ie-edge-do))
-* And, utilizing the viewport meta tag.
-
-Put it all together and your pages should look like this:
+Be sure to have your pages set up with the latest design and development standards. That means using an HTML5 doctype and including a viewport meta tag for proper responsive behaviors. Put it all together and your pages should look like this:
{% highlight html %}
<!DOCTYPE html>
<html lang="en">
<head>
- <!-- Required meta tags always come first -->
+ <!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <meta http-equiv="x-ua-compatible" content="ie=edge">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">