From 0aac77333922ac490d356125cb6de4ee07c8a207 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 29 Mar 2021 13:33:08 -0700 Subject: [PATCH] Disambiguate 'Linux' references in text --- source/Installation.rst | 4 ++-- source/Installation/DDS-Implementations.rst | 8 ++++---- source/Installation/Latest-Development-Setup.rst | 2 +- source/Installation/Prerelease-Testing.rst | 4 ++-- source/Installation/Ubuntu-Development-Setup.rst | 15 ++++++++------- source/Installation/Ubuntu-Install-Binary.rst | 8 ++++---- ...uilding-ROS-2-on-Linux-with-Eclipse-Oxygen.rst | 2 +- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/source/Installation.rst b/source/Installation.rst index 0c54d04609..ee770f6a4c 100644 --- a/source/Installation.rst +++ b/source/Installation.rst @@ -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 ` * `"fat" archive ` @@ -47,7 +47,7 @@ Building from source We support building ROS 2 from source on the following platforms: -* `Linux ` +* `Ubuntu Linux ` * `macOS ` * `Windows ` diff --git a/source/Installation/DDS-Implementations.rst b/source/Installation/DDS-Implementations.rst index 6b42e53063..954773fead 100644 --- a/source/Installation/DDS-Implementations.rst +++ b/source/Installation/DDS-Implementations.rst @@ -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) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -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) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/source/Installation/Latest-Development-Setup.rst b/source/Installation/Latest-Development-Setup.rst index adc827088f..5d7a1d8293 100644 --- a/source/Installation/Latest-Development-Setup.rst +++ b/source/Installation/Latest-Development-Setup.rst @@ -19,7 +19,7 @@ Building from source Follow the links below for the latest setup instructions for your platform: -* `Linux ` +* `Ubuntu Linux ` * `macOS ` * `Windows ` diff --git a/source/Installation/Prerelease-Testing.rst b/source/Installation/Prerelease-Testing.rst index 0850a802d1..b135e3aa09 100644 --- a/source/Installation/Prerelease-Testing.rst +++ b/source/Installation/Prerelease-Testing.rst @@ -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 ` for your platform. @@ -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: diff --git a/source/Installation/Ubuntu-Development-Setup.rst b/source/Installation/Ubuntu-Development-Setup.rst index 1c8f0c4ba9..d9a5c31bda 100644 --- a/source/Installation/Ubuntu-Development-Setup.rst +++ b/source/Installation/Ubuntu-Development-Setup.rst @@ -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 @@ -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 ` +Other Linux platforms with varying support levels include: + - Arch Linux, see `alternate instructions `__ +- Fedora Linux, see `alternate instructions ` - OpenEmbedded / webOS OSE, see `alternate instructions `__ -As defined in `REP 2000 `_ +As defined in `REP 2000 `_. System setup ------------ diff --git a/source/Installation/Ubuntu-Install-Binary.rst b/source/Installation/Ubuntu-Install-Binary.rst index d5856dee73..1bf00d6eb8 100644 --- a/source/Installation/Ubuntu-Install-Binary.rst +++ b/source/Installation/Ubuntu-Install-Binary.rst @@ -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:: @@ -37,7 +37,7 @@ Downloading ROS 2 Binary releases of Rolling Ridley are not provided. Instead you may download nightly `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. diff --git a/source/Tutorials/Building-ROS-2-on-Linux-with-Eclipse-Oxygen.rst b/source/Tutorials/Building-ROS-2-on-Linux-with-Eclipse-Oxygen.rst index 204786e25d..2ff10ee1e8 100644 --- a/source/Tutorials/Building-ROS-2-on-Linux-with-Eclipse-Oxygen.rst +++ b/source/Tutorials/Building-ROS-2-on-Linux-with-Eclipse-Oxygen.rst @@ -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.