diff options
| author | Rod Vagg <[email protected]> | 2011-11-07 12:02:51 +1100 |
|---|---|---|
| committer | Rod Vagg <[email protected]> | 2011-11-07 12:02:51 +1100 |
| commit | d725ac2feb0abc1469ff526a29de2cf426639ad2 (patch) | |
| tree | 675ee94201a0cb2a9e033407d30b8bd8afd3224f /docs | |
| parent | 4d2e32e80914dbc526dcde7c743b0537ded7c853 (diff) | |
| parent | b15e24e3d460ef2cbe20f13c648b42024be096fa (diff) | |
| download | bootstrap-d725ac2feb0abc1469ff526a29de2cf426639ad2.tar.xz bootstrap-d725ac2feb0abc1469ff526a29de2cf426639ad2.zip | |
Merge remote-tracking branch 'twitter/master' into poveropt
Conflicts:
js/bootstrap-popover.js
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 90b7be0c5..d62dd731c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -683,7 +683,7 @@ $('#.tabs').bind('change', function (e) { <td>content</td> <td>string, function</td> <td>'data-content'</td> - <td>a string or method for retrieving content text. if none are provided, content will be sourced from a data-content attribute.</td> + <td>attribute or method for retrieving content text.</td> </tr> <tr> <td>trigger</td> |