moved sphinx docs to master repository

zhangjunah · Mar 12, 2013 · 6c82b54 · 6c82b54
1 parent 7aad8fe
commit 6c82b54
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 .DS_Store
 *.xml
 *.png
+/docs/*.js
+/docs/*.xml
+/docs/_build
 /tmp
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "docs"]
-	path = docs
-	url = git://github.com/n1k0/casperjs.git

diff --git a/Makefile b/Makefile
@@ -1,14 +1,17 @@
-.PHONY: default all
+.PHONY: default test docs selftest clitest jshint
 
-default: all
+default: test
 
-all: selftest clitest jshint
+test: selftest clitest jshint
+
+docs:
+	sphinx-build -b html ./docs docs/_build
 
 selftest:
-	-bin/casperjs selftest
+	bin/casperjs selftest
 
 clitest:
-	-python tests/clitests/runtests.py
+	python tests/clitests/runtests.py
 
 jshint:
-	-jshint --config=.jshintconfig .
+	jshint --config=.jshintconfig .
diff --git a/docs b/docs