Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix '../Trunk' #61

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion custom_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion explanation/pre-merge-reviews.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading