Permalink
Browse files

Merge branch 'zerkms-master' into 2.0.2-wip

Conflicts:
	Makefile
  • Loading branch information...
2 parents 8fd126b + 354252b commit 95cb6f07a8fc2410873c59addd3f1aad948e54fd @mdo mdo committed Mar 12, 2012
Showing with 2 additions and 3 deletions.
  1. +1 −2 Makefile
  2. +1 −1 js/README.md
View
@@ -19,7 +19,6 @@ docs: bootstrap
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
- cp js/tests/vendor/jquery.js docs/assets/js/
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
@@ -59,4 +58,4 @@ watch:
watchr -e "watch('less/.*\.less') { system 'make' }"
-.PHONY: docs watch gh-pages
+.PHONY: docs watch gh-pages
View
@@ -28,7 +28,7 @@ All public APIs should be single, chainable methods, and return the collection a
All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
$("#myModal").modal() // initialized with defaults
- $("#myModal").modal({ keyboard: false }) // initialized with now keyboard
+ $("#myModal").modal({ keyboard: false }) // initialized with no keyboard
$("#myModal").modal('show') // initializes and invokes show immediately afterqwe2
---

0 comments on commit 95cb6f0

Please sign in to comment.