Merge lp:~chad.smith/curtin/docs-proposed into lp:~curtin-dev/curtin/trunk

Proposed by Chad Smith
Status: Merged
Merged at revision: 531
Proposed branch: lp:~chad.smith/curtin/docs-proposed
Merge into: lp:~curtin-dev/curtin/trunk
Diff against target: 32 lines (+9/-6)
1 file modified
doc/topics/apt_source.rst (+9/-6)
To merge this branch: bzr merge lp:~chad.smith/curtin/docs-proposed
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Ryan Harper (community) Approve
Review via email: mp+331676@code.launchpad.net

Description of the change

docs: Trivial doc fix for enabling proposed.

When specifying deb lines a 'source' key is required in each sources element.

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

+1

This can be seen in the apt_source_command.yaml, it's a mismatch in the docs versus code/test.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/topics/apt_source.rst'
2--- doc/topics/apt_source.rst 2016-08-18 16:17:20 +0000
3+++ doc/topics/apt_source.rst 2017-10-02 21:10:07 +0000
4@@ -135,7 +135,9 @@
5
6 apt:
7 sources:
8- proposed.list: deb $MIRROR $RELEASE-proposed main restricted universe multiverse
9+ proposed.list:
10+ source: |
11+ deb $MIRROR $RELEASE-proposed main restricted universe multiverse
12
13 * Make debug symbols available
14
15@@ -143,11 +145,12 @@
16
17 apt:
18 sources:
19- ddebs.list: |
20- deb http://ddebs.ubuntu.com $RELEASE main restricted universe multiverse
21-  deb http://ddebs.ubuntu.com $RELEASE-updates main restricted universe multiverse
22-  deb http://ddebs.ubuntu.com $RELEASE-security main restricted universe multiverse
23- deb http://ddebs.ubuntu.com $RELEASE-proposed main restricted universe multiverse
24+ ddebs.list:
25+ source: |
26+ deb http://ddebs.ubuntu.com $RELEASE main restricted universe multiverse
27+  deb http://ddebs.ubuntu.com $RELEASE-updates main restricted universe multiverse
28+  deb http://ddebs.ubuntu.com $RELEASE-security main restricted universe multiverse
29+ deb http://ddebs.ubuntu.com $RELEASE-proposed main restricted universe multiverse
30
31 Timing
32 ~~~~~~

Subscribers

People subscribed via source and target branches