Merge branch 'master' of https://github.com/JuliaFEM/JuliaFEM.jl

README.md

@@ -7,7 +7,7 @@ Build Status: [![Build Status](https://travis-ci.org/JuliaFEM/JuliaFEM.jl.svg?br
 
 Code Coverage: [![Coverage Status](http://coveralls.io/repos/JuliaFEM/JuliaFEM.jl/badge.svg?branch=master)](https://coveralls.io/r/JuliaFEM/JuliaFEM.jl?branch=master)
 
-Documentation: [![Documentation Status](https://readthedocs.org/projects/juliafem/badge/?version=latest)](https://readthedocs.org/projects/juliafem/?badge=latest)
+Documentation: http://www.juliaFEM.org
 
 The JuliaFEM project develops open-source software for reliable, scalable, distributed Finite Element Method.
 

docs/api/README_new.md

@@ -1,2 +0,0 @@
-Files in this directory are generated using the `build.jl` script. Make
-all changes to the originating docstrings/files rather than these ones.

docs/conf.py

@@ -1,5 +1,9 @@
 import juliadoc
+import os
 
 extensions = ['juliadoc.julia', 'juliadoc.jlhelp']
 html_theme_path = [juliadoc.get_theme_dir()]
 html_sidebars = juliadoc.default_sidebars()
+
+print(os.getcwd())
+os.system("julia build.jl")

docs/requirements.txt

@@ -1 +1,2 @@
 -e git+https://github.com/JuliaLang/JuliaDoc.git#egg=Julia
+-e git+https://github.com/JuliaFEM/JuliaFEM.jl.git#egg=JuliaFEM