Skip to content

Commit

Permalink
Disambiguate 'Linux' references in text
Browse files Browse the repository at this point in the history
  • Loading branch information
cottsay committed Apr 1, 2021
1 parent 2494d2d commit 0aac773
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 21 deletions.
4 changes: 2 additions & 2 deletions source/Installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Binary packages

We currently provide ROS 2 binary packages for the following platforms:

* Linux (Ubuntu Focal(20.04))
* Ubuntu Linux - Focal Fossa (20.04)

* `Debian packages <Installation/Ubuntu-Install-Debians>`
* `"fat" archive <Installation/Ubuntu-Install-Binary>`
Expand All @@ -47,7 +47,7 @@ Building from source
We support building ROS 2 from source on the following platforms:


* `Linux <Installation/Ubuntu-Development-Setup>`
* `Ubuntu Linux <Installation/Ubuntu-Development-Setup>`
* `macOS <Installation/macOS-Development-Setup>`
* `Windows <Installation/Windows-Development-Setup>`

Expand Down
8 changes: 4 additions & 4 deletions source/Installation/DDS-Implementations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Detailed instructions for installing other DDS vendors are provided below.
:depth: 1
:local:

Linux source install
--------------------
Ubuntu Linux source install
---------------------------

RTI Connext (version 5.3.1, amd64 only)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -81,8 +81,8 @@ Source the setup file to set the ``NDDSHOME`` environment variable.
Now you can build as normal and support for RTI will be built as well.

Linux binary install
--------------------
Ubuntu Linux binary install
---------------------------

RTI Connext (version 5.3.1, amd64 only)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion source/Installation/Latest-Development-Setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Building from source

Follow the links below for the latest setup instructions for your platform:

* `Linux <Ubuntu-Development-Setup>`
* `Ubuntu Linux <Ubuntu-Development-Setup>`
* `macOS <macOS-Development-Setup>`
* `Windows <Windows-Development-Setup>`

Expand Down
4 changes: 2 additions & 2 deletions source/Installation/Prerelease-Testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ For Debian-based operating systems, you can install binary packages from the **r
Fat binaries
------------

For core packages, we run nightly packaging jobs for Linux, macOS, and Windows.
For core packages, we run nightly packaging jobs for Ubuntu Linux, macOS, and Windows.
These packaging jobs produce archives with pre-built binaries that can be downloaded and extracted to your filesystem.

1. Make sure you have all dependencies installed according to the `latest development setup <Latest-Development-Setup>` for your platform.
Expand Down Expand Up @@ -94,7 +94,7 @@ These packaging jobs produce archives with pre-built binaries that can be downlo
Docker
------

For Linux, there is also a nightly Docker image based on the nightly fat archive.
For Ubuntu Linux, there is also a nightly Docker image based on the nightly fat archive.

1. Pull the Docker image:

Expand Down
15 changes: 8 additions & 7 deletions source/Installation/Ubuntu-Development-Setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

Installation/Linux-Development-Setup

Building ROS 2 on Linux
=======================
Building ROS 2 on Ubuntu Linux
==============================

.. contents:: Table of Contents
:depth: 2
Expand All @@ -14,18 +14,19 @@ Building ROS 2 on Linux

System requirements
-------------------
The current target platforms for Rolling Ridley are
The current Debian-based target platforms for Rolling Ridley are:

- Tier 1: Ubuntu Linux - Focal Fossa (20.04) 64-bit
- Tier 3: Debian Linux - Bullseye (11) 64-bit

Tier 3 platforms (not actively tested or supported) include:

- Debian Linux - Buster (10)
- Fedora 32, see `alternate instructions <Fedora-Development-Setup>`
Other Linux platforms with varying support levels include:

- Arch Linux, see `alternate instructions <https://wiki.archlinux.org/index.php/ROS#ROS_2>`__
- Fedora Linux, see `alternate instructions <Fedora-Development-Setup>`
- OpenEmbedded / webOS OSE, see `alternate instructions <https://github.com/ros/meta-ros/wiki/OpenEmbedded-Build-Instructions>`__

As defined in `REP 2000 <https://www.ros.org/reps/rep-2000.html>`_
As defined in `REP 2000 <https://www.ros.org/reps/rep-2000.html>`_.

System setup
------------
Expand Down
8 changes: 4 additions & 4 deletions source/Installation/Ubuntu-Install-Binary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

Installation/Linux-Install-Binary

Installing ROS 2 on Linux
=========================
Installing ROS 2 on Ubuntu Linux
================================

.. contents:: Table of Contents
:depth: 2
:local:

This page explains how to install ROS 2 on Linux from a pre-built binary package.
This page explains how to install ROS 2 on Ubuntu Linux from a pre-built binary package.

.. note::

Expand Down Expand Up @@ -37,7 +37,7 @@ Downloading ROS 2
Binary releases of Rolling Ridley are not provided.
Instead you may download nightly `prerelease binaries <Prerelease_binaries>`.

* Download the latest package for Linux; let's assume that it ends up at ``~/Downloads/ros2-package-linux-x86_64.tar.bz2``.
* Download the latest package for Ubuntu; let's assume that it ends up at ``~/Downloads/ros2-package-linux-x86_64.tar.bz2``.

* Note: there may be more than one binary download option which might cause the file name to differ.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Add export RTI_LICENSE_FILE=/home/ros/rti_connext_dds-5.3.1/rti_license.dat to .


An RTI license is now needed, which we can get on their website.
Refer to `Linux Development Setup page <../Installation/Ubuntu-Development-Setup>`.
Refer to `Ubuntu Linux Development Setup page <../Installation/Ubuntu-Development-Setup>`.
The RTI license file will be directly sent via email after sign-up.

In the email is a link to the RTI software to download.
Expand Down

0 comments on commit 0aac773

Please sign in to comment.