Merge ~ruinedyourlife/lp-archive:fix-live-doc-discrepancies into lp-archive:main

Proposed by Quentin Debhi
Status: Merged
Approved by: Quentin Debhi
Approved revision: ed7bba106fad6a2bc513374553d440e33724ac4d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ruinedyourlife/lp-archive:fix-live-doc-discrepancies
Merge into: lp-archive:main
Diff against target: 36 lines (+5/-5)
1 file modified
lp_archive/templates/index.html (+5/-5)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Ines Almeida Approve
Review via email: mp+464094@code.launchpad.net

Commit message

Fix live documentation discrepancies

Addressing the comments Aaron has made comparing the original document and the live one

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) :
review: Needs Fixing
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Looks good!

When looking at the original doc (https://docs.google.com/document/d/1loqLRYCZ1CmvK5iVIRunTC947XjlRHkUMnUHGndwqtg/edit#heading=h.bypnqv00rca) I noticed there is a title difference as well in `Disable snapshot service for a repository`. If the goal is to get both perfectly in sync, we need to update here or suggest a change in the doc.

review: Approve
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lp_archive/templates/index.html b/lp_archive/templates/index.html
2index c3825e3..07aaf55 100644
3--- a/lp_archive/templates/index.html
4+++ b/lp_archive/templates/index.html
5@@ -27,10 +27,10 @@
6 <div class="p-strip">
7 <div class="row">
8 <div class="col-12">
9- <h2 id="quick-start-example">Quick-start Example</h2>
10- <p>On Ubuntu 24.04 LTS and later have installing the version of <code>hello</code> as it was at 3:04:00 am UTC on 1 March 2024 is as simple as using the following command (on an instance that does not already have hello installed):</p>
11+ <h2 id="quick-start-example">Quick-Start Example</h2>
12+ <p>On Ubuntu 24.04 LTS and later, installing the version of <code>hello</code> as it was at 3:04:00 am UTC on 1 March 2024 is as simple as using the following command (on an instance that does not already have <code>hello</code> installed):</p>
13 <pre><code>apt install hello --update --snapshot 20240301T030400Z</code></pre>
14- <p>This command first updates your package indexes (the <code>--update</code> argument is the equivalent of running <code>apt</code> update before the specified <code>apt</code> command) and then installs the hello package from the specified snapshot instead of the latest version in the archive. In the output you should see that the package is being downloaded from the snapshot server:</p>
15+ <p>This command first updates your package indexes (the <code>--update</code> argument is the equivalent of running <code>apt update</code> before the specified <code>apt</code> command) and then installs the <code>hello</code> package from the specified snapshot instead of the latest version in the archive. In the output, you should see that the package is being downloaded from the snapshot server:</p>
16 <pre><code>Get:1 https://snapshot.ubuntu.com/ubuntu/20240301T030400Z noble/main
17 amd64 hello amd64 2.10-3 [26.2 kB]</code></pre>
18 </div>
19@@ -45,7 +45,7 @@ amd64 hello amd64 2.10-3 [26.2 kB]</code></pre>
20 <h4>For Ubuntu 24.04 and later</h4>
21 <p>The <code>apt</code> included in Ubuntu 24.04 and later automatically detects when snapshots are supported for a repository (any repository with a Snapshots: directive in the Release file). This includes the official Ubuntu repositories, so snapshots for these will be enabled by default.</p>
22
23- <h4>For Ubuntu 23.10 and later</h4>
24+ <h4>For Ubuntu 23.10 and earlier</h4>
25 <p>On Ubuntu 23.10 and earlier, edit <code>/etc/apt/sources.list</code> to add <code>[snapshot=yes]</code> into the standard prefix, for example:</p>
26 <pre><code>deb [snapshot=yes] http://archive.ubuntu.com/ubuntu/ jammy main restricted
27 deb [snapshot=yes] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted
28@@ -85,7 +85,7 @@ Snapshot: 20240301T030400Z</code></pre>
29 deb [snapshot=20230302T030400Z] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted
30 deb [snapshot=20230302T030400Z] http://security.ubuntu.com/ubuntu jammy-security main restricted</code></pre>
31
32- <h3>Disable Snapshot Service</h3>
33+ <h3>Disable Snapshot Service for a repository</h3>
34 <h4>For Ubuntu 24.04 and later (Deb822 sources)</h4>
35 <p>As mentioned above, on Ubuntu 24.04 and later, snapshots are enabled automatically for supported repositories. If you do <b>not</b> want archive snapshots to be enabled for a repository, edit the relevant sources file (e.g. <code>/etc/apt/sources.list.d/ubuntu.sources</code>) to add <code>Snapshot: no</code> to the relevant sources, for example:</p>
36 <pre><code>Types: deb

Subscribers

People subscribed via source and target branches