Move index to root of package

ivareri · Aug 23, 2016 · c6b6202 · c6b6202
1 parent 75b5357
commit c6b6202
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MoveIt! Tutorials
 
-This repo is automatically built by the ROS build farm and its output is hosted here: http://docs.ros.org/indigo/api/moveit_tutorials/html/build/doc/
+This repo is automatically built by the ROS build farm and its output is hosted here: http://docs.ros.org/indigo/api/moveit_tutorials/html/
 
 [![Build Status](http://build.ros.org/buildStatus/icon?job=Idoc__moveit_tutorials__ubuntu_trusty_amd64&build=2)](http://build.ros.org/job/Idoc__moveit_tutorials__ubuntu_trusty_amd64/2/)
 
@@ -10,4 +10,4 @@ To build locally for testing, run in root of repo:
 
     rosdoc_lite -o build .
 
-Then open ``/build/html/build/doc/index.html`` in your web browser.
+Then open ``/build/html/index.html`` in your web browser.
diff --git a/conf.py b/conf.py
@@ -6,7 +6,7 @@
                'tutorialformatter' ]
 
 # The master toctree document.
-master_doc = 'doc/index'
+master_doc = 'index'
 
 # The suffix of source filenames.
 source_suffix = '.rst'

diff --git a/doc/index.rst → index.rst b/doc/index.rst → index.rst
@@ -11,9 +11,9 @@ The primary user interface to MoveIt! is through the move_group_interface. You c
 .. toctree::
    :maxdepth: 1
 
-   ros_visualization/visualization_tutorial
-   pr2_tutorials/planning/src/doc/move_group_interface_tutorial
-   pr2_tutorials/planning/scripts/doc/move_group_python_interface_tutorial
+   doc/ros_visualization/visualization_tutorial
+   doc/pr2_tutorials/planning/src/doc/move_group_interface_tutorial
+   doc/pr2_tutorials/planning/scripts/doc/move_group_python_interface_tutorial
 
 Advanced
 --------
@@ -23,14 +23,14 @@ This set of advanced tutorials is meant for developers who are using MoveIt!’s
 .. toctree::
    :maxdepth: 1
 
-   pr2_tutorials/kinematics/src/doc/kinematics_tutorial
-   pr2_tutorials/planning/src/doc/planning_scene_tutorial
-   pr2_tutorials/planning/src/doc/planning_scene_ros_api_tutorial
-   pr2_tutorials/planning/src/doc/motion_planning_api_tutorial
-   pr2_tutorials/planning/src/doc/planning_pipeline_tutorial
-   fake_controller_manager_tutorial
-   ros_visualization/joystick.rst
-   custom_constraint_samplers
+   doc/pr2_tutorials/kinematics/src/doc/kinematics_tutorial
+   doc/pr2_tutorials/planning/src/doc/planning_scene_tutorial
+   doc/pr2_tutorials/planning/src/doc/planning_scene_ros_api_tutorial
+   doc/pr2_tutorials/planning/src/doc/motion_planning_api_tutorial
+   doc/pr2_tutorials/planning/src/doc/planning_pipeline_tutorial
+   doc/fake_controller_manager_tutorial
+   doc/ros_visualization/joystick.rst
+   doc/custom_constraint_samplers
 
 Integration with New Robot
 --------------------------
@@ -40,20 +40,20 @@ Before attempting to integrate a new robot with MoveIt!, check whether your robo
 .. toctree::
    :maxdepth: 1
 
-   setup_assistant/setup_assistant_tutorial
-   pr2_tutorials/planning/src/doc/controller_configuration
-   pr2_tutorials/planning/src/doc/perception_configuration
-   ikfast_tutorial
-   trac_ik_tutorial
+   doc/setup_assistant/setup_assistant_tutorial
+   doc/pr2_tutorials/planning/src/doc/controller_configuration
+   doc/pr2_tutorials/planning/src/doc/perception_configuration
+   doc/ikfast_tutorial
+   doc/trac_ik_tutorial
 
 Configuration
 -------------
 
 .. toctree::
    :maxdepth: 1
 
-   pr2_tutorials/kinematics/src/doc/kinematics_configuration
-   ompl_interface_tutorial
+   doc/pr2_tutorials/kinematics/src/doc/kinematics_configuration
+   doc/ompl_interface_tutorial
 
 Attribution
 -----------