From: Mark Otto <markdotto@gmail.com>
Date: Tue, 31 Mar 2015 03:53:32 +0000 (-0700)
Subject: Move transitions and overview to a javascript page in the getting started section
X-Git-Tag: v4.0.0-alpha~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b606d4d11f245644a0ce464e543800ea18882a87;p=thirdparty%2Fbootstrap.git

Move transitions and overview to a javascript page in the getting started section
---

diff --git a/docs/javascript/overview.md b/docs/getting-started/javascript.md
similarity index 92%
rename from docs/javascript/overview.md
rename to docs/getting-started/javascript.md
index 37e73ef258..fe9afce1b2 100644
--- a/docs/javascript/overview.md
+++ b/docs/getting-started/javascript.md
@@ -91,3 +91,10 @@ Bootstrap's plugins don't fall back particularly gracefully when JavaScript is d
   <h4>Third-party libraries</h4>
   <p><strong>Bootstrap does not officially support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own.</p>
 </div>
+
+## Transitions
+
+For simple transition effects, include `transition.js` once alongside the other JS files. If you're using the compiled (or minified) `bootstrap.js`, there is no need to include this—it's already there.
+
+Transition.js is a basic helper for `transitionEnd` events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions.
+
diff --git a/docs/javascript/transitions.md b/docs/javascript/transitions.md
deleted file mode 100644
index d8e64534d3..0000000000
--- a/docs/javascript/transitions.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: page
-title: Transitions
----
-
-### About transitions
-
-For simple transition effects, include `transition.js` once alongside the other JS files. If you're using the compiled (or minified) `bootstrap.js`, there is no need to include this—it's already there.
-
-### What's inside
-
-Transition.js is a basic helper for `transitionEnd` events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions.