Fix '../Trunk'

canonical · Jun 25, 2024 · 9f3627f · 9f3627f
1 parent ba53c0f
commit 9f3627f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/custom_conf.py b/custom_conf.py
@@ -127,7 +127,6 @@
     'https://wiki.canonical.com/InformationInfrastructure/OSA/LPHowTo/ManualCdImageMirrorProber',  # private
     'PolicyAndProcess/DatabaseSchemaChangesProcess',  # needs update
     'Trunk/Glue',  # needs update
-    '../Trunk',  # needs update
     '/Background', 
     '/Concepts',  # needs update
     '/HowToUseCodehostingLocally',  # needs update

diff --git a/explanation/pre-merge-reviews.rst b/explanation/pre-merge-reviews.rst
@@ -46,7 +46,7 @@ Working with PreMergeReviews
 For pre-merge reviews to be effective, however, small modifications to
 the development workflow are required. The main modification is, of
 course, requesting peer review of your code changes before merging your
-code into `Trunk <../Trunk>`__. The sections below go into the details
+code into :doc:`Trunk <branches>`__. The sections below go into the details
 of how this is best performed. There is a crib sheet for getting a
 branch merged on the WorkingWithReviews page.