Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip

3 files changed, 2 insertions, 2 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2408ccef9..7a9438480 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/javascript.html b/docs/javascript.html
index 1e1accb89..4f40934f7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -276,7 +276,7 @@
                <td>backdrop</td>
                <td>boolean</td>
                <td>true</td>
-               <td>Includes a modal-backdrop element</td>
+               <td>Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.</td>
              </tr>
              <tr>
                <td>keyboard</td>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 5e248fa51..aa3a280f4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -200,7 +200,7 @@
                <td>{{_i}}backdrop{{/i}}</td>
                <td>{{_i}}boolean{{/i}}</td>
                <td>{{_i}}true{{/i}}</td>
-               <td>{{_i}}Includes a modal-backdrop element{{/i}}</td>
+               <td>{{_i}}Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.{{/i}}</td>
              </tr>
              <tr>
                <td>{{_i}}keyboard{{/i}}</td>