Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _themes/sphinx_rtd_theme/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

<div class="header-override">
<p>
<a href="http://moveit.ros.org/research">MoveIt! Website</a><br/>
<a href="http://moveit.ros.org">MoveIt! Website</a><br/>
<a href="http://moveit.ros.org/blog">Blog</a>
</p>
<a href="http://moveit.ros.org">
Expand Down
2 changes: 1 addition & 1 deletion doc/ros_visualization/joystick.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This script can read three types of joy sticks:

1. XBox360 Controller via USB
2. PS3 Controller via USB
3. PS3 Contrlller via Bluetooth (Please use ps3joy package <http://wiki.ros.org/ps3joy>)
3. PS3 Controller via Bluetooth (Please use ps3joy package at `http://wiki.ros.org/ps3joy <http://wiki.ros.org/ps3joy>`_)

Joystick Command Mappings
-------------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/ros_visualization/visualization_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Pre-requisites
---------------

You should have completed the `MoveIt! Setup Assistant tutorial
<http://docs.ros.org/api/moveit_setup_assistant/html/doc/tutorial.html>`_
<../setup_assistant/setup_assistant_tutorial.html>`_
and you should now have a MoveIt! configuration for the PR2 that you
can use. This tutorial assumes the generated MoveIt! configuration
package is called "pr2_moveit_config".
Expand Down
7 changes: 3 additions & 4 deletions doc/setup_assistant/setup_assistant_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ Add the right arm

* Choose *kdl_kinematics_plugin/KDLKinematicsPlugin* as the
kinematics solver. *Note: if you have a custom robot and would
like a powerful custom IK solver, see
`Kinematics/IKFast<http://moveit.ros.org/wiki/Kinematics/IKFast>`_*
like a powerful custom IK solver, see `Kinematics/IKFast <../ikfast_tutorial.html>`_ *

* Let *Kin. Search Resolution* and *Kin. Search Timeout* stay at
their default values.
Expand Down Expand Up @@ -277,13 +276,13 @@ The MoveIt! Rviz plugin

* Start looking at how you can use the generated configuration files
to play with MoveIt! using the
`MoveIt! Rviz Plugin <http://moveit.ros.org/wiki/PR2/Rviz_Plugin/Quick_Start>`_.
`MoveIt! Rviz Plugin <../ros_visualization/visualization_tutorial.html>`_.

Setup IKFast Inverse Kinematics Solver

* A faster IK solver than the default KDL solver, but takes some
additional steps to setup:
`Kinematics/IKFast <http://moveit.ros.org/wiki/Kinematics/IKFast>`_
`Kinematics/IKFast <../ikfast_tutorial.html>`_

Additional Reading
---------------------
Expand Down