Skip to content

Commit 89cbc0f

Browse files
authored
Merge pull request #87676 from stevsmit/44341-415
[enterprise-4.15] Moves templates content
2 parents 507fa9f + 8e93e6f commit 89cbc0f

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,8 +2108,6 @@ Topics:
21082108
- Name: Image configuration resources
21092109
File: image-configuration
21102110
Distros: openshift-enterprise,openshift-origin
2111-
- Name: Using templates
2112-
File: using-templates
21132111
- Name: Using Ruby on Rails
21142112
File: templates-using-ruby-on-rails
21152113
- Name: Using images
@@ -2143,6 +2141,8 @@ Topics:
21432141
- Name: Creating applications
21442142
Dir: creating_applications
21452143
Topics:
2144+
- Name: Using templates
2145+
File: using-templates
21462146
- Name: Creating applications using the Developer perspective
21472147
File: odc-creating-applications-using-developer-perspective
21482148
- Name: Creating applications from installed Operators

_topic_maps/_topic_map_osd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,6 @@ Topics:
567567
- Name: Image configuration resources
568568
File: image-configuration
569569
Distros: openshift-dedicated
570-
- Name: Using templates
571-
File: using-templates
572570
- Name: Using Ruby on Rails
573571
File: templates-using-ruby-on-rails
574572
- Name: Using images
@@ -872,6 +870,8 @@ Topics:
872870
- Name: Creating applications
873871
Dir: creating_applications
874872
Topics:
873+
- Name: Using templates
874+
File: using-templates
875875
- Name: Creating applications using the Developer perspective
876876
File: odc-creating-applications-using-developer-perspective
877877
- Name: Creating applications from installed Operators

_topic_maps/_topic_map_rosa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,6 @@ Topics:
815815
- Name: Image configuration resources
816816
File: image-configuration
817817
Distros: openshift-rosa
818-
- Name: Using templates
819-
File: using-templates
820818
- Name: Using Ruby on Rails
821819
File: templates-using-ruby-on-rails
822820
- Name: Using images
@@ -1120,6 +1118,8 @@ Topics:
11201118
- Name: Creating applications
11211119
Dir: creating_applications
11221120
Topics:
1121+
- Name: Using templates
1122+
File: using-templates
11231123
- Name: Creating applications using the Developer perspective
11241124
File: odc-creating-applications-using-developer-perspective
11251125
- Name: Creating applications from installed Operators
File renamed without changes.

getting_started/openshift-overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describes an application that can be deployed using the Helm CLI.
7272
* **xref:../applications/deployments/what-deployments-are.adoc#what-deployments-are[Create deployments]**: Use `Deployment` and `DeploymentConfig` objects to exert fine-grained management over applications.
7373
xref:../applications/deployments/managing-deployment-processes.adoc#deployment-operations[Manage deployments] using the *Workloads* page or OpenShift CLI (`oc`). Learn xref:../applications/deployments/deployment-strategies.adoc#deployment-strategies[rolling, recreate, and custom] deployment strategies.
7474

75-
* **xref:../openshift_images/using-templates.adoc#using-templates[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas, exposed ports and other content that defines how an application can be run or built.
75+
* **xref:../applications/creating_applications/using-templates.adoc#using-templates[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas, exposed ports and other content that defines how an application can be run or built.
7676

7777
* **xref:../operators/understanding/olm-what-operators-are.adoc#olm-what-operators-are[Understand Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn about the Operator Framework and how to deploy applications using installed Operators into your projects.
7878

openshift_images/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ endif::openshift-rosa,openshift-dedicated[]
5858
== About templates
5959

6060
A template is a definition of an object to be replicated.
61-
You can use xref:../openshift_images/using-templates.adoc#using-templates[templates] to build and deploy configurations.
61+
You can use xref:../applications/creating_applications/using-templates.adoc#using-templates[templates] to build and deploy configurations.
6262

6363
[id="how-you-can-use-ruby-on-rails"]
6464
== How you can use Ruby on Rails

welcome/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ xref:../applications/working_with_helm_charts/understanding-helm.adoc#understand
192192

193193
- **xref:../applications/deployments/what-deployments-are.adoc#what-deployments-are[Create deployments]**: Use `Deployment` objects to exert fine-grained management over applications. Deployments create replica sets according to the rollout strategy, which orchestrates pod lifecycles.
194194

195-
- **xref:../openshift_images/using-templates.adoc#using-templates[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas, exposed ports and other content that defines how an application can be run or built.
195+
- **xref:../applications/creating_applications/using-templates.adoc#using-templates[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas, exposed ports and other content that defines how an application can be run or built.
196196

197197
- **xref:../operators/understanding/olm-what-operators-are.adoc#olm-what-operators-are[Understand Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn about the Operator Framework and how to deploy applications by using installed Operators into your projects.
198198

0 commit comments

Comments
 (0)