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

docs/build_notebooks.jl

@@ -55,7 +55,7 @@ function run_notebooks()
             # port = 34211+k  # we're having some weird port issue with zmq
             # k += 1
             try
-                run(`runipy -o tutorials/$ipynb --kernel=julia-0.4`)
+                run(`timeout 180 runipy -o tutorials/$ipynb --kernel=julia-0.4`)
                 status = 0
             catch
                 println("did not work")

docs/links.md

@@ -22,4 +22,6 @@ Integration
 - http://arxiv.org/pdf/1411.1341.pdf
 
 Hierarchial shape functions
-- https://www.math.vt.edu/people/adjerids/research/papers/basis.pdf
+- https://www.math.vt.edu/people/adjerids/research/papers/basis.pdf
+
+- edited by Ari