[skip netlify] 4.8 GA

vikram-redhat · vikram-redhat · commit f7832116f79b · 2021-07-26T09:12:56.000+10:00
diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf
@@ -140,7 +140,7 @@ AddType text/vtt                            vtt
 
     # Redirects for "latest" version
     RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
-    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.7/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.8/$2 [NE,R=301]
     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]
 
     # Release notes redirects
@@ -349,8 +349,8 @@ AddType text/vtt                            vtt
     RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
     RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
     RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
-    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)/?$ /container-platform/$1/welcome/index.html [L,R=301]
-    RewriteRule ^container-platform-ocp/(4\.3|4\.4)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
+    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)/?$ /container-platform/$1/welcome/index.html [L,R=301]
+    RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
 
 
     # Redirects for 4.2
diff --git a/README.adoc b/README.adoc
@@ -1,7 +1,5 @@
 = OpenShift documentation
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 * https://www.okd.io/[OKD]
 * https://www.openshift.com/products/online/[OpenShift Online]
 * https://www.openshift.com/products/container-platform/[OpenShift Container Platform]
diff --git a/_templates/_page_openshift.html.erb b/_templates/_page_openshift.html.erb
@@ -27,7 +27,7 @@
 <body onload="selectVersion('<%= version %>');">
   <%= render("_templates/_topnav.html.erb", :distro_key => distro_key) %>
   <%
-    unsupported_versions = ["3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.9", "3.10", "4.1", "4.2", "4.3", "4.4"];
+    unsupported_versions = ["3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.9", "3.10", "4.1", "4.2", "4.3", "4.4", "4.5"];
   %>
   <div class="container">
     <p class="toggle-nav visible-xs pull-left">
@@ -49,9 +49,10 @@
             </a>
           <% end %>
           <select id="version-selector" onchange="versionSelector(this);">
-              <% if (version == "4.8") %>
-                <option value="4.8">4.8</option>
+              <% if (version == "4.9") %>
+                <option value="4.9">4.9</option>
                 <% end %>
+              <option value="4.8">4.8</option>
               <option value="4.7">4.7</option>
               <option value="4.6">4.6</option>
               <option value="4.5">4.5</option>
@@ -135,7 +136,7 @@
         <div class="page-header">
           <h1><%= article_title %></h1>
         </div>
-        <% if (version == "4.8") %>
+        <% if (version == "4.9" || distro_key == "openshift-wescale") %>
           <font size="+1" color="red">This documentation is work in progress and might not be complete or fully tested.</font>
           <div id="annoying-box"
             style="position: fixed; top: 100px; left: 10px; width: 100px; height: 100px; color: red">
diff --git a/contributing_to_docs/contributing.adoc b/contributing_to_docs/contributing.adoc
@@ -10,8 +10,6 @@ toc::[]
 
 == Different ways to contribute
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 There are a few different ways you can contribute to OpenShift documentation:
 
 // * Submit comments at the bottom of each topic (still awaiting implementation)
@@ -124,33 +122,31 @@ file.
 
 == Release branches
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 With the combination of conditionalizing content within files with
 `ifdef/endif` and conditionalizing whole files in the `&#95;topic&#95;map.yml`
-file, the `master` branch of
+file, the `main` branch of
 this repository always contains a complete set of documentation for all
 OpenShift products. However, when and as new versions of an OpenShift product
-are released, the `master` branch is merged down to new or existing release
+are released, the `main` branch is merged down to new or existing release
 branches. Here is the general naming scheme used in the branches:
 
-* `master` - This is our *working* branch.
+* `main` - This is our *working* branch.
 * `enterprise-N.N` - OpenShift Container Platform support releases. The docs
 for OpenShift Online and OpenShift Dedicated are based on the appropriate
 `enterprise-N.N` branch.
 
 On a 12-hourly basis, the documentation web sites are rebuilt for each of these
 branches. This way the published content for each released version of an
 OpenShift product will remain the same while development continues on the
-`master` branch. Additionally, any corrections or additions that are
+`main` branch. Additionally, any corrections or additions that are
 "cherry-picked" into the release branches will show up in the published
 documentation after 12 hours.
 
 [NOTE]
 ====
