From 7577f7674066d4e1d974e956ab2506e0d6f5a89b Mon Sep 17 00:00:00 2001 From: Jared Nielsen Date: Tue, 25 Jun 2024 13:22:07 -0400 Subject: [PATCH] Fix '../Trunk' --- custom_conf.py | 1 - explanation/pre-merge-reviews.rst | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/custom_conf.py b/custom_conf.py index 00a2329..a36ea28 100644 --- a/custom_conf.py +++ b/custom_conf.py @@ -126,7 +126,6 @@ 'https://wiki.canonical.com/Launchpad/SupportRotation#Builder', # private 'https://wiki.canonical.com/InformationInfrastructure/OSA/LPHowTo/ManualCdImageMirrorProber', # private '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 index 35a806f..8431b48 100644 --- 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 `__. 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.