Merge branch 'master' into ionic_api_docs

gazebosim · Aug 5, 2024 · 1b3097a · 1b3097a
2 parents 30e0e2e + 36db5d3
commit 1b3097a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/_static/css/gazebo.css b/_static/css/gazebo.css
@@ -90,9 +90,10 @@ header.navbar {
 }
 
 .bd-sidebar-primary {
-  max-height: calc(100vh - var(--pst-header-height) + var(--gz-doc-header-height));
+  max-height: calc(100vh - var(--pst-header-height) - var(--gz-doc-header-height));
   top: calc(var(--pst-header-height) + var(--gz-doc-header-height));
   background-color: var(--gz-color-primary-sidebar);
+  padding-top: 1em;
 }
 
 .bd-sidebar-secondary {

diff --git a/harmonic/install_ubuntu.md b/harmonic/install_ubuntu.md
@@ -22,7 +22,7 @@ Then install Gazebo Harmonic:
 
 
 ```bash
-curl https://packages.osrfoundation.org/gazebo.gpg --output /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg
+sudo curl https://packages.osrfoundation.org/gazebo.gpg --output /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null
 sudo apt-get update
 sudo apt-get install gz-harmonic

diff --git a/ionic/install.md b/ionic/install.md
@@ -54,10 +54,9 @@ This list may change up to the release date.
 
 These are the **officially** supported platforms:
 
-* Ubuntu Jammy on amd64
 * Ubuntu Noble on amd64
 
 Platforms supported at **best-effort** include arm architectures, Windows and
 macOS. See
-[this ticket](https://github.com/gazebo-tooling/release-tools/issues/597)
+[this ticket](https://github.com/gazebo-tooling/release-tools/issues/1158)
 for the full status.
diff --git a/ionic/install_ubuntu.md b/ionic/install_ubuntu.md
@@ -15,7 +15,7 @@ Then install Gazebo Ionic:
 
 
 ```bash
-curl https://packages.osrfoundation.org/gazebo.gpg --output /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg
+sudo curl https://packages.osrfoundation.org/gazebo.gpg --output /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null
 sudo apt-get update
 sudo apt-get install gz-ionic

diff --git a/ros_installation.md b/ros_installation.md
@@ -39,12 +39,12 @@ continued use.
 
 |                           | **GZ Citadel (LTS)**  | **GZ Fortress (LTS)**   | **GZ Garden**   | **GZ Harmonic (LTS)**   |
 |---------------------------|---------------------- |-----------------------  |---------------  | ----------------------  |
-| **ROS 2 Jazzy (LTS)**     | ❌                    | ❌                      | ⚡              | ✅                      |
-| **ROS 2 Rolling**         | ❌                    | ✅                      | ⚡              | ⚡                      |
-| **ROS 2 Iron**            | ❌                    | ✅                      | ⚡              | ⚡                      |
-| **ROS 2 Humble (LTS)**    | ❌                    | ✅                      | ⚡              | ⚡                      |
+| **ROS 2 Jazzy (LTS)**     | ❌                    | ❌                      | ⚡               | ✅                      |
+| **ROS 2 Rolling**         | ❌                    | ❌                      | ⚡               | ✅                      |
+| **ROS 2 Iron**            | ❌                    | ✅                      | ⚡               | ⚡                       |
+| **ROS 2 Humble (LTS)**    | ❌                    | ✅                      | ⚡               | ⚡                       |
 | **ROS 2 Foxy (LTS)**      | ✅                    | ❌                      | ❌              | ❌                      |
-| **ROS 1 Noetic (LTS)**    | ✅                    | ⚡                      | ❌              | ❌                      |
+| **ROS 1 Noetic (LTS)**    | ✅                    | ⚡                       | ❌              | ❌                      |
 
 
 * ✅ - Recommended combination