-All OpenShift content development for the 4.x stream occurs on the `master`, or
+All OpenShift content development for the 4.x stream occurs on the `main`, or
  *working* branch.
-Therefore, when submitting your work the PR must be created against the `master`
+Therefore, when submitting your work the PR must be created against the `main`
 branch. After it is reviewed, a writer will apply the content to the relevant
 release branches. If you know which branches a change applies to, be sure to
 specify it in your PR.
@@ -162,7 +158,7 @@ branch against enterprise-3.11 to submit your changes.
 == Adding files to the collection
 After you create files, you must add them to the `&#95;topic&#95;map.yml` so
 that the build system can render them. The documentation build system reads
-the `&#95;distro&#95;map.yml` from the master branch to determine
+the `&#95;distro&#95;map.yml` from the main branch to determine
 which branches to build and then the `&#95;topic&#95;map.yml` file
 for each of the branches
 to construct the content from the source files and publish to the relevant
diff --git a/contributing_to_docs/contributing_user_stories.adoc b/contributing_to_docs/contributing_user_stories.adoc
@@ -9,8 +9,8 @@
 toc::[]
 
 == Modularization backstory
-OpenShift docs are getting modularized, starting from OpenShift 4.1.
-All existing content will be completely replaced with content that is based on user stories and
+OpenShift docs are modularized, starting from OpenShift 4.1.
+All existing content has been replaced with content that is based on user stories and
 complies with the modularization guidelines. All future content must both
 support a user story and be modular.
 
diff --git a/contributing_to_docs/create_or_edit_content.adoc b/contributing_to_docs/create_or_edit_content.adoc
@@ -24,25 +24,23 @@ your local source branch is in sync with the remote and that you have all the
 latest changes. You must also ensure that your forked repository is also in sync
 with the remote repository.
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 [NOTE]
 ====
-Because most changes in this repository must be committed to the `master`
-branch (which is the master for the 4.x stream), the following process always
-uses `master` as the name of the source
+Because most changes in this repository must be committed to the `main`
+branch (which is the main for the 4.x stream), the following process always
+uses `main` as the name of the source
 branch. If you must use another branch as the source for your change, make
-sure that you consistently use that branch name instead of `master`.
+sure that you consistently use that branch name instead of `main`.
 
 When adding or updating content for version 3.11, you should create a feature
 branch against enterprise-3.11 to submit your changes.
 ====
 
-1. From your local repository, make sure you have the `master` branch checked
+1. From your local repository, make sure you have the `main` branch checked
 out:
 +
 ----
-$ git checkout master
+$ git checkout main
 ----
 
 2. Fetch the current state of the OpenShift documentation repository:
@@ -55,14 +53,14 @@ $ git fetch upstream
 `openshift/openshift-docs`, into your local repository:
 +
 ----
-$ git rebase upstream/master
+$ git rebase upstream/main
 ----
 
 4. Push the latest updates to your forked repository so that it is also in sync
 with the remote:
 +
 ----
-$ git push origin master
+$ git push origin main
 ----
 
 == Add content or update existing content on local branch
@@ -116,15 +114,13 @@ commit those changes locally:
 $ git commit -am "Detailed comments about what changes were made; for example, fixed typo"
 ----
 
-*Step 5:* Rebase updates from `master` into your working branch
-
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
+*Step 5:* Rebase updates from `main` into your working branch
 
 Remember that you must rebase against the branch that you created this working
-branch from. In most cases, it will be the master branch for the 4.x stream.
+branch from. In most cases, it will be the main branch for the 4.x stream.
 
 ----
-$ git rebase upstream/master
+$ git rebase upstream/main
 ----
 
 [NOTE]
@@ -144,16 +140,14 @@ $ git push origin <working_branch>
 
 == Submit PR to merge your work
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 When you have pushed your changes to your GitHub account, you can submit a PR to
-have your work from your GitHub fork to the `master` branch of the OpenShift
+have your work from your GitHub fork to the `main` branch of the OpenShift
 documentation repository. The documentation team will review the work, advise of
 any further changes that are required, and finally merge your work.
 
 1. Go to your forked GitHub repository on the GitHub website, and you should see
 your local branch that includes all of your work.
