diff options
| author | Mark Otto <[email protected]> | 2012-06-02 22:14:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-02 22:14:12 -0700 |
| commit | 9a4ee790e1e58e321b604bb66380b2ce2f00faf6 (patch) | |
| tree | ac9099103a98153aeb5d69c674af5546c6aa926b /docs/templates | |
| parent | 9a3a297a478e1a27cce913b8d30170a6949b52f7 (diff) | |
| parent | 2d3a0babd242d7eebe09cf3f4daad38e2d7df6ee (diff) | |
| download | bootstrap-9a4ee790e1e58e321b604bb66380b2ce2f00faf6.tar.xz bootstrap-9a4ee790e1e58e321b604bb66380b2ce2f00faf6.zip | |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 26ca9b538..7e0fdd858 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1376,9 +1376,9 @@ $('.carousel').carousel({ <tbody> <tr> <td>{{_i}}source{{/i}}</td> - <td>{{_i}}array{{/i}}</td> + <td>{{_i}}array, function{{/i}}</td> <td>[ ]</td> - <td>{{_i}}The data source to query against.{{/i}}</td> + <td>{{_i}}The data source to query against. May be an array of strings or a function. The function is passed two arguments, the <code>query</code> value in the input field and the <code>process</code> callback. The function may be used synchronously by returning the data source directly or asynchronously via the <code>process</code> callback's single argument.{{/i}}</td> </tr> <tr> <td>{{_i}}items{{/i}}</td> @@ -1417,4 +1417,4 @@ $('.carousel').carousel({ <p>{{_i}}Initializes an input with a typeahead.{{/i}}</p> </div> </div> - </section>
\ No newline at end of file + </section> |