Merge pull request #12912 from vikram-redhat/enterprise-4.0

vikram-redhat · web-flow · commit cc297a577485 · 2018-11-20T16:14:50.000+10:00
images, parent-context etc
diff --git a/applications_and_projects/images b/applications_and_projects/images
@@ -0,0 +1 @@
+../images
diff --git a/authentication/images b/authentication/images
@@ -0,0 +1 @@
+../images
diff --git a/backup_and_restore/images b/backup_and_restore/images
@@ -0,0 +1 @@
+../images
diff --git a/builds/creating-build-inputs.adoc b/builds/creating-build-inputs.adoc
@@ -97,9 +97,3 @@ include::modules/builds-custom-strategy.adoc[leveloffset=+2]
 include::modules/builds-using-external-artifacts.adoc[leveloffset=+1]
 
 include::modules/builds-docker-credentials-private-registries.adoc[leveloffset=+1]
-
-
-
-// The following line is necessary to allow assemblies be included in other
-// assemblies. It restores the `context` variable to its previous state.
-ifdef::context[:parent-context: {context}]
diff --git a/builds/images b/builds/images
@@ -0,0 +1 @@
+../images
diff --git a/cloud_providers/images b/cloud_providers/images
@@ -0,0 +1 @@
+../images
diff --git a/contributing_to_docs/images b/contributing_to_docs/images
@@ -0,0 +1 @@
+../images
diff --git a/images/PLACEHOLDER b/images/PLACEHOLDER
@@ -1,2 +1 @@
-Please delete this file once you have assemblies here.
-
+DELETE ME
diff --git a/installation/images b/installation/images
@@ -0,0 +1 @@
+../images
diff --git a/logging/efk-logging-curator.adoc b/logging/efk-logging-curator.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-curator
 [id='efk-logging-curator_{context}']
 = Working with Elasticsearch Curator in {product-title}
@@ -36,7 +36,7 @@ endif::[]
 
 toc::[]
 
-As an administrator, you can use the built-in Elasticsearch Curator tool to configure scheduled Elasticsearch maintenance operations 
+As an administrator, you can use the built-in Elasticsearch Curator tool to configure scheduled Elasticsearch maintenance operations
 to be performed automatically on a per-project basis.
 
 // The following include statements pull in the module files that comprise
@@ -49,6 +49,3 @@ include::modules/efk-logging-curator-configure.adoc[leveloffset=+2]
 include::modules/efk-logging-curator-actions.adoc[leveloffset=+2]
 
 include::modules/efk-logging-curator-configuration.adoc[leveloffset=+2]
-
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
diff --git a/logging/efk-logging-deploy.adoc b/logging/efk-logging-deploy.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-deploy
 [id='efk-logging-deploy_{context}']
 = Deploying EFK logging
@@ -71,5 +71,5 @@ include::modules/efk-logging-deploy-playbook.adoc[leveloffset=+2]
 
 include::modules/efk-logging-deploy-label.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-driver.adoc b/logging/efk-logging-driver.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-driver
 [id='efk-logging-driver_{context}']
 = Setting the EFK logging driver
@@ -50,5 +50,5 @@ include::modules/efk-logging-driver-viewing.adoc[leveloffset=+2]
 
 include::modules/efk-logging-driver-changing.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-elasticsearch.adoc b/logging/efk-logging-elasticsearch.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-elasticseearch
 [id='efk-logging-elasticsearch_{context}']
 = Working with Elasticsearch in {product-title}
@@ -51,5 +51,5 @@ include::modules/efk-logging-elasticsearch-scaling.adoc[leveloffset=+2]
 
 include::modules/efk-logging-elasticsearch-exposing.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-exported-fields.adoc b/logging/efk-logging-exported-fields.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-exported-fields
 [id='efk-logging-exported-fields_{context}']
 = Exported fields
@@ -78,5 +78,5 @@ include::modules/efk-logging-exported-fields-aushape.adoc[leveloffset=+2]
 
 include::modules/efk-logging-exported-fields-tlog.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-external.adoc b/logging/efk-logging-external.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-external
 [id='efk-logging-external_{context}']
 = Sending {product-title} logs to external devices
@@ -50,5 +50,5 @@ include::modules/efk-logging-external-syslog.adoc[leveloffset=+2]
 
 include::modules/efk-logging-external-fluentd.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-fluentd.adoc b/logging/efk-logging-fluentd.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-fluentd
 [id='efk-logging-fluentd_{context}']
 = Working with Fluentd in {product-title}
