diff options
-rw-r--r-- | .editorconfig | 3 | ||||
-rw-r--r-- | README.md | 55 |
2 files changed, 31 insertions, 27 deletions
diff --git a/.editorconfig b/.editorconfig index ff0ad0433c..c193ae0715 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,5 +10,8 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true +[*.md] +trim_trailing_whitespace = false + [*.py] indent_size = 4 @@ -1,4 +1,5 @@ # [Bootstrap](http://getbootstrap.com) + [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com) ![Bower version](https://img.shields.io/bower/v/bootstrap.svg) [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap) @@ -12,25 +13,25 @@ To get started, check out <http://getbootstrap.com>! ## Table of contents -- [Quick start](#quick-start) -- [Bugs and feature requests](#bugs-and-feature-requests) -- [Documentation](#documentation) -- [Contributing](#contributing) -- [Community](#community) -- [Versioning](#versioning) -- [Creators](#creators) -- [Copyright and license](#copyright-and-license) +* [Quick start](#quick-start) +* [Bugs and feature requests](#bugs-and-feature-requests) +* [Documentation](#documentation) +* [Contributing](#contributing) +* [Community](#community) +* [Versioning](#versioning) +* [Creators](#creators) +* [Copyright and license](#copyright-and-license) ## Quick start Several quick start options are available: -- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.5.zip). -- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. -- Install with [Bower](http://bower.io): `bower install bootstrap`. -- Install with [npm](https://www.npmjs.com): `npm install bootstrap`. -- Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`. -- Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`. +* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.5.zip). +* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. +* Install with [Bower](http://bower.io): `bower install bootstrap`. +* Install with [npm](https://www.npmjs.com): `npm install bootstrap`. +* Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`. +* Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`. Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. @@ -75,11 +76,11 @@ Bootstrap's documentation, included in this repo in the root directory, is built ### Running documentation locally -1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x). - - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. +1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x). + **Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line. -4. Open <http://localhost:9001> in your browser, and voilĂ . +4. Open `http://localhost:9001` in your browser, and voilĂ . Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). @@ -105,12 +106,12 @@ Editor preferences are available in the [editor config](https://github.com/twbs/ Get updates on Bootstrap's development and chat with the project maintainers and community members. -- 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. +* 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. @@ -126,13 +127,13 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr **Mark Otto** -- <https://twitter.com/mdo> -- <https://github.com/mdo> +* <https://twitter.com/mdo> +* <https://github.com/mdo> **Jacob Thornton** -- <https://twitter.com/fat> -- <https://github.com/fat> +* <https://twitter.com/fat> +* <https://github.com/fat> |