From c090d6cc7706a9efab4d18f76976bf57d568284e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 25 Nov 2013 22:47:15 -0700 Subject: [PATCH 1/2] Update Arch Linux instructions to include warnings at the top like other "community" platforms Upstream-commit: 6ad5b2bcf4d04a0314583b29f9280d8000c1ee5a Component: engine --- .../engine/docs/sources/installation/archlinux.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/engine/docs/sources/installation/archlinux.rst b/components/engine/docs/sources/installation/archlinux.rst index a4de066f76..d6dc239253 100644 --- a/components/engine/docs/sources/installation/archlinux.rst +++ b/components/engine/docs/sources/installation/archlinux.rst @@ -1,5 +1,5 @@ :title: Installation on Arch Linux -:description: Docker installation on Arch Linux. +:description: Docker installation on Arch Linux. :keywords: arch linux, virtualization, docker, documentation, installation .. _arch_linux: @@ -7,6 +7,10 @@ Arch Linux ========== +.. include:: install_header.inc + +.. include:: install_unofficial.inc + Installing on Arch Linux is not officially supported but can be handled via either of the following AUR packages: @@ -32,10 +36,6 @@ either AUR package. Installation ------------ -.. include:: install_header.inc - -.. include:: install_unofficial.inc - The instructions here assume **yaourt** is installed. See `Arch User Repository `_ for information on building and installing packages from the AUR if you have not From 1113ee60b9084e9a7e7fe9a3341ba95db8f58a85 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 25 Nov 2013 22:48:51 -0700 Subject: [PATCH 2/2] Update Fedora placeholder to include the same "community" and "pre-1.0" warnings so we don't forget them Upstream-commit: c92dab0eb4db57fd880c7b0bbf84d7288d048fef Component: engine --- components/engine/docs/sources/installation/fedora.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/docs/sources/installation/fedora.rst b/components/engine/docs/sources/installation/fedora.rst index f640cf1502..46908f0139 100644 --- a/components/engine/docs/sources/installation/fedora.rst +++ b/components/engine/docs/sources/installation/fedora.rst @@ -7,6 +7,10 @@ Fedora ====== +.. include:: install_header.inc + +.. include:: install_unofficial.inc + .. warning:: This is a placeholder for the Fedora installation instructions. Currently there is not an available