Skip to content

Commit 4558037

Browse files
author
Bob Furu
authored
Merge pull request #42925 from bobfuru/410GA
2 parents d63f3a4 + 0b3ab3a commit 4558037

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

‎.s2i/httpd-cfg/01-commercial.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,14 @@ AddType text/vtt vtt
150150

151151
# Redirects for "latest" version
152152
RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
153-
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.9/$2 [NE,R=301]
153+
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.10/$2 [NE,R=301]
154154
RewriteRule ^(online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|latest)/?(.*)$ /$1/pro/$3 [NE,R=301]
155155

156156
# Release notes redirects
157157
RewriteRule ^container-platform\/4\.(.+)\/release_notes\/ocp-4-((?!\1).+)-release-notes.html /container-platform/4.$1/release_notes/ocp-4-$1-release-notes.html [NE,R=301]
158158
RewriteRule ^container-platform\/3\.(.+)\/release_notes\/ocp_3_((?!\1).+)_release_notes.html /container-platform/3.$1/release_notes/ocp_3_$1_release_notes.html [NE,R=301]
159159

160160
# Redirects for the Updating book
161-
RewriteRule ^container-platform/(4\.6|4\.7|4\.8|4\.9)/updating/updating-cluster-between-minor.html /container-platform/$1/updating/updating-cluster-within-minor.html [NE,R=302]
162-
RewriteRule ^container-platform/(4\.6|4\.7|4\.8|4\.9)/updating/updating-cluster.html /container-platform/$1/updating/updating-cluster-within-minor.html [NE,R=302]
163161
RewriteRule ^container-platform/(4\.8|4\.9)/updating/installing-update-service.html /container-platform/$1/updating/updating-restricted-network-cluster.html [NE,R=302]
164162
RewriteRule ^container-platform/(4\.8|4\.9)/updating/understanding-the-update-service.html /container-platform/$1/updating/updating-restricted-network-cluster.html [NE,R=302]
165163

@@ -380,7 +378,7 @@ AddType text/vtt vtt
380378
RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
381379
RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
382380
RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
383-
RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9)/?$ /container-platform/$1/welcome/index.html [L,R=301]
381+
RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10)/?$ /container-platform/$1/welcome/index.html [L,R=301]
384382
RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
385383

386384

‎_templates/_page_openshift.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
</a>
9494
<% end %>
9595
<select id="version-selector" onchange="versionSelector(this);">
96+
<option value="4.10">4.10</option>
9697
<option value="4.9">4.9</option>
9798
<option value="4.8">4.8</option>
9899
<option value="4.7">4.7</option>

‎index-commercial.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ <h2>OpenShift Container Platform</h2>
189189
<div class="btn-group">
190190
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
191191
<ul class="dropdown-menu" role="menu">
192+
<li><a href="container-platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.10</a></li>
192193
<li><a href="container-platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.9</a></li>
193194
<li><a href="container-platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.8</a></li>
194195
<li><a href="container-platform/4.7/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.7</a></li>
@@ -296,7 +297,7 @@ <h2>OpenShift Online</h2>
296297
<h2>OpenShift Kubernetes Engine</h2>
297298
<div class="list-group">
298299
<p class="list-group-item-text">The OpenShift Kubernetes Engine is the core of the OpenShift Container Platform. Use OpenShift Container Platform docs links for OpenShift Kubernetes Engine documentation.</p>
299-
Read more about <a href="/container-platform/4.9/welcome/oke_about.html">OKE</a>.
300+
Read more about <a href="/container-platform/4.10/welcome/oke_about.html">OKE</a>.
300301
</div>
301302

302303
</div>
@@ -311,6 +312,7 @@ <h2>OpenShift Container Platform <font size="-1">(日本語翻訳)</font></h2>
311312
<div class="btn-group">
312313
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">バージョンを選択する<span class="caret"></span></button>
313314
<ul class="dropdown-menu" role="menu">
315+
<li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> 4.10</a></li>
314316
<li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> 4.9</a></li>
315317
<li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> 4.8</a></li>
316318
<li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.7/"><i class="fa fa-arrow-circle-o-right"></i> 4.7</a></li>
@@ -329,6 +331,7 @@ <h2>OpenShift Container Platform <font size="-1">(中文文档)</font></h2>
329331
<div class="btn-group">
330332
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">选择版本<span class="caret"></span></button>
331333
<ul class="dropdown-menu" role="menu">
334+
<li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> 4.10</a></li>
332335
<li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> 4.9</a></li>
333336
<li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> 4.8</a></li>
334337
<li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.7/"><i class="fa fa-arrow-circle-o-right"></i> 4.7</a></li>

0 commit comments

Comments
 (0)