@@ -50,5 +50,5 @@ include::modules/efk-logging-fluentd-connections.adoc[leveloffset=+2]
 
 include::modules/efk-logging-fluentd-throttling.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-kibana.adoc b/logging/efk-logging-kibana.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-kibana
 [id='efk-logging-kibana_{context}']
 = Working with Kibana in {product-title}
@@ -52,5 +52,5 @@ include::modules/efk-logging-kibana-scaling.adoc[leveloffset=+2]
 
 include::modules/efk-logging-kibana-visualize.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-manual-rollout.adoc b/logging/efk-logging-manual-rollout.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-driver
 [id='efk-logging-driver_{context}']
 = Manually rolling out Elasticsearch
@@ -58,5 +58,5 @@ include::modules/efk-logging-manual-rollout-rolling.adoc[leveloffset=+2]
 
 include::modules/efk-logging-manual-rollout-full.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-systemd.adoc b/logging/efk-logging-systemd.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-systemd
 [id='efk-logging-systemd_{context}']
 = Configuring systemd-journald and rsyslog in {product-title}
@@ -46,5 +46,5 @@ include::modules/efk-logging-systemd-rate-limiting.adoc[leveloffset=+2]
 
 include::modules/efk-logging-systemd-scaling.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-troubleshooting.adoc b/logging/efk-logging-troubleshooting.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-troubleshooting
 [id='efk-logging-troubleshooting_{context}']
 = Troubleshooting Kubernetes in {product-title}
@@ -55,5 +55,5 @@ include::modules/efk-logging-troubleshooting-proxy.adoc[leveloffset=+2]
 
 include::modules/efk-logging-troubleshooting-unknown.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging-uninstall.adoc b/logging/efk-logging-uninstall.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging-uninstall
 [id='efk-logging-uninstall_{context}']
 = Uninstalling the EFK stack
@@ -49,5 +49,5 @@ include::modules/efk-logging-uninstall-efk-eventrouter.adoc[leveloffset=+2]
 
 include::modules/efk-logging-uninstall-efk-ops.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/efk-logging.adoc b/logging/efk-logging.adoc
@@ -15,7 +15,7 @@
 // The `context` attribute enables module reuse. Every module's ID
 // includes {context}, which ensures that the module has a unique ID even if
 // it is reused multiple times in a guide.
-ifdef::context[:parent-context: {context}]
+
 :context: efk-logging
 [id='efk-logging_{context}']
 = About EFK logging and {product-title}
@@ -60,5 +60,5 @@ include::modules/efk-logging-about-eventrouter.adoc[leveloffset=+2]
 
 include::modules/efk-logging-about-curator.adoc[leveloffset=+2]
 
-ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+
+
diff --git a/logging/images b/logging/images
@@ -0,0 +1 @@
+../images
diff --git a/masters/images b/masters/images
@@ -0,0 +1 @@
+../images
diff --git a/metrics/images b/metrics/images
@@ -0,0 +1 @@
+../images
diff --git a/mod_docs_guide/images b/mod_docs_guide/images
@@ -0,0 +1 @@
+../images
diff --git a/modules/common-attributes.adoc b/modules/common-attributes.adoc
@@ -0,0 +1,9 @@
+{product-author}
+{product-version}
+:data-uri:
+:icons:
+:experimental:
+:toc: macro
+:toc-title:
+:imagesdir: images
+:prewrap!:
diff --git a/networking/images b/networking/images
@@ -0,0 +1 @@
+../images
diff --git a/nodes/images b/nodes/images
@@ -0,0 +1 @@
+../images
diff --git a/openshift_images/PLACEHOLDER b/openshift_images/PLACEHOLDER
@@ -0,0 +1,2 @@
+Please delete this file once you have assemblies here.
+
diff --git a/openshift_images/images b/openshift_images/images
@@ -0,0 +1 @@
+../images/
diff --git a/openshift_images/modules b/openshift_images/modules
diff --git a/operators/images b/operators/images
@@ -0,0 +1 @@
+../images
diff --git a/planning/images b/planning/images
@@ -0,0 +1 @@
+../images
diff --git a/registry/images b/registry/images
@@ -0,0 +1 @@
+../images
diff --git a/router/images b/router/images
@@ -0,0 +1 @@
+../images
diff --git a/scalability_and_performance/images b/scalability_and_performance/images
@@ -0,0 +1 @@
+../images
diff --git a/storage/images b/storage/images
@@ -0,0 +1 @@
+../images
diff --git a/upgrading/images b/upgrading/images
@@ -0,0 +1 @@
+../images
diff --git a/users_and_roles/images b/users_and_roles/images
@@ -0,0 +1 @@
+../images

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-Please delete this file once you have assemblies here.`
`2`		`-`
	`1`	`+DELETE ME`