From a951d8d9386b17cbc8a7616c78fa6818e1254526 Mon Sep 17 00:00:00 2001 From: ovainola Date: Fri, 26 Jun 2015 22:30:02 +0300 Subject: [PATCH 1/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41f8f9f..1e4c54c 100644 --- a/README.md +++ b/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. From edac8acdd17670b1a7201fad51a81792e0d9024c Mon Sep 17 00:00:00 2001 From: ovainola Date: Fri, 26 Jun 2015 22:53:26 +0300 Subject: [PATCH 2/6] Update conf.py --- docs/conf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index 3eff946..abb2833 100644 --- a/docs/conf.py +++ b/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") From d8371cb79cfa9e3563d60bf283896a7fa69773b3 Mon Sep 17 00:00:00 2001 From: ovainola Date: Fri, 26 Jun 2015 22:55:48 +0300 Subject: [PATCH 3/6] Update requirements.txt --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index 8178b81..d8f080b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1 +1,2 @@ -e git+https://github.com/JuliaLang/JuliaDoc.git#egg=Julia +-e git+https://github.com/JuliaLFEM/JuliaFEM.jl.git From d27ca331d51d6d87cc14399018dcc158667af742 Mon Sep 17 00:00:00 2001 From: ovainola Date: Fri, 26 Jun 2015 22:56:57 +0300 Subject: [PATCH 4/6] Update requirements.txt --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d8f080b..e88a0d6 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -e git+https://github.com/JuliaLang/JuliaDoc.git#egg=Julia --e git+https://github.com/JuliaLFEM/JuliaFEM.jl.git +-e git+https://github.com/JuliaLFEM/JuliaFEM.jl.git#egg=JuliaFEM From 52e1c9f832a8d5aaa14e9735c726690990922306 Mon Sep 17 00:00:00 2001 From: ovainola Date: Fri, 26 Jun 2015 22:59:25 +0300 Subject: [PATCH 5/6] Update requirements.txt --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e88a0d6..c65b92d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -e git+https://github.com/JuliaLang/JuliaDoc.git#egg=Julia --e git+https://github.com/JuliaLFEM/JuliaFEM.jl.git#egg=JuliaFEM +-e git+https://github.com/JuliaFEM/JuliaFEM.jl.git#egg=JuliaFEM From b1e7aff420a382bf47ee6d5fe15559e5e29cd46c Mon Sep 17 00:00:00 2001 From: ovainola Date: Fri, 26 Jun 2015 23:05:29 +0300 Subject: [PATCH 6/6] Delete README_new.md --- docs/api/README_new.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 docs/api/README_new.md diff --git a/docs/api/README_new.md b/docs/api/README_new.md deleted file mode 100644 index f11064e..0000000 --- a/docs/api/README_new.md +++ /dev/null @@ -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.