rip community as separate page, move to intro and restore table of contents on intro

diff --git a/docs/getting-started/community.md b/docs/getting-started/community.md
deleted file mode 100644 (file)
index 27dec7c..0000000
--- a/docs/getting-started/community.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: page
-title: Community
-group: getting-started
----
-
-Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.
-
-- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com/).
-- Chat with fellow Bootstrappers using IRC in the `irc.freenode.net` server, in the [##twitter-bootstrap channel](irc://irc.freenode.net/%23twitter-bootstrap).
-- For help using Bootstrap, ask on [StackOverflow using the tag `twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3).
-- Find inspiring examples of people building with Bootstrap at the [Bootstrap Expo](http://expo.getbootstrap.com).
-- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
-
-You can also follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap) for the latest gossip and awesome music videos.

diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md
index d102b5c5a6cba099ebc718dd355cf5ae8c00665d..28294e2d4224d7f7bc43cedb922114f384644736 100644 (file)
--- a/docs/getting-started/introduction.md
+++ b/docs/getting-started/introduction.md
@@ -8,6 +8,11 @@ Bootstrap is the world's most popular framework for building responsive, mobile-
 
 Here's how to quickly get started with the Bootstrap CDN and a template starter page.
 
+## Contents
+
+* Will be replaced with the ToC, excluding the "Contents" header
+{:toc}
+
 ## Quick start
 
 Looking to quickly add Bootstrap to your project? Use the Bootstrap CDN, provided for free by the folks at MaxCDN. Using a package manager or need to download the source files? [Head to the downloads page.]({{ site.baseurl }}/getting-started/download)
@@ -107,3 +112,16 @@ Learn more about [box model and sizing at CSS Tricks](https://css-tricks.com/box
 ### Normalize.css
 
 For improved cross-browser rendering, we use [Normalize.css](http://necolas.github.io/normalize.css/) to correct small inconsistencies across browsers and devices. We further build on this with our own, slightly more opinionated styles with [Reboot]({{ site.baseurl }}/content/reboot/).
+
+## Community
+
+Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.
+
+- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
+- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
+- Join [the official Slack room](https://bootstrap-slack.herokuapp.com).
+- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
+- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
+- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
+
+You can also follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap) for the latest gossip and awesome music videos.