...

4 files changed, 12 insertions, 8 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33995bf..7636493 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,12 @@ image: ubuntu:14.04
 pages:
   stage: deploy
   script:
-  - apt-get update
-  - apt-get install luarocks
-  - apt-get install python-sphinx
-  - apt-get install rsync
+  - apt-get update -y
+  - apt-get install luarocks -y
+  - apt-get install python-pip -y
+  - pip install sphinx
+  - apt-get install rsync -y
+  - apt-get install make -y
   - luarocks install ldoc
   - cd nerv/doc; make html; cd ../
   - ldoc .; cd ../
diff --git a/nerv/config.ld b/nerv/config.ld
index 2cee84a..9eb9b28 100644
--- a/nerv/config.ld
+++ b/nerv/config.ld
@@ -3,7 +3,7 @@ title = 'NERV documentation'
 description = 'A Lua-based toolkit for high-performance deep learning'
 backtick_references = true
 file = {'./', exclude = {'./lib/luaT'}}
-dir = 'doc/lua'
+dir = 'doc/build/html/'
 style = '!pale'
 format = 'markdown'
 kind_names = {topic = 'Manual', script = 'Programs'}
diff --git a/nerv/doc/source/index.rst b/nerv/doc/source/index.rst
index 21cf309..24d1fe2 100644
--- a/nerv/doc/source/index.rst
+++ b/nerv/doc/source/index.rst
@@ -1,9 +1,9 @@
-.. Nerv documentation master file, created by
+.. NERV documentation master file, created by
    sphinx-quickstart on Thu Jun 25 19:40:07 2015.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to Nerv's documentation!
+Welcome to NERV's documentation!
 ================================
 
 Contents:
diff --git a/nerv/doc/source/user.rst b/nerv/doc/source/user.rst
index eb4b53c..48f0c69 100644
--- a/nerv/doc/source/user.rst
+++ b/nerv/doc/source/user.rst
@@ -1,3 +1,5 @@
 User Manual
 ===========
-To be filled.
+
+- Overview
+- `NERV Lua Reference <lua/>`_