Merge pull request #27249 from vikram-redhat/master

OKD to latest

Author: vikram-redhat

.s2i/httpd-cfg/01-community.conf

@@ -127,18 +127,16 @@ AddType text/vtt                            vtt
 
     # set OKD docs minishift to go to the 3.11 branch as minishift is not on 4.x (yet)
     RewriteRule ^latest/minishift/?(.*)$ /3.11/minishift/$1 [NE,R=301]
-    
+
     # Redirects for "latest" version
-    RewriteRule ^origin-m4/?$ /latest/ [R=301]
+    RewriteRule ^(origin-m4|4)/?$ /latest/ [R=301]
 
     # Welcome page redirects
     RewriteRule ^(latest|[0-9.]+)/?$ /$1/welcome/index.html [L,R=301]
 
     # Overview page has moved to Index page
     RewriteRule ^(.*)/overview\.html(.*)$ /$1/index.html$2 [NE,L,R=301]
 
-
-
     # Developers console redirect
     RewriteRule ^(latest|[0-9.]+)/getting_started/developers/developers_console\.html(.*)$ /$1/getting_started/developers_console.html$2 [NE,L,R=301]
 

_distro_map.yml

@@ -7,7 +7,7 @@ openshift-origin:
   site_url: https://docs.okd.io/
   branches:
     master:
-      name: Latest
+      name: 4
       dir: latest
     enterprise-3.2:
       name: '1.2'