github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-15 01:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'twitter/master' into poveropt

Browse Source 
Conflicts:
	js/bootstrap-popover.js
This commit is contained in:
Rod Vagg
2011-11-07 12:02:51 +11:00
parent 4d2e32e809 b15e24e3d4
commit d725ac2feb
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/javascript.html
View File

@@ -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>