From e9df3b10aeb44112dd3eac4f0fab3d7a3fd4a39d Mon Sep 17 00:00:00 2001 From: gissehel Date: Tue, 10 Nov 2015 11:17:53 +0100 Subject: [PATCH 1/2] explicit way to express that those are different choice and not just one big file to create Signed-off-by: gissehel Upstream-commit: e036bf6c0742ef4f3c7caab3ad6960fc27977a1d Component: engine --- components/engine/docs/installation/debian.md | 20 +++++++++----- .../engine/docs/installation/ubuntulinux.md | 27 +++++++++++++------ 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/components/engine/docs/installation/debian.md b/components/engine/docs/installation/debian.md index 1c9267f00d..ee17e094f3 100644 --- a/components/engine/docs/installation/debian.md +++ b/components/engine/docs/installation/debian.md @@ -63,12 +63,20 @@ from the new repository: The possible entries are: - # Debian Wheezy - deb https://apt.dockerproject.org/repo debian-wheezy main - # Debian Jessie - deb https://apt.dockerproject.org/repo debian-jessie main - # Debian Stretch/Sid - deb https://apt.dockerproject.org/repo debian-stretch main + - On Debian Wheezy + + # Debian Wheezy + deb https://apt.dockerproject.org/repo debian-wheezy main + + - On Debian Jessie + + # Debian Jessie + deb https://apt.dockerproject.org/repo debian-jessie main + + - On Debian Stretch/Sid + + # Debian Stretch/Sid + deb https://apt.dockerproject.org/repo debian-stretch main 8. Save and close the file. diff --git a/components/engine/docs/installation/ubuntulinux.md b/components/engine/docs/installation/ubuntulinux.md index 88823770f0..280e9d7fa9 100644 --- a/components/engine/docs/installation/ubuntulinux.md +++ b/components/engine/docs/installation/ubuntulinux.md @@ -67,14 +67,25 @@ packages from the new repository: The possible entries are: - # Ubuntu Precise 12.04 (LTS) - deb https://apt.dockerproject.org/repo ubuntu-precise main - # Ubuntu Trusty 14.04 (LTS) - deb https://apt.dockerproject.org/repo ubuntu-trusty main - # Ubuntu Vivid 15.04 - deb https://apt.dockerproject.org/repo ubuntu-vivid main - # Ubuntu Wily 15.10 - deb https://apt.dockerproject.org/repo ubuntu-wily main + - On Ubuntu Precise 12.04 (LTS) + + # Ubuntu Precise 12.04 (LTS) + deb https://apt.dockerproject.org/repo ubuntu-precise main + + - On Ubuntu Trusty 14.04 (LTS) + + # Ubuntu Trusty 14.04 (LTS) + deb https://apt.dockerproject.org/repo ubuntu-trusty main + + - On Ubuntu Vivid 15.04 + + # Ubuntu Vivid 15.04 + deb https://apt.dockerproject.org/repo ubuntu-vivid main + + - Ubuntu Wily 15.10 + + # Ubuntu Wily 15.10 + deb https://apt.dockerproject.org/repo ubuntu-wily main 7. Save and close the `/etc/apt/sources.list.d/docker.list` file. From 20dbe8b7489ee68d81ed89ef468cc0bacbdcdf63 Mon Sep 17 00:00:00 2001 From: gissehel Date: Tue, 17 Nov 2015 18:24:17 +0100 Subject: [PATCH 2/2] Remove redundent lines Signed-off-by: gissehel Upstream-commit: 741246d69f7708941ee86a706c6e93d20275904f Component: engine --- components/engine/docs/installation/debian.md | 3 --- components/engine/docs/installation/ubuntulinux.md | 4 ---- 2 files changed, 7 deletions(-) diff --git a/components/engine/docs/installation/debian.md b/components/engine/docs/installation/debian.md index ee17e094f3..c3aee98f51 100644 --- a/components/engine/docs/installation/debian.md +++ b/components/engine/docs/installation/debian.md @@ -65,17 +65,14 @@ from the new repository: - On Debian Wheezy - # Debian Wheezy deb https://apt.dockerproject.org/repo debian-wheezy main - On Debian Jessie - # Debian Jessie deb https://apt.dockerproject.org/repo debian-jessie main - On Debian Stretch/Sid - # Debian Stretch/Sid deb https://apt.dockerproject.org/repo debian-stretch main 8. Save and close the file. diff --git a/components/engine/docs/installation/ubuntulinux.md b/components/engine/docs/installation/ubuntulinux.md index 280e9d7fa9..e5e40615be 100644 --- a/components/engine/docs/installation/ubuntulinux.md +++ b/components/engine/docs/installation/ubuntulinux.md @@ -69,22 +69,18 @@ packages from the new repository: - On Ubuntu Precise 12.04 (LTS) - # Ubuntu Precise 12.04 (LTS) deb https://apt.dockerproject.org/repo ubuntu-precise main - On Ubuntu Trusty 14.04 (LTS) - # Ubuntu Trusty 14.04 (LTS) deb https://apt.dockerproject.org/repo ubuntu-trusty main - On Ubuntu Vivid 15.04 - # Ubuntu Vivid 15.04 deb https://apt.dockerproject.org/repo ubuntu-vivid main - Ubuntu Wily 15.10 - # Ubuntu Wily 15.10 deb https://apt.dockerproject.org/repo ubuntu-wily main 7. Save and close the `/etc/apt/sources.list.d/docker.list` file.