added container options to docs for popover
added container options to docs for popover
fix typo
fix typo
Merge pull request #6568 from Yohn/patch-12

Updating docs -> popover to show container option
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
add text alignment classes from 3.0
Fixes #6586: remove top 5px margin from navbar input group button groups
Add text alignment classes info to docs
adding class to example code
Update docs/templates/pages/components.mustache
Merge pull request #6591 from Quy/2.3.0-wip

Add text alignment classes info to docs
Merge pull request #6600 from Yohn/patch-12

added missing class to doc example
Update less/tests/css-tests.html

Extended css-tests with alerts (alerts and alert-blocks)
Merge branch 'ravage84-patch-2' into 2.3.0-wip
overhaul alerts section of tests
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
Update commenting and structure of layout.mustache
comment tweaks and updating starter template