Skip to content

Commit

Permalink
Merge branch 'moveit:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mosfet80 authored Aug 26, 2024
2 parents abc02a3 + 8e743d8 commit adcf107
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/how_to_guides/benchmarking/benchmarking_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The example below demonstrates how the benchmarking can be run.
Example
-------

To run the example you need to install git lfs by running ``git lfs install`` and clone [moveit_benchmark_resources](https://github.com/moveit/moveit_benchmark_resources.git) into your workspace.
To run the example you need to install git lfs by running ``git lfs install`` and clone `moveit_benchmark_resources <https://github.com/moveit/moveit_benchmark_resources.git`_ into your workspace.

Start the benchmarks by running: ::

Expand Down
4 changes: 2 additions & 2 deletions doc/tutorials/getting_started/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ Download Source Code of MoveIt and the Tutorials
Move into your Colcon workspace and pull the MoveIt tutorials source, where ``<branch>`` can be e.g. ``humble`` for ROS Humble, or ``main`` for the latest version of the tutorials : ::

cd ~/ws_moveit/src
git clone https://github.com/moveit/moveit2_tutorials
git clone -b <branch> https://github.com/moveit/moveit2_tutorials

Next we will download the source code for the rest of MoveIt: ::

vcs import < moveit2_tutorials/moveit2_tutorials.repos
vcs import --recursive < moveit2_tutorials/moveit2_tutorials.repos

The import command may ask for your GitHub credentials.
You can just press Enter until it moves on (ignore the "Authentication failed" error).
Expand Down
2 changes: 1 addition & 1 deletion index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Welcome to the unified MoveIt documentation, which includes tutorials, how-to gu
MoveIt 2 is the robotic manipulation platform for ROS 2 and incorporates the latest advances in motion planning, manipulation, 3D perception, kinematics, control, and navigation. MoveIt 2 was first released in 2019; for ROS 1 documentation, see `MoveIt 1 tutorials <https://moveit.github.io/moveit_tutorials>`_.
For the commercially supported version see `MoveIt Pro tutorials <https://docs.picknik.ai/en/stable/>`_.

.. image:: https://moveit.ros.org/assets/images/roadmap.png
.. image:: http://moveit.ros.org/assets/images/roadmap.png
:width: 400px

How-To Use This Website
Expand Down

0 comments on commit adcf107

Please sign in to comment.