Update README for kinetic (moveit#29)

Change master branch to kinetic-devel
ivareri · Oct 20, 2016 · e98ae2e · e98ae2e
1 parent a0f75a9
commit e98ae2e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,14 +1,18 @@
 # 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/
+This repo is automatically built by the ROS build farm and its output is hosted here: http://docs.ros.org/kinetic/api/moveit_tutorials/html/
 
 ## Travis Continuous Integration
 
 [![Build Status](https://travis-ci.org/ros-planning/moveit_tutorials.svg?branch=master)](https://travis-ci.org/ros-planning/moveit_tutorials)
 
 ## ROS Buildfarm
 
-[![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/)
+[![Build Status](http://build.ros.org/buildStatus/icon?job=Kdoc__moveit_tutorials__ubuntu_xenial_amd64)](http://build.ros.org/job/Kdoc__moveit_tutorials__ubuntu_xenial_amd64/)
+
+## Versions
+
+The ``indigo-devel`` branch should be considered for the most part "frozen" for historical reasons, and new changes to tutorials should be in the ``kinetic-devel`` branch.
 
 ## Build
 

diff --git a/conf.py b/conf.py
@@ -38,7 +38,7 @@
     "display_github": True,
     "github_user": "ros-planning",
     "github_repo": "moveit_tutorials",
-    "github_version": "master/",
+    "github_version": "kinetic-devel/",
     "conf_py_path": "",
     "source_suffix": source_suffix,
     "css_files": ['_static/override.css'],
@@ -53,7 +53,7 @@
 # Add any paths that contain custom themes here, relative to this directory.
 
 # Links
-extlinks = {'codedir': ('https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials//%s', ''),
+extlinks = {'codedir': ('https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials//%s', ''),
             'moveit_core': ('http://docs.ros.org/indigo/api/moveit_core/html/classmoveit_1_1core_1_1%s.html', ''),
             'planning_scene': ('http://docs.ros.org/indigo/api/moveit_core/html/classplanning__scene_1_1%s.html', ''),
             'planning_scene_interface': ('http://docs.ros.org/indigo/api/moveit_ros_planning_interface/html/classmoveit_1_1planning__interface_1_1%s.html', ''),

diff --git a/doc/pr2_tutorials/planning/scripts/doc/move_group_python_interface_tutorial.rst b/doc/pr2_tutorials/planning/scripts/doc/move_group_python_interface_tutorial.rst
@@ -16,7 +16,7 @@ The entire code can be seen :codedir:`here in the moveit_pr2 github project<plan
 The launch file
 ^^^^^^^^^^^^^^^
 The entire launch file is `here
-<https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials/planning/launch/move_group_python_interface_tutorial.launch>`_
+<https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials/planning/launch/move_group_python_interface_tutorial.launch>`_
 on github. All the code in this tutorial can be run from the
 moveit_tutorials package that you have as part of your MoveIt! setup.
 

diff --git a/doc/pr2_tutorials/planning/src/doc/motion_planning_api_tutorial.rst b/doc/pr2_tutorials/planning/src/doc/motion_planning_api_tutorial.rst
@@ -17,7 +17,7 @@ Follow the `instructions for compiling code from source <http://moveit.ros.org/i
 
 The launch file
 ^^^^^^^^^^^^^^^
-The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials/planning/launch/planning_pipeline_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package
+The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials/planning/launch/planning_pipeline_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package
 that you have as part of your MoveIt! setup.
 
 Running the code

diff --git a/doc/pr2_tutorials/planning/src/doc/move_group_interface_tutorial.rst b/doc/pr2_tutorials/planning/src/doc/move_group_interface_tutorial.rst
@@ -15,7 +15,7 @@ Follow the `instructions for compiling code from source <http://moveit.ros.org/i
 
 The launch file
 ^^^^^^^^^^^^^^^
-The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials/planning/launch/move_group_interface_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package
+The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials/planning/launch/move_group_interface_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package
 that you have as part of your MoveIt! setup.
 
 Running the code

diff --git a/doc/pr2_tutorials/planning/src/doc/planning_pipeline_tutorial.rst b/doc/pr2_tutorials/planning/src/doc/planning_pipeline_tutorial.rst
@@ -21,7 +21,7 @@ Follow the `instructions for compiling code from source <http://moveit.ros.org/i
 
 The launch file
 ^^^^^^^^^^^^^^^
-The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials/planning/launch/planning_pipeline_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package that you have as part of your MoveIt! setup.
+The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials/planning/launch/planning_pipeline_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package that you have as part of your MoveIt! setup.
 
 Running the code
 ^^^^^^^^^^^^^^^^

diff --git a/doc/pr2_tutorials/planning/src/doc/planning_scene_ros_api_tutorial.rst b/doc/pr2_tutorials/planning/src/doc/planning_scene_ros_api_tutorial.rst
@@ -19,7 +19,7 @@ Follow the `instructions for compiling code from source <http://moveit.ros.org/i
 
 The launch file
 ^^^^^^^^^^^^^^^
-The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials/planning/launch/planning_scene_ros_api_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package
+The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials/planning/launch/planning_scene_ros_api_tutorial.launch>`_ on github. All the code in this tutorial can be compiled and run from the moveit_tutorials package
 that you have as part of your MoveIt! setup.
 
 Running the code

diff --git a/doc/pr2_tutorials/planning/src/doc/planning_scene_tutorial.rst b/doc/pr2_tutorials/planning/src/doc/planning_scene_tutorial.rst
@@ -17,7 +17,7 @@ Follow the `instructions for compiling code from source <http://moveit.ros.org/i
 
 The launch file
 ^^^^^^^^^^^^^^^
-The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/master/doc/pr2_tutorials/planning/launch/planning_scene_tutorial.launch>`_ on github. All the code in this
+The entire launch file is `here <https://github.com/ros-planning/moveit_tutorials/tree/kinetic-devel/doc/pr2_tutorials/planning/launch/planning_scene_tutorial.launch>`_ on github. All the code in this
 tutorial can be compiled and run from the moveit_tutorials package
 that you have as part of your MoveIt! setup.