deploy: 0e243eb

docs/acropolis/_sources/contributing.md.txt

@@ -163,7 +163,7 @@ get acquainted with this development process.
 1. **Choose a base branch.**
    - If your changes will break API or ABI, then base your new branch off of `main`.
    - If you are making interdependent changes to multiple repositories without
-     breaking API or ABI, it is also recommended to base your new branches of of `main`
+     breaking API or ABI, it is also recommended to base your new branches off of `main`
      to simplify automated testing of the changes and the review process. Your
      changes may be backported to an existing release once all the changes
      have been merged.
@@ -381,11 +381,32 @@ Merging strategy:
 
 Porting changes across branches:
 
-* Pull requests should target the lowest possible
-  [supported version](releases) where the
+* Pull requests should target the latest [supported version](releases) where the
   changes can be added in a backwards-compatible way (no API / ABI / behavior
   break in released branches).
-* Periodically, a maintainer will **forward-port** changes to newer release
+* To backport a pull request (i.e. from a higher version to a lower version),
+  use `git cherry-pick` instead of `git merge`, for example:
+
+        git checkout gz-<library>N
+        git pull
+        git checkout gz-<library>M
+        git pull
+        git checkout -b N_to_M_<date>
+        git cherry-pick <commits from verrsion N>
+        # Fix conflicts
+        git commit -sam"Backport from N to M"
+        # Open pull request
+        # Do not squash, rebase instead
+
+  Alternatively, you can use `mergify` to create backports. Go to the original
+  pull request and add a comment:
+
+        @mergifyio backport gz-<library>M
+
+  where `M` is the version to backport to.
+
+* In certain cases when a pull request is merged into an older release branch,
+  a maintainer will **forward-port** changes to newer release
   branches all the way up to `main`.
 * See [this list](https://github.com/gazebosim/docs/blob/master/tools/branch_comparisons.md) to check if a branch needs porting.
 * The merge forward can be done with `git merge` in order to keep the commit history
@@ -402,20 +423,6 @@ Porting changes across branches:
         # Open pull request
         # Do not squash or rebase, create a merge commit
 
-* In the rare event that a pull request needs to be backported (i.e. from a
-  higher version to a lower version), use `git cherry-pick` instead of `git merge`,
-  for example:
-
-        git checkout gz-<library>N
-        git pull
-        git checkout gz-<library>M
-        git pull
-        git checkout -b N_to_M_<date>
-        git cherry-pick <commits from verrsion N>
-        # Fix conflicts
-        git commit -sam"Backport from N to M"
-        # Open pull request
-        # Do not squash, rebase instead
 
 ## Writing Tests
 

docs/acropolis/_static/scripts/fontawesome.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2024 Fonticons, Inc.
+ */

docs/acropolis/_static/webpack-macros.html

@@ -2,30 +2,23 @@
   AUTO-GENERATED from webpack.config.js, do **NOT** edit by hand.
   These are re-used in layout.html
 -->
-{# Load FontAwesome icons #}
-{% macro head_pre_icons() %}
-  <link href="{{ pathto('_static/vendor/fontawesome/6.5.2/css/all.min.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
-  <link rel="preload" as="font" type="font/woff2" crossorigin href="{{ pathto('_static/vendor/fontawesome/6.5.2/webfonts/fa-solid-900.woff2', 1) }}" />
-<link rel="preload" as="font" type="font/woff2" crossorigin href="{{ pathto('_static/vendor/fontawesome/6.5.2/webfonts/fa-brands-400.woff2', 1) }}" />
-<link rel="preload" as="font" type="font/woff2" crossorigin href="{{ pathto('_static/vendor/fontawesome/6.5.2/webfonts/fa-regular-400.woff2', 1) }}" />
-{% endmacro %}
 
 {% macro head_pre_assets() %}
   <!-- Loaded before other Sphinx assets -->
-  <link href="{{ pathto('_static/styles/theme.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
-<link href="{{ pathto('_static/styles/bootstrap.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
-<link href="{{ pathto('_static/styles/pydata-sphinx-theme.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
+  <link href="{{ pathto('_static/styles/theme.css', 1) }}?digest=26a4bc78f4c0ddb94549" rel="stylesheet" />
+<link href="{{ pathto('_static/styles/pydata-sphinx-theme.css', 1) }}?digest=26a4bc78f4c0ddb94549" rel="stylesheet" />
 {% endmacro %}
 
 {% macro head_js_preload() %}
+  <!-- So that users can add custom icons -->
+  <script src="{{ pathto('_static/scripts/fontawesome.js', 1) }}?digest=26a4bc78f4c0ddb94549"></script>
   <!-- Pre-loaded scripts that we'll load fully later -->
-  <link rel="preload" as="script" href="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=dfe6caa3a7d634c4db9b" />
-<link rel="preload" as="script" href="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=dfe6caa3a7d634c4db9b" />
-  <script src="{{ pathto('_static/vendor/fontawesome/6.5.2/js/all.min.js', 1) }}?digest=dfe6caa3a7d634c4db9b"></script>
+  <link rel="preload" as="script" href="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=26a4bc78f4c0ddb94549" />
+<link rel="preload" as="script" href="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=26a4bc78f4c0ddb94549" />
 {% endmacro %}
 
 {% macro body_post() %}
   <!-- Scripts loaded after <body> so the DOM is not blocked -->
-  <script src="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=dfe6caa3a7d634c4db9b"></script>
-<script src="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=dfe6caa3a7d634c4db9b"></script>
+  <script defer src="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=26a4bc78f4c0ddb94549"></script>
+<script defer src="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=26a4bc78f4c0ddb94549"></script>
 {% endmacro %}