docs(map): update comments in os*.yaml after adding osarchmap

myii · myii · commit d71a258a2f04 · 2019-07-24T23:12:32.000+01:00
diff --git a/template/map.jinja b/template/map.jinja
@@ -37,7 +37,7 @@
         )
       )
     )
- %}
+%}
 
 {%- set config = salt['grains.filter_by'](
       {'defaults': defaults},
diff --git a/template/osarchmap.yaml b/template/osarchmap.yaml
@@ -3,8 +3,8 @@
 #
 # Setup variables using grains['osarch'] based logic.
 # You just need to add the key:values for an `osarch` that differ
-# from `defaults.yaml` + `os_family.yaml`.
-# Only add an `osarch` which is/will be supported by the formula
+# from `defaults.yaml`.
+# Only add an `osarch` which is/will be supported by the formula.
 #
 # If you do not need to provide defaults via the `osarch` grain,
 # you will need to provide at least an empty dict in this file, e.g.
diff --git a/template/osfamilymap.yaml b/template/osfamilymap.yaml
@@ -3,8 +3,8 @@
 #
 # Setup variables using grains['os_family'] based logic.
 # You just need to add the key:values for an `os_family` that differ
-# from `defaults.yaml`.
-# Only add an `os_family` which is/will be supported by the formula
+# from `defaults.yaml` + `osarch.yaml`.
+# Only add an `os_family` which is/will be supported by the formula.
 #
 # If you do not need to provide defaults via the `os_family` grain,
 # you will need to provide at least an empty dict in this file, e.g.
diff --git a/template/osfingermap.yaml b/template/osfingermap.yaml
@@ -3,8 +3,8 @@
 #
 # Setup variables using grains['osfinger'] based logic.
 # You just need to add the key:values for an `osfinger` that differ
-# from `defaults.yaml` + `os_family.yaml` + `osmap.yaml`.
-# Only add an `osfinger` which is/will be supported by the formula
+# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml` + `osmap.yaml`.
+# Only add an `osfinger` which is/will be supported by the formula.
 #
 # If you do not need to provide defaults via the `os_finger` grain,
 # you will need to provide at least an empty dict in this file, e.g.
diff --git a/template/osmap.yaml b/template/osmap.yaml
@@ -3,8 +3,8 @@
 #
 # Setup variables using grains['os'] based logic.
 # You just need to add the key:values for an `os` that differ
-# from `defaults.yaml` + `os_family.yaml`.
-# Only add an `os` which is/will be supported by the formula
+# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml`.
+# Only add an `os` which is/will be supported by the formula.
 #
 # If you do not need to provide defaults via the `os` grain,
 # you will need to provide at least an empty dict in this file, e.g.

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`)`
`38`	`38`	`)`
`39`	`39`	`)`
`40`		`- %}`
	`40`	`+%}`
`41`	`41`
`42`	`42`	`{%- set config = salt['grains.filter_by'](`
`43`	`43`	`{'defaults': defaults},`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`	`# Setup variables using grains['osarch'] based logic.`
`5`	`5`	# You just need to add the key:values for an `osarch` that differ
`6`		-# from `defaults.yaml` + `os_family.yaml`.
`7`		-# Only add an `osarch` which is/will be supported by the formula
	`6`	+# from `defaults.yaml`.
	`7`	+# Only add an `osarch` which is/will be supported by the formula.
`8`	`8`	`#`
`9`	`9`	# If you do not need to provide defaults via the `osarch` grain,
`10`	`10`	`# you will need to provide at least an empty dict in this file, e.g.`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`	`# Setup variables using grains['os_family'] based logic.`
`5`	`5`	# You just need to add the key:values for an `os_family` that differ
`6`		-# from `defaults.yaml`.
`7`		-# Only add an `os_family` which is/will be supported by the formula
	`6`	+# from `defaults.yaml` + `osarch.yaml`.
	`7`	+# Only add an `os_family` which is/will be supported by the formula.
`8`	`8`	`#`
`9`	`9`	# If you do not need to provide defaults via the `os_family` grain,
`10`	`10`	`# you will need to provide at least an empty dict in this file, e.g.`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`	`# Setup variables using grains['osfinger'] based logic.`
`5`	`5`	# You just need to add the key:values for an `osfinger` that differ
`6`		-# from `defaults.yaml` + `os_family.yaml` + `osmap.yaml`.
`7`		-# Only add an `osfinger` which is/will be supported by the formula
	`6`	+# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml` + `osmap.yaml`.
	`7`	+# Only add an `osfinger` which is/will be supported by the formula.
`8`	`8`	`#`
`9`	`9`	# If you do not need to provide defaults via the `os_finger` grain,
`10`	`10`	`# you will need to provide at least an empty dict in this file, e.g.`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`	`# Setup variables using grains['os'] based logic.`
`5`	`5`	# You just need to add the key:values for an `os` that differ
`6`		-# from `defaults.yaml` + `os_family.yaml`.
`7`		-# Only add an `os` which is/will be supported by the formula
	`6`	+# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml`.
	`7`	+# Only add an `os` which is/will be supported by the formula.
`8`	`8`	`#`
`9`	`9`	# If you do not need to provide defaults via the `os` grain,
`10`	`10`	`# you will need to provide at least an empty dict in this file, e.g.`