From aa8e6b081c43651b2c54af4809d853acf58f62b4 Mon Sep 17 00:00:00 2001 From: Jonathan Maron Date: Fri, 9 Mar 2012 07:38:14 +0100 Subject: [PATCH 1/2] Fixed double copy action in Makefile. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 923c0ced34..6979d70b18 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -56,4 +55,4 @@ watch: watchr -e "watch('less/.*\.less') { system 'make' }" -.PHONY: dist docs watch gh-pages \ No newline at end of file +.PHONY: dist docs watch gh-pages From 354252b4b506221f14d3f95627b0c887eb160caa Mon Sep 17 00:00:00 2001 From: Ivan Kurnosov Date: Mon, 12 Mar 2012 10:24:18 +1300 Subject: [PATCH 2/2] Grammar fix in js/README.md --- js/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/README.md b/js/README.md index 3aa09c960f..1c3ced31f8 100644 --- a/js/README.md +++ b/js/README.md @@ -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 ---