Merge pull request #1207 from adellape/fix_addtl_upgrade

Fix addtl 3.1 manual upgrade steps
openshift · Nov 17, 2015 · 1096be1 · 1096be1
2 parents 7c5b76c + 4b36bce
commit 1096be1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/install_config/upgrades.adoc b/install_config/upgrades.adoc
@@ -664,7 +664,7 @@ fully complete the upgrade.
 
 *Removing Support for the v1beta3 API*
 
-Update the *_/etc/origin/master/master-config.yml_* file on each master and
+Update the *_/etc/openshift/master/master-config.yml_* file on each master, and
 remove *v1beta3* from the `*apiLevels*` and `*kubernetesMasterConfig.apiLevels`*
 parameters.
 
@@ -698,8 +698,10 @@ Add the master proxy client certificates to the
 
 ====
 ----
-  - kubernetesMasterConfig.proxyClientInfo.certFile: master.proxy-client.crt
-  - kubernetesMasterConfig.proxyClientInfo.keyFile: master.proxy-client.key
+kubernetesMasterConfig:
+  proxyClientInfo:
+    certFile: master.proxy-client.crt
+    keyFile: master.proxy-client.key
 ----
 ====
 endif::[]