-2. Click on *Pull Request* to submit the PR against the `master` branch of the
+2. Click on *Pull Request* to submit the PR against the `main` branch of the
 `openshift-docs` repository.
 3. If you know which product versions your change applies to, include a comment
 that specifies the minimum version that the change applies to. The docs team
@@ -163,18 +157,16 @@ applied to one or more of these branches.
 
 == Confirm your changes have been merged
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
+When your PR has been merged into the `main` branch, you should confirm and
+then sync your local and GitHub repositories with the `main` branch.
 
-When your PR has been merged into the `master` branch, you should confirm and
-then sync your local and GitHub repositories with the `master` branch.
-
-1. On your workstation, switch to the `master` branch:
+1. On your workstation, switch to the `main` branch:
 +
 ----
-$ git checkout master
+$ git checkout main
 ----
 
-2. Pull the latest changes from `master`:
+2. Pull the latest changes from `main`:
 +
 ----
 $ git fetch upstream
@@ -184,14 +176,14 @@ $ git fetch upstream
 `openshift/openshift-docs`, into your local repository:
 +
 ----
-$ git rebase upstream/master
+$ git rebase upstream/main
 ----
 
 4. After confirming in your rebased local repository that your changes have been
 merged, push the latest changes, including your work, to your GitHub account:
 +
 ----
-$ git push origin master
+$ git push origin main
 ----
 
 == Add changes to an existing PR, if required
@@ -223,10 +215,8 @@ existing PR. Sometimes a refresh of your browser may be required.
 
 == Delete the local working branch
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 When you have confirmed that all of your changes have been accepted and merged,
-and you have pulled the latest changes on `master` and pushed them to your
+and you have pulled the latest changes on `main` and pushed them to your
 GitHub account, you can delete the local working branch. Ensure you are in your
 local repository before proceeding.
 
diff --git a/contributing_to_docs/doc_guidelines.adoc b/contributing_to_docs/doc_guidelines.adoc
@@ -39,7 +39,7 @@ toc::[]                                                         <6>
 +
 [NOTE]
 ====
-The `{product-name}` and `{product-version}` common attributes are not defined in the `modules/common-attributes.adoc` file. Those attributes are pulled by AsciiBinder from the distro mapping definitions in the https://github.com/openshift/openshift-docs/blob/master/_distro_map.yml[_distro_map.yml] file. See xref:product-name-and-version[Product name and version] for more information on this topic.
+The `{product-name}` and `{product-version}` common attributes are not defined in the `modules/common-attributes.adoc` file. Those attributes are pulled by AsciiBinder from the distro mapping definitions in the https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml] file. See xref:product-name-and-version[Product name and version] for more information on this topic.
 ====
 +
 <4> Context used for identifying headers in modules that is the same as the anchor id. Example: cli-developer-commands.
@@ -262,7 +262,7 @@ When needed, use `.Prerequisites`, `.Next steps`, or `.Additional resources` syn
 When possible, generalize references to the product name and/or version by using
 the `{product-title}` and/or `{product-version}` attributes. These attributes
 are pulled by AsciiBinder from the distro mapping definitions in the
-https://github.com/openshift/openshift-docs/blob/master/_distro_map.yml[_distro_map.yml]
+https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml]
 file.
 
 The `{product-title}` comes from the first `name:` field in a distro mapping,
@@ -301,7 +301,7 @@ You can deploy applications on {product-title}.
 ----
 
 This is a safe statement that could appear in probably any of the builds, so an
-https://github.com/openshift/openshift-docs/blob/master/contributing_to_docs/contributing.adoc#conditional-text-between-products[ifdef/endif
+https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/contributing.adoc#conditional-text-between-products[ifdef/endif
 statement] is not necessary. For example, if you were viewing a build for the
 `openshift-enterprise` distro (for any of the distro-defined branches), this
 would render as:
diff --git a/contributing_to_docs/tools_and_setup.adoc b/contributing_to_docs/tools_and_setup.adoc
@@ -138,11 +138,9 @@ workstation to edit existing content or create content.
 
 === How to deploy to your own OpenShift cluster for testing
 
