From 7f6cb26fa23970f31da07fa1f3aca6d3298ffb1f Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 16 Jun 2016 22:55:38 +0000 Subject: [PATCH] Add Liberty and Mitaka admonitions and use them Many of our stable branch steps are actually specific to one branch, so instead of having to remember to note that in the text of those sections, let's just have an admonition that makes the version explicit. This also corrects the repo setup steps to separate the Liberty and Mitaka repos, and moves the branch options to their own section in the environment selector. I did not touch the image building repo setup yet because I plan to change that in a follow-up commit anyway so it matches what we actually do in tripleo.sh/CI. Change-Id: I871651f0dd782ad51127d5ef0b01be3806272820 --- doc/source/_custom/custom.css | 2 + doc/source/_templates/layout.html | 9 +++- .../basic_deployment/basic_deployment_cli.rst | 15 ++++-- doc/source/index.rst | 10 ++++ doc/source/repositories.txt | 54 +++++++++++++------ 5 files changed, 67 insertions(+), 23 deletions(-) diff --git a/doc/source/_custom/custom.css b/doc/source/_custom/custom.css index b3f29d37..7f454691 100644 --- a/doc/source/_custom/custom.css +++ b/doc/source/_custom/custom.css @@ -62,6 +62,8 @@ .portal {background-color: #ded;} .satellite {background-color: #dee;} .stable {background: #eed;} +.liberty {background: #ede;} +.mitaka {background: #dee;} .centos {background: #fef;} .baremetal {background: #eef;} .virtual {background: #efe;} diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html index fd1a5be5..d61f008a 100644 --- a/doc/source/_templates/layout.html +++ b/doc/source/_templates/layout.html @@ -20,6 +20,13 @@
    • + Branches + + RHEL Registration Types