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

1 files changed, 9 insertions, 3 deletions

diff --git a/docs/javascript.html b/docs/javascript.html
index f1ce98658..a35b44dd3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1362,7 +1362,7 @@ $('.myCarousel').carousel({
              <tr>
                <th style="width: 100px;">Name</th>
                <th style="width: 50px;">type</th>
-               <th style="width: 90px;">default</th>
+               <th style="width: 100px;">default</th>
                <th>description</th>
              </tr>
             </thead>
@@ -1382,15 +1382,21 @@ $('.myCarousel').carousel({
              <tr>
                <td>matcher</td>
                <td>function</td>
-               <td>case sensitive</td>
+               <td>case insensitive</td>
                <td>The method used to determine if a query matches an item. Accepts a single argument, the <code>item</code> against which to test the query. Access the current query with <code>this.query</code>. Return a boolean <code>true</code> if query is a match.</td>
              </tr>
              <tr>
                <td>sorter</td>
                <td>function</td>
-               <td>no sort</td>
+               <td>exact match,<br> case sensitive,<br> case insensitive</td>
                <td>Method used to sort autocomplete results. Accepts a single argument <code>items</code> and has the scope of the typeahead instance. Reference the current query with <code>this.query</code>.</td>
              </tr>
+             <tr>
+               <td>highlighter</td>
+               <td>function</td>
+               <td>highlights all default matches</td>
+               <td>Method used to highlight autocomplete results. Accepts a single argument <code>item</code> and has the scope of the typeahead instance. Should return html.</td>
+             </tr>
             </tbody>
           </table>