-> **NOTE**: The OpenShift docs team will rename the master branch to the main branch at 4.8 GA.
-
 You can deploy to your own OpenShift cluster for development. This process will use your github repo to launch the website,
-and therefore your github repo must have all of the upstream branches. `master` is used for site changes,
-so assuming all your work is in `master`, you can remove all remote branches and then push the upstream branches.
+and therefore your github repo must have all of the upstream branches. `main` is used for site changes,
+so assuming all your work is in `main`, you can remove all remote branches and then push the upstream branches.
 
 
 Removing remote branches and updating with upstream branches (this assumes remote repos called `origin` and `upstream`)
@@ -153,10 +151,10 @@ by performing the below commands.
 ====
 ----
 $ git fetch --all
-$ for branch in $(git branch -r | grep -v "master" | grep "^  origin"); do git push origin --delete $(echo $branch | cut -d '/' -f 2); done
-$ git branch -D $(git branch | grep -v 'master' | xargs)
-$ for branch in $(git branch -r | grep -v "master" | grep "^  upstream"); do git branch --track $(echo $branch | cut -d '/' -f 2) $(echo $branch | tr -d '[:space:]'); done
-$ for branch in $(git branch | grep -v "master"); do git push origin $(echo $branch | tr -d '[:space:]'); done
+$ for branch in $(git branch -r | grep -v "main" | grep "^  origin"); do git push origin --delete $(echo $branch | cut -d '/' -f 2); done
+$ git branch -D $(git branch | grep -v 'main' | xargs)
+$ for branch in $(git branch -r | grep -v "main" | grep "^  upstream"); do git branch --track $(echo $branch | cut -d '/' -f 2) $(echo $branch | tr -d '[:space:]'); done
+$ for branch in $(git branch | grep -v "main"); do git push origin $(echo $branch | tr -d '[:space:]'); done
 ----
 
 Deploying the docs site to an OpenShift cluster
diff --git a/index-commercial.html b/index-commercial.html
@@ -189,6 +189,7 @@ <h2>OpenShift Container Platform</h2>
               <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
                 <ul class="dropdown-menu" role="menu">
+                  <li><a href="container-platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.8</a></li>
                   <li><a href="container-platform/4.7/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.7</a></li>
                   <li><a href="container-platform/4.6/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.6</a></li>
                   <li><a href="container-platform/4.5/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.5</a></li>
@@ -259,6 +260,7 @@ <h2>OpenShift Container Platform <font size="-1">(日本語翻訳)</font></h2>
               <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">バージョンを選択する<span class="caret"></span></button>
                 <ul class="dropdown-menu" role="menu">
+                  <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>
                   <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>
                   <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.6/"><i class="fa fa-arrow-circle-o-right"></i> 4.6</a></li>
                   <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.5/"><i class="fa fa-arrow-circle-o-right"></i> 4.5</a></li>
@@ -275,6 +277,7 @@ <h2>OpenShift Container Platform <font size="-1">(中文文档)</font></h2>
               <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">选择版本<span class="caret"></span></button>
                 <ul class="dropdown-menu" role="menu">
+                  <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>
                   <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>
                   <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.6/"><i class="fa fa-arrow-circle-o-right"></i> 4.6</a></li>
                   <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.5/"><i class="fa fa-arrow-circle-o-right"></i> 4.5</a></li>
diff --git a/issue_template.md b/issue_template.md
@@ -1,6 +1,6 @@
 <!--
 Please submit only documentation-related issues with this form, or follow the
-Contribute to OpenShift guidelines (https://github.com/openshift/openshift-docs/blob/master/contributing_to_docs/contributing.adoc) to submit a PR.
+Contribute to OpenShift guidelines (https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/contributing.adoc) to submit a PR.
 -->
 
 ### Which section(s) is the issue in?
diff --git a/modules/common-attributes.adoc b/modules/common-attributes.adoc
diff --git a/modules/mod-docs-ocp-conventions.adoc b/modules/mod-docs-ocp-conventions.adoc
