Rename documentation folder.

Change also the project name in the sphinx parameters.
pierrepo · Dec 15, 2015 · 0d9383c · 0d9383c
1 parent 268a6a0
commit 0d9383c
Show file tree

Hide file tree

Showing 36 changed files with 3 additions and 3 deletions.
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/Makefile → doc/Makefile b/doc-api/Makefile → doc/Makefile
diff --git a/doc-api/make.bat → doc/make.bat b/doc-api/make.bat → doc/make.bat
diff --git a/doc-api/source/Fontmap.GS → doc/source/Fontmap.GS b/doc-api/source/Fontmap.GS → doc/source/Fontmap.GS
diff --git a/doc-api/source/PBassign.rst → doc/source/PBassign.rst b/doc-api/source/PBassign.rst → doc/source/PBassign.rst
diff --git a/doc-api/source/PBclust.rst → doc/source/PBclust.rst b/doc-api/source/PBclust.rst → doc/source/PBclust.rst
diff --git a/doc-api/source/PBcount.rst → doc/source/PBcount.rst b/doc-api/source/PBcount.rst → doc/source/PBcount.rst
diff --git a/doc-api/source/PBstat.rst → doc/source/PBstat.rst b/doc-api/source/PBstat.rst → doc/source/PBstat.rst
diff --git a/doc-api/source/_static/empty → doc/source/_static/empty b/doc-api/source/_static/empty → doc/source/_static/empty
diff --git a/doc-api/source/build.sh → doc/source/build.sh b/doc-api/source/build.sh → doc/source/build.sh
diff --git a/doc-api/source/conf.py → doc/source/conf.py b/doc-api/source/conf.py → doc/source/conf.py
@@ -54,7 +54,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'PBxplore API'
+project = u'PBxplore'
 copyright = u'2015, Pierre Poulain, and Alexandre G. deBrevern'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/doc-api/source/img/1AY7_B.jpg → doc/source/img/1AY7_B.jpg b/doc-api/source/img/1AY7_B.jpg → doc/source/img/1AY7_B.jpg
diff --git a/doc-api/source/img/Neq.jpg → doc/source/img/Neq.jpg b/doc-api/source/img/Neq.jpg → doc/source/img/Neq.jpg
diff --git a/doc-api/source/img/PBs.jpg → doc/source/img/PBs.jpg b/doc-api/source/img/PBs.jpg → doc/source/img/PBs.jpg
diff --git a/...api/source/img/psi_md_traj_all.PB.Neq.jpg → doc/source/img/psi_md_traj_all.PB.Neq.jpg b/...api/source/img/psi_md_traj_all.PB.Neq.jpg → doc/source/img/psi_md_traj_all.PB.Neq.jpg
diff --git a/...pi/source/img/psi_md_traj_all.PB.logo.jpg → doc/source/img/psi_md_traj_all.PB.logo.jpg b/...pi/source/img/psi_md_traj_all.PB.logo.jpg → doc/source/img/psi_md_traj_all.PB.logo.jpg
diff --git a/...api/source/img/psi_md_traj_all.PB.map.jpg → doc/source/img/psi_md_traj_all.PB.map.jpg b/...api/source/img/psi_md_traj_all.PB.map.jpg → doc/source/img/psi_md_traj_all.PB.map.jpg
diff --git a/...mg/psi_md_traj_all_frame.PB.Neq.15-42.jpg → ...mg/psi_md_traj_all_frame.PB.Neq.15-42.jpg b/...mg/psi_md_traj_all_frame.PB.Neq.15-42.jpg → ...mg/psi_md_traj_all_frame.PB.Neq.15-42.jpg
diff --git a/...g/psi_md_traj_all_frame.PB.logo.15-42.jpg → ...g/psi_md_traj_all_frame.PB.logo.15-42.jpg b/...g/psi_md_traj_all_frame.PB.logo.15-42.jpg → ...g/psi_md_traj_all_frame.PB.logo.15-42.jpg
diff --git a/...mg/psi_md_traj_all_frame.PB.map.15-42.jpg → ...mg/psi_md_traj_all_frame.PB.map.15-42.jpg b/...mg/psi_md_traj_all_frame.PB.map.15-42.jpg → ...mg/psi_md_traj_all_frame.PB.map.15-42.jpg
diff --git a/doc-api/source/index.rst → doc/source/index.rst b/doc-api/source/index.rst → doc/source/index.rst
diff --git a/doc-api/source/install_pandoc.sh → doc/source/install_pandoc.sh b/doc-api/source/install_pandoc.sh → doc/source/install_pandoc.sh
diff --git a/doc-api/source/installation.rst → doc/source/installation.rst b/doc-api/source/installation.rst → doc/source/installation.rst
diff --git a/doc-api/source/intro_PB.rst → doc/source/intro_PB.rst b/doc-api/source/intro_PB.rst → doc/source/intro_PB.rst
diff --git a/doc-api/source/notebooks/Assignement.ipynb → doc/source/notebooks/Assignement.ipynb b/doc-api/source/notebooks/Assignement.ipynb → doc/source/notebooks/Assignement.ipynb
diff --git a/doc-api/source/notebooks/Deformability.ipynb → doc/source/notebooks/Deformability.ipynb b/doc-api/source/notebooks/Deformability.ipynb → doc/source/notebooks/Deformability.ipynb
diff --git a/doc-api/source/notebooks/WritePB.ipynb → doc/source/notebooks/WritePB.ipynb b/doc-api/source/notebooks/WritePB.ipynb → doc/source/notebooks/WritePB.ipynb
diff --git a/doc-api/source/pages/PB.rst → doc/source/pages/PB.rst b/doc-api/source/pages/PB.rst → doc/source/pages/PB.rst
diff --git a/doc-api/source/pages/analysis.rst → doc/source/pages/analysis.rst b/doc-api/source/pages/analysis.rst → doc/source/pages/analysis.rst
diff --git a/doc-api/source/pages/assign.rst → doc/source/pages/assign.rst b/doc-api/source/pages/assign.rst → doc/source/pages/assign.rst
diff --git a/doc-api/source/pages/demo.rst → doc/source/pages/demo.rst b/doc-api/source/pages/demo.rst → doc/source/pages/demo.rst
diff --git a/doc-api/source/pages/io.rst → doc/source/pages/io.rst b/doc-api/source/pages/io.rst → doc/source/pages/io.rst
diff --git a/doc-api/source/pages/pbxplore.rst → doc/source/pages/pbxplore.rst b/doc-api/source/pages/pbxplore.rst → doc/source/pages/pbxplore.rst
diff --git a/doc-api/source/pages/structure.rst → doc/source/pages/structure.rst b/doc-api/source/pages/structure.rst → doc/source/pages/structure.rst
diff --git a/doc-api/source/pandoc_fix_img.py → doc/source/pandoc_fix_img.py b/doc-api/source/pandoc_fix_img.py → doc/source/pandoc_fix_img.py
diff --git a/doc-api/source/utilization.rst → doc/source/utilization.rst b/doc-api/source/utilization.rst → doc/source/utilization.rst