Merge branch 'raphaelz-patch-1' into 2.0.1-wip

Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-06 23:36:31 -08:00
7 changed files with 24 additions and 10 deletions

View File

@@ -197,6 +197,12 @@
<td>{{_i}}true{{/i}}</td>
<td>{{_i}}Closes the modal when escape key is pressed{{/i}}</td>
</tr>
<tr>
<td>{{_i}}show{{/i}}</td>
<td>{{_i}}boolean{{/i}}</td>
<td>{{_i}}true{{/i}}</td>
<td>{{_i}}Shows the modal when initialized.{{/i}}</td>
</tr>
</tbody>
</table>
<h3>{{_i}}Markup{{/i}}</h3>