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

1 files changed, 7 insertions, 0 deletions

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 7e0fdd858..e9654f5e6 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -191,6 +191,13 @@
                <td>{{_i}}true{{/i}}</td>
                <td>{{_i}}Shows the modal when initialized.{{/i}}</td>
              </tr>
+             <tr>
+               <td>{{_i}}remote{{/i}}</td>
+               <td>{{_i}}path{{/i}}</td>
+               <td>{{_i}}false{{/i}}</td>
+               <td><p>{{_i}}If a remote url is provided, content will be loaded via jQuery's <code>load</code> method and injected into the <code>.modal-body</code>. If you're using the data api, you may alternatively use the <code>href</code> tag to specify the remote source. An example of this is shown below:{{/i}}</p>
+<pre class="prettyprint linenums"><code>&lt;a data-toggle="modal" href="remote.html" data-target="#modal"&gt;click me&lt;/a&gt;</code></pre></td>
+             </tr>
             </tbody>
           </table>
           <h3>{{_i}}Markup{{/i}}</h3>