From 17f7e6162a63b6659bce5b8cb5e7f0875ffbd8a4 Mon Sep 17 00:00:00 2001 From: Sandra Wills Date: Fri, 19 Feb 2016 10:16:59 -0500 Subject: [PATCH 1/5] playbook variables precedence list light edits QA had asked me a while ago to clean up the way the precedence list for 1.x was worded, as the intro from the list started with "then", as if something should preceed it. The comments from OxABAB were not helpful, but his issue reminded me that this was on my to do list to make a little cleaner and clearer. Edits made to remove the "then" intros for each list line, to help with clarity. --- docsite/rst/playbooks_variables.rst | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docsite/rst/playbooks_variables.rst b/docsite/rst/playbooks_variables.rst index 122c0ef9232..23ec83c43c2 100644 --- a/docsite/rst/playbooks_variables.rst +++ b/docsite/rst/playbooks_variables.rst @@ -758,19 +758,18 @@ If multiple variables of the same name are defined in different places, they get .. include:: ansible_ssh_changes_note.rst -In 1.x the precedence is (last listed wins): +In 1.x, the precedence is as follows (and last listed wins prioritization): - * then "role defaults", which are the most "defaulty" and lose in priority to everything. - * then come the variables defined in inventory - * then come the facts discovered about a system - * then comes "most everything else" (command line switches, vars in play, included vars, role vars, etc) - * then come connection variables (``ansible_user``, etc) + * "role defaults", which lose in priority to everything + * variables defined in inventory + * facts discovered about a system + * "most everything else" (command line switches, vars in play, included vars, role vars, etc.) + * connection variables (``ansible_user``, etc.) * extra vars (``-e`` in the command line) always win .. note:: In versions prior to 1.5.4, facts discovered about a system were in the "most everything else" category above. - -In 2.x we have made the order of precedence more specific (last listed wins): +In 2.x we have made the order of precedence more specific (and last listed wins prioritization): * role defaults [1]_ * inventory vars [2]_ From 94eeff719623cc2e5022e1f66f31ff32e337fcc9 Mon Sep 17 00:00:00 2001 From: Sandra Wills Date: Thu, 31 Mar 2016 12:22:35 -0400 Subject: [PATCH 2/5] updating stylesheet to make printing cleaner from HTML Tima had feedback that saving the HMTL to a PDF wasn't ideal for printing, as the marking ad took up 1/3 of the page. We've cleaned up the ad as well as streamlined printing a bit (removing color backgrounds from admonitions and adding black text, exposing links, etc.) --- docsite/_themes/srtd/static/css/theme.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docsite/_themes/srtd/static/css/theme.css b/docsite/_themes/srtd/static/css/theme.css index 246e513b799..3d54ac68b3e 100644 --- a/docsite/_themes/srtd/static/css/theme.css +++ b/docsite/_themes/srtd/static/css/theme.css @@ -4736,3 +4736,23 @@ span[id*='MathJax-Span'] { .DocSiteBanner-imgWrapper { max-width: 100%; } + +@media print { + * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } + #nav, + a, a:visited { text-decoration: underline; } + a[href]:after { content: " (" attr(href) ")"; } + abbr[title]:after { content: " (" attr(title) ")"; } + .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } /* Don't show links for images, or javascript/internal links */ + pre, blockquote { border: 0px solid #999; page-break-inside: avoid; } + thead { display: table-header-group; } /* h5bp.com/t */ + tr, img { page-break-inside: avoid; } + img { max-width: 100% !important; } + @page { margin: 0.5cm; } + p, h2, h3 { orphans: 3; widows: 3; } + h2, h3 { page-break-after: avoid; } + .DocSiteBanner, + #google_image_div { + display: none !important; + } + From 1bf15176d8d3fb192253bc47cff4b0ceb3a4b0c0 Mon Sep 17 00:00:00 2001 From: Sandra Wills Date: Thu, 31 Mar 2016 12:30:02 -0400 Subject: [PATCH 3/5] minor change, adding markup for cleaner view adding additinal header markup character to prevent "over highlighting" that globbed the docs --- docsite/rst/playbooks_variables.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsite/rst/playbooks_variables.rst b/docsite/rst/playbooks_variables.rst index 23ec83c43c2..670cf8d0a84 100644 --- a/docsite/rst/playbooks_variables.rst +++ b/docsite/rst/playbooks_variables.rst @@ -586,7 +586,7 @@ in Ansible. Effectively registered variables are just like facts. .. _accessing_complex_variable_data: Accessing Complex Variable Data -``````````````````````````````` +```````````````````````````````` We already talked about facts a little higher up in the documentation. From 283a32340b7b4700b0c7edf44c0237d0dfd919a2 Mon Sep 17 00:00:00 2001 From: Sandra Wills Date: Thu, 31 Mar 2016 12:34:44 -0400 Subject: [PATCH 4/5] testing a revert : Revert "playbook variables precedence list light edits" This reverts commit 17f7e6162a63b6659bce5b8cb5e7f0875ffbd8a4. --- docsite/rst/playbooks_variables.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docsite/rst/playbooks_variables.rst b/docsite/rst/playbooks_variables.rst index 670cf8d0a84..7836895ae9a 100644 --- a/docsite/rst/playbooks_variables.rst +++ b/docsite/rst/playbooks_variables.rst @@ -758,18 +758,19 @@ If multiple variables of the same name are defined in different places, they get .. include:: ansible_ssh_changes_note.rst -In 1.x, the precedence is as follows (and last listed wins prioritization): +In 1.x the precedence is (last listed wins): - * "role defaults", which lose in priority to everything - * variables defined in inventory - * facts discovered about a system - * "most everything else" (command line switches, vars in play, included vars, role vars, etc.) - * connection variables (``ansible_user``, etc.) + * then "role defaults", which are the most "defaulty" and lose in priority to everything. + * then come the variables defined in inventory + * then come the facts discovered about a system + * then comes "most everything else" (command line switches, vars in play, included vars, role vars, etc) + * then come connection variables (``ansible_user``, etc) * extra vars (``-e`` in the command line) always win .. note:: In versions prior to 1.5.4, facts discovered about a system were in the "most everything else" category above. -In 2.x we have made the order of precedence more specific (and last listed wins prioritization): + +In 2.x we have made the order of precedence more specific (last listed wins): * role defaults [1]_ * inventory vars [2]_ From 3059272008a3a3857e42c0ddcab9ec8f15f33e36 Mon Sep 17 00:00:00 2001 From: Sandra Wills Date: Thu, 31 Mar 2016 12:36:11 -0400 Subject: [PATCH 5/5] testing another revert: Revert "minor change, adding markup for cleaner view" This reverts commit 1bf15176d8d3fb192253bc47cff4b0ceb3a4b0c0. Attempting to get this commit/PR clean so that it will only include the print stylesheet (commit 94eeff7) --- docsite/rst/playbooks_variables.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsite/rst/playbooks_variables.rst b/docsite/rst/playbooks_variables.rst index 7836895ae9a..122c0ef9232 100644 --- a/docsite/rst/playbooks_variables.rst +++ b/docsite/rst/playbooks_variables.rst @@ -586,7 +586,7 @@ in Ansible. Effectively registered variables are just like facts. .. _accessing_complex_variable_data: Accessing Complex Variable Data -```````````````````````````````` +``````````````````````````````` We already talked about facts a little higher up in the documentation.