diff options
| author | Mark Otto <[email protected]> | 2013-07-31 18:02:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-31 18:02:49 -0700 |
| commit | 3cdb07fab3957ce3a97d17ea9cdf55b4c35c5cbc (patch) | |
| tree | 7be7b2da03bfc693145f6799806111ef37e86b9a | |
| parent | 4c27f3ce8018cab6340b8b801ee5e8f362fbe3d3 (diff) | |
| parent | f62fb27b048c8b6b2d7cff1531e71df81f05395c (diff) | |
| download | bootstrap-3cdb07fab3957ce3a97d17ea9cdf55b4c35c5cbc.tar.xz bootstrap-3cdb07fab3957ce3a97d17ea9cdf55b4c35c5cbc.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javascript.html b/javascript.html index 6d7b7ccad..845a6e9ec 100644 --- a/javascript.html +++ b/javascript.html @@ -262,7 +262,7 @@ $('#myModal').on('show.bs.modal', function (e) { <td>remote</td> <td>path</td> <td>false</td> - <td><p>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:</p> + <td><p>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> attribute to specify the remote source. An example of this is shown below:</p> {% highlight html %} <a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a> {% endhighlight %} @@ -802,7 +802,7 @@ $('#example').tooltip(options) <td>title</td> <td>string | function</td> <td>''</td> - <td>default title value if <code>title</code> tag isn't present</td> + <td>default title value if <code>title</code> attribute isn't present</td> </tr> <tr> <td>trigger</td> |