pierrepo · pierrepo · Jan 29, 2016 · Dec 10, 2015 · Dec 10, 2015 · Dec 11, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -60,7 +60,7 @@ install:
     - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install "mdanalysis>=0.11" --cache-dir $HOME/.cache/pip; fi
     - pip install -e .
     - if [[ $SETUP == 'doc' ]]; then pip install -r doc_requirements.txt --cache-dir $HOME/.cache/pip; fi
-    - if [[ $SETUP == 'doc' ]]; then ./doc-api/source/install_pandoc.sh; fi
+    - if [[ $SETUP == 'doc' ]]; then ./doc/source/install_pandoc.sh; fi
 
 
 # command to run tests
@@ -69,6 +69,6 @@ script:
     - if [[ $SETUP == 'test' ]]; then yes | ./run_demo1_assignation.sh; fi
     - if [[ $SETUP == 'test' ]]; then yes | ./run_demo2_statistics.sh; fi
     - if [[ $SETUP == 'test' ]]; then yes | ./run_demo2_clusters.sh; fi
-    - if [[ $SETUP == 'doc' ]]; then cd doc-api; sphinx-build -W -b html source build/html; fi
+    - if [[ $SETUP == 'doc' ]]; then cd doc; sphinx-build -W -b html source build/html; fi
 
 #after_success:
diff --git a/doc-api/source/index.rst b/doc-api/source/index.rst
diff --git a/doc-api/Makefile → doc/Makefile b/doc-api/Makefile → doc/Makefile
diff --git a/doc/demontrastation.md b/doc/demontrastation.md
diff --git a/doc/img/md_traj.PB.map.frame.jpg b/doc/img/md_traj.PB.map.frame.jpg
diff --git a/doc/installation.md b/doc/installation.md
diff --git a/doc/intro.PBs.md b/doc/intro.PBs.md
diff --git a/doc-api/make.bat → doc/make.bat b/doc-api/make.bat → doc/make.bat