diff --git a/OWNERS b/OWNERS
index 906f057a2d..2dabed0d93 100644
--- a/OWNERS
+++ b/OWNERS
@@ -5,8 +5,6 @@ reviewers:
 - bradtopol
 approvers:
 - heckj
-- a-mccarthy
-- abiogenesis-now
 - bradamant3
 - bradtopol
 - steveperry-53
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 10683f47aa..ecba525e65 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -87,12 +87,11 @@ aliases:
     - grodrigues3
     - spxtr
   sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
-    - a-mccarthy
-    - abiogenesis-now
     - bradamant3
     - steveperry-53
     - zacharysarah
     - bradtopol
+    - heckj
   sig-federation: #Team: Federation; e.g. Federated Clusters
     - csbell
   sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
@@ -204,4 +203,3 @@ aliases:
     - floreks
   sig-windows:
     - michmike
-
diff --git a/_data/setup.yml b/_data/setup.yml
index 5803ac17ca..f09b31417d 100644
--- a/_data/setup.yml
+++ b/_data/setup.yml
@@ -75,7 +75,6 @@ toc:
 
     - title: Bare Metal
       section:
-      - docs/getting-started-guides/coreos/bare_metal_offline.md
       - docs/getting-started-guides/fedora/fedora_manual_config.md
       - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
       - docs/getting-started-guides/coreos/index.md
diff --git a/_includes/partner-script.js b/_includes/partner-script.js
index 307e6bf5c3..f09191629e 100644
--- a/_includes/partner-script.js
+++ b/_includes/partner-script.js
@@ -490,6 +490,13 @@
 			link: 'https://tenxcloud.com',
 			blurb: 'TenxCloud - TenxCloud Container Engine (TCE)'
 				},
+		{
+			type: 2,
+			name: 'TenxCloud',
+			logo: 'tenxcloud',
+			link: 'https://www.tenxcloud.com/',
+			blurb: 'Founded in October 2014, TenxCloud is a leading enterprise container cloud computing service provider in China, covering the areas such as container PaaS cloud platform, micro-service management, DevOps, development test, AIOps and so on. Provide private cloud PaaS products and solutions for financial, energy, operator, manufacturing, education and other industry customers.'
+				},
 		{
 			type: 0,
 			name: 'Twistlock',
@@ -1410,7 +1417,7 @@
 		{
 			type: 0,
 			name: 'Hedvig',
-			logo: 'hevig',
+			logo: 'hedvig',
 			link: 'https://www.hedviginc.com/blog/provisioning-hedvig-storage-with-kubernetes',
 			blurb: 'Hedvig is software-defined storage that uses NFS or iSCSI for persistent volumes for provisioning shared storage for pods and containers.'
 				},
diff --git a/case-studies/index.html b/case-studies/index.html
index d3ce939c70..ee10a31681 100644
--- a/case-studies/index.html
+++ b/case-studies/index.html
@@ -14,6 +14,12 @@ cid: caseStudies
     <main>
         <div class="content">
             <div class="case-studies">
+                 <div class="case-study">
+                  <img src="/images/case_studies/amadeus_feature.png" alt="amadeus">
+                  <p class="quote">"We didn’t think that we could achieve them with our existing system. We need new automation, things that Kubernetes and OpenShift bring."</p>
+                  <!--<p class="attrib">— Eric Mountain, Senior Expert, Distributed Systems at Amadeus IT Group</p>-->
+                  <a href="/case-studies/amadeus/">Read about Amadeus</a>
+              </div>
               <div class="case-study">
                   <img src="/images/case_studies/huawei_feature.png" alt="huawei">
                   <p class="quote">"Kubernetes basically solved most of our problems. Before, the time of deployment took about a week, now it only takes minutes."</p>
@@ -32,18 +38,6 @@ cid: caseStudies
                   <!--<p class="attrib">— Michael Francis, Managing Director at BlackRock</p>-->
                   <a href="/case-studies/blackrock/">Read about BlackRock</a>
               </div>
-              <div class="case-study">
-                  <img src="/images/case_studies/blablacar-logo.png" alt="blablacar">
-                  <p class="quote">"[With Kubernetes] our infrastructure is much more resilient and we have better availability than before."</p>
-                  <!--<p class="attrib">—  Simon Lallemand, Infrastructure Engineer at BlaBlaCar</p>-->
-                  <a href="/case-studies/blablacar/">Read about BlaBlaCar</a>
-              </div>
-              <div class="case-study">
-                  <img src="/images/case_studies/peardeck.png" alt="peardeck">
-                  <p class="quote">"In terms of the cloud, Kubernetes and Prometheus have so much to offer."</p>
-                  <!--<p class="attrib">—  Riley Eynon-Lynch, CEO of Pear Deck</p>-->
-                  <a href="/case-studies/peardeck/">Read about Pear Deck</a>
-              </div>
             </div>
         </div>
     </main>
@@ -65,7 +59,7 @@ cid: caseStudies
     <main>
         <h3>Kubernetes Users</h3>
         <div id="usersGrid">
-          <a target="_blank" href="http://www.nextplatform.com/2015/08/04/amadeus-takes-off-with-containers-and-clouds/"><img src="/images/case_studies/amadeus.png" alt="Amadeus"></a>
+          <a target="_blank" href="/case-studies/amadeus/"><img src="/images/case_studies/amadeus.png" alt="Amadeus"></a>
           <a target="_blank" href="/case-studies/ancestry/"><img src="/images/case_studies/ancestry.png" alt="Ancestry.com"></a>
           <a target="_blank" href="/case-studies/blablacar/"><img src="/images/case_studies/blablacar.png" alt="BlaBlaCar"></a>
           <a target="_blank" href="/case-studies/blackrock/"><img src="/images/case_studies/blackrock2.png" alt="BlackRock"></a>
diff --git a/cn/docs/getting-started-guides/coreos/bare_metal_offline.md b/cn/docs/getting-started-guides/coreos/bare_metal_offline.md
deleted file mode 100644
index 8e9b0d9ceb..0000000000
--- a/cn/docs/getting-started-guides/coreos/bare_metal_offline.md
+++ /dev/null
@@ -1,708 +0,0 @@
----
-approvers:
-- erictune
-- thockin
-title: Offline
----
-
-本文档介绍了如何在CoreOS系统上部署Kubernetes。主要针对需要在离线环境下部署的场景，无论您是真实部署前的POC测试还是由于应用程序受限必须在离线环境中使用，本文档都是适用的。
-
-* TOC
-{:toc}
-
-
-## 前提条件
-
-1. 安装了 *CentOS 6* 系统的PXE服务器
-2. 集群中需要至少两台物理裸机节点
-
-## 概要设计
-
-1. 管理tftp目录
-  * /tftpboot/(coreos)(centos)(RHEL)
-  * /tftpboot/pxelinux.0/(MAC) -> 链接到Linux镜像配置文件
-2. 安装时更新pxelinux链接
-3. 更新DHCP配置，添加所需要部署的主机的相关信息
-4. 创建一个etcd集群
-5. 确保集群处于离线环境[etcd discovery tool](https://discovery.etcd.io/).
-6. 安装配置CoreOS slave节点作为Kubernetes节点
-
-## 本文档定义的一些变量
-
-| Node Description              | MAC               | IP          |
-| :---------------------------- | :---------------: | :---------: |
-| CoreOS/etcd/Kubernetes Master | d0:00:67:13:0d:00 | 10.20.30.40 |
-| CoreOS Slave 1                | d0:00:67:13:0d:01 | 10.20.30.41 |
-| CoreOS Slave 2                | d0:00:67:13:0d:02 | 10.20.30.42 |
-
-
-## 设置PXELINUX CentOS
-
-请参阅[这篇指南](http://docs.fedoraproject.org/en-US/Fedora/7/html/Installation_Guide/ap-pxe-server.html)以了解完整的CentOS PXELINUX环境设置步骤。本节内容仅是上述指南文档的概要缩写版本。
-
-1. 安装CentOS上所需要的相关软件包
-
-```shell
-sudo yum install tftp-server dhcp syslinux
-```
-
-2. 编辑`/etc/xinetd.d/tftp`文件以启用tftp服务
-
-```conf
-disable = no
-```
-
-3. 拷贝所需的syslinux镜像文件
-
-```shell
-su -
-mkdir -p /tftpboot
-cd /tftpboot
-cp /usr/share/syslinux/pxelinux.0 /tftpboot
-cp /usr/share/syslinux/menu.c32 /tftpboot
-cp /usr/share/syslinux/memdisk /tftpboot
-cp /usr/share/syslinux/mboot.c32 /tftpboot
-cp /usr/share/syslinux/chain.c32 /tftpboot
-
-/sbin/service dhcpd start
-/sbin/service xinetd start
-/sbin/chkconfig tftp on
-```
-
-4. 设置默认引导菜单
-
-```shell
-mkdir /tftpboot/pxelinux.cfg
-touch /tftpboot/pxelinux.cfg/default
-```
-
-5. 编辑默认引导菜单`/tftpboot/pxelinux.cfg/default`
-
-```conf
-default menu.c32
-prompt 0
-timeout 15
-ONTIMEOUT local
-display boot.msg
-
-MENU TITLE Main Menu
-
-LABEL local
-        MENU LABEL Boot local hard drive
-        LOCALBOOT 0
-```
-
-至此，您应当已经配置好一个可用的PXELINUX环境用来运行CoreOS节点了。您可以使用VirtualBox或者在物理裸机上对PXELINUX环境所提供的服务进行验证。
-
-## 添加CoreOS至PXE
-
-本节描述在已有PXELINUX环境的前提下，如何配置CoreOS镜像与之并存。
-
-1. 查找或者创建TFTP根目录，后续所有步骤都将基于此目录。
-    * 本文中我们假设`/tftpboot`是根目录。
-2. tftp根目录准备好后，我们将为CoreOS镜像创建一个新的目录结构。
-3. 下载由CoreOS团队提供的CoreOS PXE相关文件。
-
-```shell
-MY_TFTPROOT_DIR=/tftpboot
-mkdir -p $MY_TFTPROOT_DIR/images/coreos/
-cd $MY_TFTPROOT_DIR/images/coreos/
-wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe.vmlinuz
-wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe.vmlinuz.sig
-wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe_image.cpio.gz
-wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe_image.cpio.gz.sig
-gpg --verify coreos_production_pxe.vmlinuz.sig
-gpg --verify coreos_production_pxe_image.cpio.gz.sig
-```
-
-4. 再次编辑菜单`/tftpboot/pxelinux.cfg/default`
-
-```conf
-default menu.c32
-prompt 0
-timeout 300
-ONTIMEOUT local
-display boot.msg
-
-MENU TITLE Main Menu
-
-LABEL local
-        MENU LABEL Boot local hard drive
-        LOCALBOOT 0
-
-MENU BEGIN CoreOS Menu
-
-    LABEL coreos-master
-        MENU LABEL CoreOS Master
-        KERNEL images/coreos/coreos_production_pxe.vmlinuz
-        APPEND initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<xxx.xxx.xxx.xxx>/pxe-cloud-config-single-master.yml
-
-    LABEL coreos-slave
-        MENU LABEL CoreOS Slave
-        KERNEL images/coreos/coreos_production_pxe.vmlinuz
-        APPEND initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<xxx.xxx.xxx.xxx>/pxe-cloud-config-slave.yml
-MENU END
-```
-
-此文件配置了系统将从本地磁盘引导，但添加了从PXE CoreOS镜像引导的选项。
-
-## DHCP配置
-
-本节将介绍如何配置DHCP服务器分发新的镜像。这里我们假设集群中有其他的服务器需要从不同的CoreOS镜像引导。
-
-1. 添加`filename`字段到 _host_ 或者 _subnet_ 部分。
-
-```conf
-filename "/tftpboot/pxelinux.0";
-```
-
-2. 现在，我们可以创建pxelinux配置文件，这些配置将来也可以作为其他不同CoreOS部署的模版。
-
-```conf
-subnet 10.20.30.0 netmask 255.255.255.0 {
-        next-server 10.20.30.242;
-        option broadcast-address 10.20.30.255;
-        filename "<other default image>";
-
-        ...
-        # http://www.syslinux.org/wiki/index.php/PXELINUX
-        host core_os_master {
-                hardware ethernet d0:00:67:13:0d:00;
-                option routers 10.20.30.1;
-                fixed-address 10.20.30.40;
-                option domain-name-servers 10.20.30.242;
-                filename "/pxelinux.0";
-        }
-        host core_os_slave {
-                hardware ethernet d0:00:67:13:0d:01;
-                option routers 10.20.30.1;
-                fixed-address 10.20.30.41;
-                option domain-name-servers 10.20.30.242;
-                filename "/pxelinux.0";
-        }
-        host core_os_slave2 {
-                hardware ethernet d0:00:67:13:0d:02;
-                option routers 10.20.30.1;
-                fixed-address 10.20.30.42;
-                option domain-name-servers 10.20.30.242;
-                filename "/pxelinux.0";
-        }
-        ...
-}
-```
-
-稍后我们将介绍节点的配置。
-
-## Kubernetes
-
-部署以上配置前，需要首先创建一个`etcd`主节点(master)。为了做到这一点，我们需要使用一个特殊的cloud-config.yaml来pxe CoreOS，可以有两种方式：
-1. 第一种方式是将云配置文件模版化，然后通过编程的方式为不同的集群提供不同的配置。
-2. 第二种方式是运行一个服务发现协议从而可以在云环境中做服务的自动发现。
-
-在本示例中，我们将通过静态方式创建一个etcd服务器，用于运行Kubernetes主控组件，并用作etcd主节点。
-
-由于我们的集群处于一个离线的环境中，所以大部分的CoreOS和Kubernetes帮助进程是受限的。为了完成部署，我们需要下载Kubernetes的各个可执行文件到本地然后再启动运行。
-
-一种简单的方案是在DHCP/TFTP主机上搭建一个简易的web服务器，从而环境中的CoreOS PXE机器可以从其上下载各个可执行文件。
-
-为了达到这一目标，我们将启动一个`apache`服务器并提供运行Kubernetes所需要的各个可执行文件。
-
-以下脚本运行在上文中准备好的PXE服务器上：
-
-```shell
-rm /etc/httpd/conf.d/welcome.conf
-cd /var/www/html/
-wget -O kube-register  https://github.com/kelseyhightower/kube-register/releases/download/v0.0.2/kube-register-0.0.2-linux-amd64
-wget -O setup-network-environment https://github.com/kelseyhightower/setup-network-environment/releases/download/v1.0.0/setup-network-environment
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubernetes
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-apiserver
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-controller-manager
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-scheduler
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubectl
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubecfg
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubelet
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-proxy
-wget -O flanneld https://storage.googleapis.com/k8s/flanneld
-```
-
-以上脚本将准备好运行Kubernetes所需的所有可执行文件。未来这些文件将可通过互联网直接进行更新。
-
-现在可以开始准备部署了！
-
-## 云平台配置
-
-以下Kubernetes离线版本部署配置文件经过了一定的裁减。
-
-以下内容基于配置文件: [master.yml](/docs/getting-started-guides/coreos/cloud-configs/master.yaml), 以及[node.yml](/docs/getting-started-guides/coreos/cloud-configs/node.yaml)
-
-将文件中的一些占位字段做如下修改：
-
- - 使用您的PXE服务器的ip地址替换文件中的`<PXE_SERVER_IP>` (例如10.20.30.242)
- - 使用Kubernetes master节点的ip地址替换文件中的`<MASTER_SERVER_IP>` (例如10.20.30.40)
- - 如果您使用私有docker镜像仓库，请使用您的镜像仓库DNS名字替换文件中的`rdocker.example.com`
- - 如果您使用代理，请用代理服务器地址（包含端口）替换文件中的`rproxy.example.com`
- - 在配置文件最后添加您的SSH公钥
-
-### master.yml
-
-在PXE服务器上创建并编辑文件`/var/www/html/coreos/pxe-cloud-config-master.yml`。
-
-```yaml
-#cloud-config
----
-write_files:
-  - path: /opt/bin/waiter.sh
-    owner: root
-    content: |
-      #! /usr/bin/bash
-      until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
-  - path: /opt/bin/kubernetes-download.sh
-    owner: root
-    permissions: 0755
-    content: |
-      #! /usr/bin/bash
-      /usr/bin/wget -N -P "/opt/bin" "http://<PXE_SERVER_IP>/kubectl"
-      /usr/bin/wget -N -P "/opt/bin" "http://<PXE_SERVER_IP>/kubernetes"
-      /usr/bin/wget -N -P "/opt/bin" "http://<PXE_SERVER_IP>/kubecfg"
-      chmod +x /opt/bin/*
-  - path: /etc/profile.d/opt-path.sh
-    owner: root
-    permissions: 0755
-    content: |
-      #! /usr/bin/bash
-      PATH=$PATH/opt/bin
-coreos:
-  units:
-    - name: 10-eno1.network
-      runtime: true
-      content: |
-        [Match]
-        Name=eno1
-        [Network]
-        DHCP=yes
-    - name: 20-nodhcp.network
-      runtime: true
-      content: |
-        [Match]
-        Name=en*
-        [Network]
-        DHCP=none
-    - name: get-kube-tools.service
-      runtime: true
-      command: start
-      content: |
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStart=/opt/bin/kubernetes-download.sh
-        RemainAfterExit=yes
-        Type=oneshot
-    - name: setup-network-environment.service
-      command: start
-      content: |
-        [Unit]
-        Description=Setup Network Environment
-        Documentation=https://github.com/kelseyhightower/setup-network-environment
-        Requires=network-online.target
-        After=network-online.target
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/setup-network-environment
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment
-        ExecStart=/opt/bin/setup-network-environment
-        RemainAfterExit=yes
-        Type=oneshot
-    - name: etcd.service
-      command: start
-      content: |
-        [Unit]
-        Description=etcd
-        Requires=setup-network-environment.service
-        After=setup-network-environment.service
-        [Service]
-        EnvironmentFile=/etc/network-environment
-        User=etcd
-        PermissionsStartOnly=true
-        ExecStart=/usr/bin/etcd \
-        --name ${DEFAULT_IPV4} \
-        --addr ${DEFAULT_IPV4}:4001 \
-        --bind-addr 0.0.0.0 \
-        --cluster-active-size 1 \
-        --data-dir /var/lib/etcd \
-        --http-read-timeout 86400 \
-        --peer-addr ${DEFAULT_IPV4}:7001 \
-        --snapshot true
-        Restart=always
-        RestartSec=10s
-    - name: fleet.socket
-      command: start
-      content: |
-        [Socket]
-        ListenStream=/var/run/fleet.sock
-    - name: fleet.service
-      command: start
-      content: |
-        [Unit]
-        Description=fleet daemon
-        Wants=etcd.service
-        After=etcd.service
-        Wants=fleet.socket
-        After=fleet.socket
-        [Service]
-        Environment="FLEET_ETCD_SERVERS=http://127.0.0.1:4001"
-        Environment="FLEET_METADATA=role=master"
-        ExecStart=/usr/bin/fleetd
-        Restart=always
-        RestartSec=10s
-    - name: etcd-waiter.service
-      command: start
-      content: |
-        [Unit]
-        Description=etcd waiter
-        Wants=network-online.target
-        Wants=etcd.service
-        After=etcd.service
-        After=network-online.target
-        Before=flannel.service
-        Before=setup-network-environment.service
-        [Service]
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh
-        ExecStart=/usr/bin/bash /opt/bin/waiter.sh
-        RemainAfterExit=true
-        Type=oneshot
-    - name: flannel.service
-      command: start
-      content: |
-        [Unit]
-        Wants=etcd-waiter.service
-        After=etcd-waiter.service
-        Requires=etcd.service
-        After=etcd.service
-        After=network-online.target
-        Wants=network-online.target
-        Description=flannel is an etcd backed overlay network for containers
-        [Service]
-        Type=notify
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/flanneld
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
-        ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.100.0.0/16", "Backend": {"Type": "vxlan"}}'
-        ExecStart=/opt/bin/flanneld
-    - name: kube-apiserver.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes API Server
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=etcd.service
-        After=etcd.service
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-apiserver
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
-        ExecStart=/opt/bin/kube-apiserver \
-        --address=0.0.0.0 \
-        --port=8080 \
-        --service-cluster-ip-range=10.100.0.0/16 \
-        --etcd-servers=http://127.0.0.1:4001 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-    - name: kube-controller-manager.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Controller Manager
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=kube-apiserver.service
-        After=kube-apiserver.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-controller-manager
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager
-        ExecStart=/opt/bin/kube-controller-manager \
-        --master=127.0.0.1:8080 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-    - name: kube-scheduler.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Scheduler
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=kube-apiserver.service
-        After=kube-apiserver.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-scheduler
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler
-        ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080
-        Restart=always
-        RestartSec=10
-    - name: kube-register.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Registration Service
-        Documentation=https://github.com/kelseyhightower/kube-register
-        Requires=kube-apiserver.service
-        After=kube-apiserver.service
-        Requires=fleet.service
-        After=fleet.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-register
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register
-        ExecStart=/opt/bin/kube-register \
-        --metadata=role=node \
-        --fleet-endpoint=unix:///var/run/fleet.sock \
-        --healthz-port=10248 \
-        --api-endpoint=http://127.0.0.1:8080
-        Restart=always
-        RestartSec=10
-  update:
-    group: stable
-    reboot-strategy: off
-ssh_authorized_keys:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAAD...
-```
-
-### node.yml
-
-在PXE服务器上创建并编辑文件`/var/www/html/coreos/pxe-cloud-config-slave.yml`。
-
-```yaml
-#cloud-config
----
-write_files:
-  - path: /etc/default/docker
-    content: |
-      DOCKER_EXTRA_OPTS='--insecure-registry="rdocker.example.com:5000"'
-coreos:
-  units:
-    - name: 10-eno1.network
-      runtime: true
-      content: |
-        [Match]
-        Name=eno1
-        [Network]
-        DHCP=yes
-    - name: 20-nodhcp.network
-      runtime: true
-      content: |
-        [Match]
-        Name=en*
-        [Network]
-        DHCP=none
-    - name: etcd.service
-      mask: true
-    - name: docker.service
-      drop-ins:
-        - name: 50-insecure-registry.conf
-          content: |
-            [Service]
-            Environment="HTTP_PROXY=http://rproxy.example.com:3128/" "NO_PROXY=localhost,127.0.0.0/8,rdocker.example.com"
-    - name: fleet.service
-      command: start
-      content: |
-        [Unit]
-        Description=fleet daemon
-        Wants=fleet.socket
-        After=fleet.socket
-        [Service]
-        Environment="FLEET_ETCD_SERVERS=http://<MASTER_SERVER_IP>:4001"
-        Environment="FLEET_METADATA=role=node"
-        ExecStart=/usr/bin/fleetd
-        Restart=always
-        RestartSec=10s
-    - name: flannel.service
-      command: start
-      content: |
-        [Unit]
-        After=network-online.target
-        Wants=network-online.target
-        Description=flannel is an etcd backed overlay network for containers
-        [Service]
-        Type=notify
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/flanneld
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
-        ExecStart=/opt/bin/flanneld -etcd-endpoints http://<MASTER_SERVER_IP>:4001
-    - name: docker.service
-      command: start
-      content: |
-        [Unit]
-        After=flannel.service
-        Wants=flannel.service
-        Description=Docker Application Container Engine
-        Documentation=http://docs.docker.io
-        [Service]
-        EnvironmentFile=-/etc/default/docker
-        EnvironmentFile=/run/flannel/subnet.env
-        ExecStartPre=/bin/mount --make-rprivate /
-        ExecStart=/usr/bin/docker -d --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU} -s=overlay -H fd:// ${DOCKER_EXTRA_OPTS}
-        [Install]
-        WantedBy=multi-user.target
-    - name: setup-network-environment.service
-      command: start
-      content: |
-        [Unit]
-        Description=Setup Network Environment
-        Documentation=https://github.com/kelseyhightower/setup-network-environment
-        Requires=network-online.target
-        After=network-online.target
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/setup-network-environment
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment
-        ExecStart=/opt/bin/setup-network-environment
-        RemainAfterExit=yes
-        Type=oneshot
-    - name: kube-proxy.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Proxy
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=setup-network-environment.service
-        After=setup-network-environment.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-proxy
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
-        ExecStart=/opt/bin/kube-proxy \
-        --etcd-servers=http://<MASTER_SERVER_IP>:4001 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-    - name: kube-kubelet.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Kubelet
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=setup-network-environment.service
-        After=setup-network-environment.service
-        [Service]
-        EnvironmentFile=/etc/network-environment
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kubelet
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet
-        ExecStart=/opt/bin/kubelet \
-        --address=0.0.0.0 \
-        --port=10250 \
-        --hostname-override=${DEFAULT_IPV4} \
-        --api-servers=<MASTER_SERVER_IP>:8080 \
-        --healthz-bind-address=0.0.0.0 \
-        --healthz-port=10248 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-  update:
-    group: stable
-    reboot-strategy: off
-ssh_authorized_keys:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAAD...
-```
-
-## 创建pxelinux.cfg相关文件
-
-为 _slave_ 节点创建一个pxelinux目标文件： `vi /tftpboot/pxelinux.cfg/coreos-node-slave`
-
-```conf
-default coreos
-prompt 1
-timeout 15
-
-display boot.msg
-
-label coreos
-    menu default
-    kernel images/coreos/coreos_production_pxe.vmlinuz
-    append initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<pxe-host-ip>/coreos/pxe-cloud-config-slave.yml console=tty0 console=ttyS0 coreos.autologin=tty1 coreos.autologin=ttyS0
-```
-
-为 _master_ 节点也创建一个： `vi /tftpboot/pxelinux.cfg/coreos-node-master`
-
-```conf
-default coreos
-prompt 1
-timeout 15
-
-display boot.msg
-
-label coreos
-    menu default
-    kernel images/coreos/coreos_production_pxe.vmlinuz
-    append initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<pxe-host-ip>/coreos/pxe-cloud-config-master.yml console=tty0 console=ttyS0 coreos.autologin=tty1 coreos.autologin=ttyS0
-```
-
-## 指定pxelinux目标
-
-在上一步骤中我们已经设置了master和slave节点的目标, 我们需要将特定的主机配置为这些目标。为实现这一点，我们可以通过将指定的MAC地址配置到指定的pxelinux.cfg文件的方法来解决。
-
-参照本文开始时的MAC地址列表，可以做出下文中的修改。更多细节信息请参阅[相关文档](http://www.syslinux.org/wiki/index.php/PXELINUX).
-
-```shell
-cd /tftpboot/pxelinux.cfg
-ln -s coreos-node-master 01-d0-00-67-13-0d-00
-ln -s coreos-node-slave 01-d0-00-67-13-0d-01
-ln -s coreos-node-slave 01-d0-00-67-13-0d-02
-```
-
-重启这些服务器令这些镜像PXE化并准备开始运行容器！
-
-## 创建测试pod
-
-现在，Kubernetes已经成功部署在CoreOS上了，我们可以创建一些pod来测试部署。
-
-请参考[一个简单的nginx样例部署](/docs/user-guide/simple-nginx)来测试集群环境。
-
-更多完整的应用程序示例，请参阅[示例目录](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/)中的各种例子。
-
-## 一些用于调试的帮助命令
-
-列出etcd中的所有关键字：
-
-```shell
-etcdctl ls --recursive
-```
-
-列出所有fleet集群中的机器：
-
-```shell
-fleetctl list-machines
-```
-
-查阅master节点上各种Kubernetes服务的系统状态：
-
-```shell
-systemctl status kube-apiserver
-systemctl status kube-controller-manager
-systemctl status kube-scheduler
-systemctl status kube-register
-```
-
-查阅集群节点上各种服务的系统状态：
-
-```shell
-systemctl status kube-kubelet
-systemctl status docker.service
-```
-
-列举Kubernetes环境中的各种对象：
-
-```shell
-kubectl get pods
-kubectl get nodes
-```
-
-结束Kubernetes中的所有pod：
-
-```shell
-for i in `kubectl get pods | awk '{print $1}'`; do kubectl delete pod $i; done
-```
-
-## 支持级别
-
-
-IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
--------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline)              |          | Community ([@jeffbean](https://github.com/jeffbean))
-
-有关所有解决方案的支持级别信息，请参阅[解决方案列表](/docs/getting-started-guides/#table-of-solutions)。
diff --git a/docs/concepts/cluster-administration/manage-deployment.md b/docs/concepts/cluster-administration/manage-deployment.md
index 4c280f5a4c..864a95a24a 100644
--- a/docs/concepts/cluster-administration/manage-deployment.md
+++ b/docs/concepts/cluster-administration/manage-deployment.md
@@ -55,7 +55,7 @@ deployment "nginx-deployment" created
 Resource creation isn't the only operation that `kubectl` can perform in bulk. It can also extract resource names from configuration files in order to perform other operations, in particular to delete the same resources you created:
 
 ```shell
-$ kubectl delete -f https://k8s.io/docs/concepts/cluster-administration/nginx/
+$ kubectl delete -f https://k8s.io/docs/concepts/cluster-administration/nginx-app.yaml
 deployment "my-nginx" deleted
 service "my-nginx-svc" deleted
 ```
diff --git a/docs/concepts/configuration/secret.md b/docs/concepts/configuration/secret.md
index 96f64b6c02..497bff5459 100644
--- a/docs/concepts/configuration/secret.md
+++ b/docs/concepts/configuration/secret.md
@@ -117,9 +117,7 @@ data:
   password: MWYyZDFlMmU2N2Rm
 ```
 
-The data field is a map.  Its keys must match
-[`DNS_SUBDOMAIN`](https://git.k8s.io/community/contributors/design-proposals/architecture/identifiers.md), except that leading dots are also
-allowed.  The values are arbitrary data, encoded using base64.
+The data field is a map.  Its keys must consist of alphanumeric characters, '-', '_' or '.'.  The values are arbitrary data, encoded using base64.
 
 Create the secret using [`kubectl create`](/docs/user-guide/kubectl/{{page.version}}/#create):
 
diff --git a/docs/concepts/overview/components.md b/docs/concepts/overview/components.md
index f18547aaa0..b0922293c3 100644
--- a/docs/concepts/overview/components.md
+++ b/docs/concepts/overview/components.md
@@ -74,7 +74,7 @@ network rules on the host and performing connection forwarding.
 
 ### Container Runtime
 
-The container runtime is the software that is responsible for running containers. Kubernetes supports two runtimes: [Docker](http://www.docker.com) and [rkt](https://coreos.com/rkt/).
+The container runtime is the software that is responsible for running containers. Kubernetes supports several runtimes: [Docker](http://www.docker.com), [rkt](https://coreos.com/rkt/), [runc](https://github.com/opencontainers/runc) and any OCI [runtime-spec](https://github.com/opencontainers/runtime-spec) implementation.
 
 ## Addons
 
diff --git a/docs/concepts/overview/object-management-kubectl/imperative-command.md b/docs/concepts/overview/object-management-kubectl/imperative-command.md
index a4d62c90a6..790a615d41 100644
--- a/docs/concepts/overview/object-management-kubectl/imperative-command.md
+++ b/docs/concepts/overview/object-management-kubectl/imperative-command.md
@@ -127,7 +127,7 @@ creation. This is done by piping the output of the `create` command to the
 `set` command, and then back to the `create` command. Here's an example:
 
 ```sh
-kubectl create service clusterip <myservicename> -o yaml --dry-run | kubectl set selector --local -f - 'environment=qa' -o yaml | kubectl create -f -
+kubectl create service clusterip my-svc --clusterip="None" -o yaml --dry-run | kubectl set selector --local -f - 'environment=qa' -o yaml | kubectl create -f -
 ```
 
 1. The `kubectl create service -o yaml --dry-run` command creates the configuration for the Service, but prints it to stdout as YAML instead of sending it to the Kubernetes API server.
diff --git a/docs/concepts/services-networking/service.md b/docs/concepts/services-networking/service.md
index 0f420d0daa..40d0c82f12 100644
--- a/docs/concepts/services-networking/service.md
+++ b/docs/concepts/services-networking/service.md
@@ -455,7 +455,8 @@ cloud provider does not support the feature, the field will be ignored.
 
 **Special notes for Azure**: To use user-specified public type `loadBalancerIP`, a static type
 public IP address resource needs to be created first, and it should be in the same resource
-group of the cluster. Then you could specify the assigned IP address as `loadBalancerIP`.
+group of the cluster. Specify the assigned IP address as loadBalancerIP. Verify you have 
+securityGroupName in the cloud provider configuration file.
 
 #### Internal load balancer
 In a mixed environment it is sometimes necessary to route traffic from services inside the same VPC.
diff --git a/docs/getting-started-guides/coreos/bare_metal_offline.md b/docs/getting-started-guides/coreos/bare_metal_offline.md
deleted file mode 100644
index e6ba7817fa..0000000000
--- a/docs/getting-started-guides/coreos/bare_metal_offline.md
+++ /dev/null
@@ -1,688 +0,0 @@
----
-reviewers:
-- erictune
-- thockin
-title: Offline
----
-
-Deploy a CoreOS running Kubernetes environment. This particular guide is made to help those in an OFFLINE system, whether for testing a POC before the real deal, or you are restricted to be totally offline for your applications.
-
-* TOC
-{:toc}
-
-
-## Prerequisites
-
-1. Installed *CentOS 6* for PXE server
-2. At least two bare metal nodes to work with
-
-## High Level Design
-
-1. Manage the tftp directory
-  * /tftpboot/(coreos)(centos)(RHEL)
-  * /tftpboot/pxelinux.0/(MAC) -> linked to Linux image config file
-2. Update per install the link for pxelinux
-3. Update the DHCP config to reflect the host needing deployment
-4. Setup nodes to deploy CoreOS creating an etcd cluster.
-5. Have no access to the public [etcd discovery tool](https://discovery.etcd.io/).
-6. Installing the CoreOS slaves to become Kubernetes nodes.
-
-## This Guides variables
-
-| Node Description              | MAC               | IP          |
-| :---------------------------- | :---------------: | :---------: |
-| CoreOS/etcd/Kubernetes Master | d0:00:67:13:0d:00 | 10.20.30.40 |
-| CoreOS Slave 1                | d0:00:67:13:0d:01 | 10.20.30.41 |
-| CoreOS Slave 2                | d0:00:67:13:0d:02 | 10.20.30.42 |
-
-
-## Setup PXELINUX CentOS
-
-To setup CentOS PXELINUX environment there is a complete [guide here](http://docs.fedoraproject.org/en-US/Fedora/7/html/Installation_Guide/ap-pxe-server.html). This section is the abbreviated version.
-
-1. Install packages needed on CentOS
-
-        sudo yum install tftp-server dhcp syslinux
-
-2. `vi /etc/xinetd.d/tftp` to enable tftp service and change disable to 'no'
-
-        -disable = no
-
-3. Copy over the syslinux images we will need.
-
-        su -
-        mkdir -p /tftpboot
-        cd /tftpboot
-        cp /usr/share/syslinux/pxelinux.0 /tftpboot
-        cp /usr/share/syslinux/menu.c32 /tftpboot
-        cp /usr/share/syslinux/memdisk /tftpboot
-        cp /usr/share/syslinux/mboot.c32 /tftpboot
-        cp /usr/share/syslinux/chain.c32 /tftpboot
-
-        /sbin/service dhcpd start
-        /sbin/service xinetd start
-        /sbin/chkconfig tftp on
-
-4. Setup default boot menu
-
-        mkdir /tftpboot/pxelinux.cfg
-        touch /tftpboot/pxelinux.cfg/default
-
-5. Edit the menu `vi /tftpboot/pxelinux.cfg/default`
-
-        default menu.c32
-        prompt 0
-        timeout 15
-        ONTIMEOUT local
-        display boot.msg
-
-        MENU TITLE Main Menu
-
-        LABEL local
-                MENU LABEL Boot local hard drive
-                LOCALBOOT 0
-
-Now you should have a working PXELINUX setup to image CoreOS nodes. You can verify the services by using VirtualBox locally or with bare metal servers.
-
-## Adding CoreOS to PXE
-
-This section describes how to setup the CoreOS images to live alongside a pre-existing PXELINUX environment.
-1. Find or create the TFTP root directory that everything will be based on.
-   - For this document we will assume `/tftpboot/` is our root directory.       
-2. Once we know and have our tftp root directory we will create a new directory structure for our CoreOS images.     
-3. Download the CoreOS PXE files provided by the CoreOS team.
-
-        MY_TFTPROOT_DIR=/tftpboot
-        mkdir -p $MY_TFTPROOT_DIR/images/coreos/
-        cd $MY_TFTPROOT_DIR/images/coreos/
-        wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe.vmlinuz
-        wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe.vmlinuz.sig
-        wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe_image.cpio.gz
-        wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe_image.cpio.gz.sig
-        gpg --verify coreos_production_pxe.vmlinuz.sig
-        gpg --verify coreos_production_pxe_image.cpio.gz.sig
-
-4. Edit the menu `vi /tftpboot/pxelinux.cfg/default` again
-
-        default menu.c32
-        prompt 0
-        timeout 300
-        ONTIMEOUT local
-        display boot.msg
-
-        MENU TITLE Main Menu
-
-        LABEL local
-                MENU LABEL Boot local hard drive
-                LOCALBOOT 0
-
-        MENU BEGIN CoreOS Menu
-
-            LABEL coreos-master
-                MENU LABEL CoreOS Master
-                KERNEL images/coreos/coreos_production_pxe.vmlinuz
-                APPEND initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<xxx.xxx.xxx.xxx>/pxe-cloud-config-single-master.yml
-
-            LABEL coreos-slave
-                MENU LABEL CoreOS Slave
-                KERNEL images/coreos/coreos_production_pxe.vmlinuz
-                APPEND initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<xxx.xxx.xxx.xxx>/pxe-cloud-config-slave.yml
-        MENU END
-
-This configuration file will now boot from local drive but have the option to PXE image CoreOS.
-
-## DHCP configuration
-
-This section covers configuring the DHCP server to hand out our new images. In this case we are assuming that there are other servers that will boot alongside other images.
-1. Add the `filename` to the _host_ or _subnet_ sections.
-
-        filename "/tftpboot/pxelinux.0";
-
-2. At this point we want to make pxelinux configuration files that will be the templates for the different CoreOS deployments.
-
-        subnet 10.20.30.0 netmask 255.255.255.0 {
-                next-server 10.20.30.242;
-                option broadcast-address 10.20.30.255;
-                filename "<other default image>";
-
-                ...
-                # http://www.syslinux.org/wiki/index.php/PXELINUX
-                host core_os_master {
-                        hardware ethernet d0:00:67:13:0d:00;
-                        option routers 10.20.30.1;
-                        fixed-address 10.20.30.40;
-                        option domain-name-servers 10.20.30.242;
-                        filename "/pxelinux.0";
-                }
-                host core_os_slave {
-                        hardware ethernet d0:00:67:13:0d:01;
-                        option routers 10.20.30.1;
-                        fixed-address 10.20.30.41;
-                        option domain-name-servers 10.20.30.242;
-                        filename "/pxelinux.0";
-                }
-                host core_os_slave2 {
-                        hardware ethernet d0:00:67:13:0d:02;
-                        option routers 10.20.30.1;
-                        fixed-address 10.20.30.42;
-                        option domain-name-servers 10.20.30.242;
-                        filename "/pxelinux.0";
-                }
-                ...
-        }
-
-We will be specifying the node configuration later in the guide.
-
-## Kubernetes
-
-To deploy our configuration we need to create an `etcd` master. To do so we want to pxe CoreOS with a specific cloud-config.yml. There are two options we have here.
-1. Is to template the cloud config file and programmatically create new static configs for different cluster setups.
-2. Have a service discovery protocol running in our stack to do auto discovery.
-
-This demo we just make a static single `etcd` server to host our Kubernetes and `etcd` master servers.
-
-Since we are OFFLINE here most of the helping processes in CoreOS and Kubernetes are then limited. To do our setup we will then have to download and serve up our binaries for Kubernetes in our local environment.
-
-An easy solution is to host a small web server on the DHCP/TFTP host for all our binaries to make them available to the local CoreOS PXE machines.
-
-To get this up and running we are going to setup a simple `apache` server to serve our binaries needed to bootstrap Kubernetes.
-
-This is on the PXE server from the previous section:
-
-```shell
-rm /etc/httpd/conf.d/welcome.conf
-cd /var/www/html/
-wget -O kube-register  https://github.com/kelseyhightower/kube-register/releases/download/v0.0.2/kube-register-0.0.2-linux-amd64
-wget -O setup-network-environment https://github.com/kelseyhightower/setup-network-environment/releases/download/v1.0.0/setup-network-environment
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubernetes
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-apiserver
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-controller-manager
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-scheduler
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubectl
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubecfg
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kubelet
-wget https://storage.googleapis.com/kubernetes-release/release/v0.15.0/bin/linux/amd64/kube-proxy
-wget -O flanneld https://storage.googleapis.com/k8s/flanneld
-```
-
-This sets up our binaries we need to run Kubernetes. This would need to be enhanced to download from the Internet for updates in the future.
-
-Now for the good stuff!
-
-## Cloud Configs
-
-The following config files are tailored for the OFFLINE version of a Kubernetes deployment.
-
-These are based on the work found here: [master.yml](/docs/getting-started-guides/coreos/cloud-configs/master.yaml), [node.yml](/docs/getting-started-guides/coreos/cloud-configs/node.yaml)
-
-To make the setup work, you need to replace a few placeholders:
-
- - Replace `<PXE_SERVER_IP>` with your PXE server ip address (e.g. 10.20.30.242)
- - Replace `<MASTER_SERVER_IP>` with the Kubernetes master ip address (e.g. 10.20.30.40)
- - If you run a private docker registry, replace `rdocker.example.com` with your docker registry dns name.
- - If you use a proxy, replace `rproxy.example.com` with your proxy server (and port)
- - Add your own SSH public key(s) to the cloud config at the end
-
-### master.yml
-
-On the PXE server make and fill in the variables `vi /var/www/html/coreos/pxe-cloud-config-master.yml`.
-
-```yaml
-#cloud-config
----
-write_files:
-  - path: /opt/bin/waiter.sh
-    owner: root
-    content: |
-      #! /usr/bin/bash
-      until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
-  - path: /opt/bin/kubernetes-download.sh
-    owner: root
-    permissions: 0755
-    content: |
-      #! /usr/bin/bash
-      /usr/bin/wget -N -P "/opt/bin" "http://<PXE_SERVER_IP>/kubectl"
-      /usr/bin/wget -N -P "/opt/bin" "http://<PXE_SERVER_IP>/kubernetes"
-      /usr/bin/wget -N -P "/opt/bin" "http://<PXE_SERVER_IP>/kubecfg"
-      chmod +x /opt/bin/*
-  - path: /etc/profile.d/opt-path.sh
-    owner: root
-    permissions: 0755
-    content: |
-      #! /usr/bin/bash
-      PATH=$PATH/opt/bin
-coreos:
-  units:
-    - name: 10-eno1.network
-      runtime: true
-      content: |
-        [Match]
-        Name=eno1
-        [Network]
-        DHCP=yes
-    - name: 20-nodhcp.network
-      runtime: true
-      content: |
-        [Match]
-        Name=en*
-        [Network]
-        DHCP=none
-    - name: get-kube-tools.service
-      runtime: true
-      command: start
-      content: |
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStart=/opt/bin/kubernetes-download.sh
-        RemainAfterExit=yes
-        Type=oneshot
-    - name: setup-network-environment.service
-      command: start
-      content: |
-        [Unit]
-        Description=Setup Network Environment
-        Documentation=https://github.com/kelseyhightower/setup-network-environment
-        Requires=network-online.target
-        After=network-online.target
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/setup-network-environment
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment
-        ExecStart=/opt/bin/setup-network-environment
-        RemainAfterExit=yes
-        Type=oneshot
-    - name: etcd.service
-      command: start
-      content: |
-        [Unit]
-        Description=etcd
-        Requires=setup-network-environment.service
-        After=setup-network-environment.service
-        [Service]
-        EnvironmentFile=/etc/network-environment
-        User=etcd
-        PermissionsStartOnly=true
-        ExecStart=/usr/bin/etcd \
-        --name ${DEFAULT_IPV4} \
-        --addr ${DEFAULT_IPV4}:4001 \
-        --bind-addr 0.0.0.0 \
-        --cluster-active-size 1 \
-        --data-dir /var/lib/etcd \
-        --http-read-timeout 86400 \
-        --peer-addr ${DEFAULT_IPV4}:7001 \
-        --snapshot true
-        Restart=always
-        RestartSec=10s
-    - name: fleet.socket
-      command: start
-      content: |
-        [Socket]
-        ListenStream=/var/run/fleet.sock
-    - name: fleet.service
-      command: start
-      content: |
-        [Unit]
-        Description=fleet daemon
-        Wants=etcd.service
-        After=etcd.service
-        Wants=fleet.socket
-        After=fleet.socket
-        [Service]
-        Environment="FLEET_ETCD_SERVERS=http://127.0.0.1:4001"
-        Environment="FLEET_METADATA=role=master"
-        ExecStart=/usr/bin/fleetd
-        Restart=always
-        RestartSec=10s
-    - name: etcd-waiter.service
-      command: start
-      content: |
-        [Unit]
-        Description=etcd waiter
-        Wants=network-online.target
-        Wants=etcd.service
-        After=etcd.service
-        After=network-online.target
-        Before=flannel.service
-        Before=setup-network-environment.service
-        [Service]
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh
-        ExecStart=/usr/bin/bash /opt/bin/waiter.sh
-        RemainAfterExit=true
-        Type=oneshot
-    - name: flannel.service
-      command: start
-      content: |
-        [Unit]
-        Wants=etcd-waiter.service
-        After=etcd-waiter.service
-        Requires=etcd.service
-        After=etcd.service
-        After=network-online.target
-        Wants=network-online.target
-        Description=flannel is an etcd backed overlay network for containers
-        [Service]
-        Type=notify
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/flanneld
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
-        ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.100.0.0/16", "Backend": {"Type": "vxlan"}}'
-        ExecStart=/opt/bin/flanneld
-    - name: kube-apiserver.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes API Server
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=etcd.service
-        After=etcd.service
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-apiserver
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
-        ExecStart=/opt/bin/kube-apiserver \
-        --address=0.0.0.0 \
-        --port=8080 \
-        --service-cluster-ip-range=10.100.0.0/16 \
-        --etcd-servers=http://127.0.0.1:4001 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-    - name: kube-controller-manager.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Controller Manager
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=kube-apiserver.service
-        After=kube-apiserver.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-controller-manager
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager
-        ExecStart=/opt/bin/kube-controller-manager \
-        --master=127.0.0.1:8080 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-    - name: kube-scheduler.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Scheduler
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=kube-apiserver.service
-        After=kube-apiserver.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-scheduler
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler
-        ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080
-        Restart=always
-        RestartSec=10
-    - name: kube-register.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Registration Service
-        Documentation=https://github.com/kelseyhightower/kube-register
-        Requires=kube-apiserver.service
-        After=kube-apiserver.service
-        Requires=fleet.service
-        After=fleet.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-register
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register
-        ExecStart=/opt/bin/kube-register \
-        --metadata=role=node \
-        --fleet-endpoint=unix:///var/run/fleet.sock \
-        --healthz-port=10248 \
-        --api-endpoint=http://127.0.0.1:8080
-        Restart=always
-        RestartSec=10
-  update:
-    group: stable
-    reboot-strategy: off
-ssh_authorized_keys:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAAD...
-```
-
-### node.yml
-
-On the PXE server make and fill in the variables `vi /var/www/html/coreos/pxe-cloud-config-slave.yml`.
-
-```yaml
-#cloud-config
----
-write_files:
-  - path: /etc/default/docker
-    content: |
-      DOCKER_EXTRA_OPTS='--insecure-registry="rdocker.example.com:5000"'
-coreos:
-  units:
-    - name: 10-eno1.network
-      runtime: true
-      content: |
-        [Match]
-        Name=eno1
-        [Network]
-        DHCP=yes
-    - name: 20-nodhcp.network
-      runtime: true
-      content: |
-        [Match]
-        Name=en*
-        [Network]
-        DHCP=none
-    - name: etcd.service
-      mask: true
-    - name: docker.service
-      drop-ins:
-        - name: 50-insecure-registry.conf
-          content: |
-            [Service]
-            Environment="HTTP_PROXY=http://rproxy.example.com:3128/" "NO_PROXY=localhost,127.0.0.0/8,rdocker.example.com"
-    - name: fleet.service
-      command: start
-      content: |
-        [Unit]
-        Description=fleet daemon
-        Wants=fleet.socket
-        After=fleet.socket
-        [Service]
-        Environment="FLEET_ETCD_SERVERS=http://<MASTER_SERVER_IP>:4001"
-        Environment="FLEET_METADATA=role=node"
-        ExecStart=/usr/bin/fleetd
-        Restart=always
-        RestartSec=10s
-    - name: flannel.service
-      command: start
-      content: |
-        [Unit]
-        After=network-online.target
-        Wants=network-online.target
-        Description=flannel is an etcd backed overlay network for containers
-        [Service]
-        Type=notify
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/flanneld
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
-        ExecStart=/opt/bin/flanneld -etcd-endpoints http://<MASTER_SERVER_IP>:4001
-    - name: docker.service
-      command: start
-      content: |
-        [Unit]
-        After=flannel.service
-        Wants=flannel.service
-        Description=Docker Application Container Engine
-        Documentation=http://docs.docker.io
-        [Service]
-        EnvironmentFile=-/etc/default/docker
-        EnvironmentFile=/run/flannel/subnet.env
-        ExecStartPre=/bin/mount --make-rprivate /
-        ExecStart=/usr/bin/docker -d --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU} -s=overlay -H fd:// ${DOCKER_EXTRA_OPTS}
-        [Install]
-        WantedBy=multi-user.target
-    - name: setup-network-environment.service
-      command: start
-      content: |
-        [Unit]
-        Description=Setup Network Environment
-        Documentation=https://github.com/kelseyhightower/setup-network-environment
-        Requires=network-online.target
-        After=network-online.target
-        [Service]
-        ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/setup-network-environment
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment
-        ExecStart=/opt/bin/setup-network-environment
-        RemainAfterExit=yes
-        Type=oneshot
-    - name: kube-proxy.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Proxy
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=setup-network-environment.service
-        After=setup-network-environment.service
-        [Service]
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kube-proxy
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
-        ExecStart=/opt/bin/kube-proxy \
-        --etcd-servers=http://<MASTER_SERVER_IP>:4001 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-    - name: kube-kubelet.service
-      command: start
-      content: |
-        [Unit]
-        Description=Kubernetes Kubelet
-        Documentation=https://github.com/kubernetes/kubernetes
-        Requires=setup-network-environment.service
-        After=setup-network-environment.service
-        [Service]
-        EnvironmentFile=/etc/network-environment
-        ExecStartPre=/usr/bin/wget -N -P /opt/bin http://<PXE_SERVER_IP>/kubelet
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet
-        ExecStart=/opt/bin/kubelet \
-        --address=0.0.0.0 \
-        --port=10250 \
-        --hostname-override=${DEFAULT_IPV4} \
-        --api-servers=<MASTER_SERVER_IP>:8080 \
-        --healthz-bind-address=0.0.0.0 \
-        --healthz-port=10248 \
-        --logtostderr=true
-        Restart=always
-        RestartSec=10
-  update:
-    group: stable
-    reboot-strategy: off
-ssh_authorized_keys:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAAD...
-```
-
-## New pxelinux.cfg file
-
-Create a pxelinux target file for a _slave_ node: `vi /tftpboot/pxelinux.cfg/coreos-node-slave`
-
-```conf
-default coreos
-prompt 1
-timeout 15
-
-display boot.msg
-
-label coreos
-    menu default
-    kernel images/coreos/coreos_production_pxe.vmlinuz
-    append initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<pxe-host-ip>/coreos/pxe-cloud-config-slave.yml console=tty0 console=ttyS0 coreos.autologin=tty1 coreos.autologin=ttyS0
-```
-
-And one for the _master_ node: `vi /tftpboot/pxelinux.cfg/coreos-node-master`
-
-```conf
-default coreos
-prompt 1
-timeout 15
-
-display boot.msg
-
-label coreos
-    menu default
-    kernel images/coreos/coreos_production_pxe.vmlinuz
-    append initrd=images/coreos/coreos_production_pxe_image.cpio.gz cloud-config-url=http://<pxe-host-ip>/coreos/pxe-cloud-config-master.yml console=tty0 console=ttyS0 coreos.autologin=tty1 coreos.autologin=ttyS0
-```
-
-## Specify the pxelinux targets
-
-Now that we have our new targets setup for master and slave we want to configure the specific hosts to those targets. We will do this by using the pxelinux mechanism of setting a specific MAC addresses to a specific pxelinux.cfg file.
-
-Refer to the MAC address table in the beginning of this guide. Documentation for more details can be found [here](http://www.syslinux.org/wiki/index.php/PXELINUX).
-
-```shell
-cd /tftpboot/pxelinux.cfg
-ln -s coreos-node-master 01-d0-00-67-13-0d-00
-ln -s coreos-node-slave 01-d0-00-67-13-0d-01
-ln -s coreos-node-slave 01-d0-00-67-13-0d-02
-```
-
-Reboot these servers to get the images PXEd and ready for running containers!
-
-## Creating test pod
-
-Now that the CoreOS with Kubernetes installed is up and running lets spin up some Kubernetes pods to demonstrate the system.
-
-See [a simple nginx example](/docs/user-guide/simple-nginx/) to try out your new cluster.
-
-For more complete applications, please look in the [examples directory](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/).
-
-## Helping commands for debugging
-
-List all keys in etcd:
-
-```shell
-etcdctl ls --recursive
-```
-
-List fleet machines
-
-```shell
-fleetctl list-machines
-```
-
-Check system status of services on master:
-
-```shell
-systemctl status kube-apiserver
-systemctl status kube-controller-manager
-systemctl status kube-scheduler
-systemctl status kube-register
-```
-
-Check system status of services on a node:
-
-```shell
-systemctl status kube-kubelet
-systemctl status docker.service
-```
-
-List Kubernetes
-
-```shell
-kubectl get pods
-kubectl get nodes
-```
-
-Kill all pods:
-
-```shell
-for i in `kubectl get pods | awk '{print $1}'`; do kubectl delete pod $i; done
-```
-
-## Support Level
-
-
-IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
--------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline/)              |          | Community ([@jeffbean](https://github.com/jeffbean))
-
-For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions/) chart.
diff --git a/docs/getting-started-guides/ubuntu/monitoring.md b/docs/getting-started-guides/ubuntu/monitoring.md
index 2bd5de0301..d6cfdbaf33 100644
--- a/docs/getting-started-guides/ubuntu/monitoring.md
+++ b/docs/getting-started-guides/ubuntu/monitoring.md
@@ -102,7 +102,7 @@ Follow the above instructions on connect topbeat and filebeat to the application
 
 ## Connecting Nagios
 
-Nagios utilizes the Nagions Remote Execution Protocol (NRPE) as an agent on each node to derive machine level details of the health and applications.
+Nagios utilizes the Nagios Remote Plugin Executor protocol (NRPE protocol) as an agent on each node to derive machine level details of the health and applications.
 
 ### New install of Nagios
 
diff --git a/docs/reference/kubectl/conventions.md b/docs/reference/kubectl/conventions.md
index 91856a73cb..a2ff5772fa 100644
--- a/docs/reference/kubectl/conventions.md
+++ b/docs/reference/kubectl/conventions.md
@@ -10,40 +10,38 @@ title: kubectl Usage Conventions
 
 ## Using `kubectl` in Reusable Scripts
 
-If you need stable output in a script, you should:
+For a stable output in a script:
 
 * Request one of the machine-oriented output forms, such as `-o name`, `-o json`, `-o yaml`, `-o go-template`, or `-o jsonpath`
-* Specify `--output-version`, since those output forms (other than `-o name`) output the resource using a particular API version
-* Specify `--generator` to pin to a specific behavior forever, if using generator-based commands (such as `kubectl run` or `kubectl expose`)
-* Don't rely on context, preferences, or other implicit state
+* Specify `--output-version`, because the output forms use a particular API version to output the resource with the exception of `-o name` output form
+* Specify `--generator` to pin to a specific behavior forever when you use generator-based commands such as `kubectl run` or `kubectl expose`
+* Don't rely on context, preferences, or other implicit states.
 
 ## Best Practices
 
 ### `kubectl run`
 
-In order for `kubectl run` to satisfy infrastructure as code:
+For `kubectl run` to satisfy infrastructure as code:
 
-* Always tag your image with a version-specific tag and don't move that tag to a new version. For example, use `:v1234`, `v1.2.3`, `r03062016-1-4`, rather than `:latest` (see [Best Practices for Configuration](/docs/concepts/configuration/overview/#container-images) for more information).
-* If the image is lightly parameterized, capture the parameters in a checked-in script, or at least use `--record` to annotate the created objects with the command line.
-* If the image is heavily parameterized, definitely check in the script.
-* If features are needed that are not expressible via `kubectl run` flags, switch to configuration files checked into source control.
+* Tag the image with a version-specific tag and don't move that tag to a new version. For example, use `:v1234`, `v1.2.3`, `r03062016-1-4`, rather than `:latest` (For more information, see [Best Practices for Configuration](/docs/concepts/configuration/overview/#container-images)).
+* Capture the parameters in a checked-in script, or at least use `--record` to annotate the created objects with the command line for an image that is lightly parameterized.
+* Check in the script for an image that is heavily parameterized.
+* Switch to configuration files checked into source control for features that are needed, but not expressible via `kubectl run` flags.
 * Pin to a specific [generator](#generators) version, such as `kubectl run --generator=deployment/v1beta1`.
 
 #### Generators
 
-`kubectl run` allows you to generate the following resources (using `--generator` flag):
+You can generate the following resources in `kubectl run`using `--generator` flag:
 
 * Pod - use `run-pod/v1`.
 * Replication controller - use `run/v1`.
-* Deployment, using `extensions/v1beta1` endpoint - use `deployment/v1beta1` (default).
-* Deployment, using `apps/v1beta1` endpoint - use `deployment/apps.v1beta1` (recommended).
+* Deployment - use `extensions/v1beta1` and for an endpoint - use `deployment/v1beta1` (default).
+* Deployment - use `apps/v1beta1` and for an endpoint - use `deployment/apps.v1beta1` (recommended).
 * Job - use `job/v1`.
-* CronJob - using `batch/v1beta1` endpoint - use `cronjob/v1beta1`(default).
-* CronJob - using `batch/v2alpha1` endpoint - use `cronjob/v2alpha1` (deprecated).
+* CronJob - use `batch/v1beta1`and for an endpoint - use `cronjob/v1beta1`(default).
+* CronJob - use`batch/v2alpha1` and for an endpoint - use `cronjob/v2alpha1` (deprecated).
 
-Additionally, if you didn't specify a generator flag, other flags will suggest using
-a specific generator.  Below table shows which flags force using specific generators,
-depending on your cluster version:
+If you do not specify a generator flag, other flags prompt you to use a specific generator. The following table lists the flags that force you to use specific generators, depending on the version of the cluster:
 
 |   Generated Resource   | Cluster v1.4 and later | Cluster v1.3          | Cluster v1.2                               | Cluster v1.1 and earlier                   |
 |:----------------------:|------------------------|-----------------------|--------------------------------------------|--------------------------------------------|
@@ -53,21 +51,19 @@ depending on your cluster version:
 | Job                    | `--restart=OnFailure`  | `--restart=OnFailure` | `--restart=OnFailure` OR `--restart=Never` | N/A                                        |
 | Cron Job               | `--schedule=<cron>`    | N/A                   | N/A                                        | N/A                                        |
 
-Note that these flags will use a default generator only when you have not specified
-any flag.  This also means that combining `--generator` with other flags won't
-change the generator you specified. For example, in a 1.4 cluster, if you specify
-`--restart=Always`, a Deployment will be created; if you specify `--restart=Always`
-and `--generator=run/v1`, a Replication Controller will be created instead.
-This becomes handy if you want to pin to a specific behavior with the generator,
-even when the defaulted generator is changed in the future.
+**Note:** These flags use a default generator only when you have not specified
+any flag.  This means that when you combine `--generator` with other flags the generator that you specified later does not change. For example, in a cluster v1.4, if you initially specify
+`--restart=Always`, a Deployment is created; if you later specify `--restart=Always`
+and `--generator=run/v1`, a Replication Controller is created.
+This enables you to pin to a specific behavior with the generator,
+even when the default generator is changed later.
 
-Finally, the order in which flags set the generator is: schedule flag has the highest
-priority, then restart policy and finally the generator itself.
+The flags set the generator in the following order: first the schedule flag then restart policy and finally the generator.
 
-If in doubt about the final resource being created, you can always use `--dry-run`
-flag, which will provide the object to be submitted to the cluster.
+To check the final resource that was created, use `--dry-run`
+flag, which provides the object to be submitted to the cluster.
 
 
 ### `kubectl apply`
 
-* To use `kubectl apply` to update resources, always create resources initially with `kubectl apply` or with `--save-config`. See [managing resources with kubectl apply](/docs/concepts/cluster-administration/manage-deployment/#kubectl-apply) for the reason behind it.
+* When you use `kubectl apply` to update resources, always create resources initially using `kubectl apply` or using `--save-config`. See [managing resources with kubectl apply](/docs/concepts/cluster-administration/manage-deployment/#kubectl-apply) for more information.
diff --git a/docs/setup/pick-right-solution.md b/docs/setup/pick-right-solution.md
index 61f23d1d15..122df965e0 100644
--- a/docs/setup/pick-right-solution.md
+++ b/docs/setup/pick-right-solution.md
@@ -125,7 +125,6 @@ These solutions are combinations of cloud providers and operating systems not co
 
 ## Bare Metal
 
-* [Offline](/docs/getting-started-guides/coreos/bare_metal_offline/) (no internet required.  Uses CoreOS and Flannel)
 * [Fedora (Single Node)](/docs/getting-started-guides/fedora/fedora_manual_config/)
 * [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)
 * [Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/)
@@ -164,7 +163,6 @@ DCOS                 | Marathon   | CoreOS/Alpine | custom | [docs](/docs/gettin
 AWS                  | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/aws/)                                 |  Community
 GCE                  | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/)                                 |  Community ([@pires](https://github.com/pires))
 Vagrant              | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/)                                 |  Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles))
-Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline/)              |  Community ([@jeffbean](https://github.com/jeffbean))
 CloudStack           | Ansible      | CoreOS | flannel     | [docs](/docs/getting-started-guides/cloudstack/)                             |  Community ([@sebgoa](https://github.com/sebgoa))
 VMware vSphere       | any          | multi-support | multi-support     | [docs](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/)  |  [Community](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/contactus.html)
 Bare-metal           | custom       | CentOS | flannel      | [docs](/docs/getting-started-guides/centos/centos_manual_config/)            |  Community ([@coolsvap](https://github.com/coolsvap))
diff --git a/docs/tasks/administer-cluster/configure-upgrade-etcd.md b/docs/tasks/administer-cluster/configure-upgrade-etcd.md
index 0fb6ab3417..41327c57ce 100644
--- a/docs/tasks/administer-cluster/configure-upgrade-etcd.md
+++ b/docs/tasks/administer-cluster/configure-upgrade-etcd.md
@@ -40,7 +40,7 @@ Use a single-node etcd cluster only for testing purpose.
 
 1. Run the following:
 
-        ./etcd --client-listen-urls=http://$PRIVATE_IP:2379 --client-advertise-urls=http://$PRIVATE_IP:2379
+        ./etcd --listen-client-urls=http://$PRIVATE_IP:2379 --advertise-client-urls=http://$PRIVATE_IP:2379
 
 2. Start Kubernetes API server with the flag `--etcd-servers=$PRIVATE_IP:2379`.
 
@@ -56,7 +56,7 @@ For an example, consider a five-member etcd cluster running with the following c
 
 1. Run the following:
 
-       ./etcd --client-listen-urls=http://$IP1:2379, http://$IP2:2379, http://$IP3:2379, http://$IP4:2379, http://$IP5:2379 --client-advertise-urls=http://$IP1:2379, http://$IP2:2379, http://$IP3:2379, http://$IP4:2379, http://$IP5:2379
+       ./etcd --listen-client-urls=http://$IP1:2379, http://$IP2:2379, http://$IP3:2379, http://$IP4:2379, http://$IP5:2379 --advertise-client-urls=http://$IP1:2379, http://$IP2:2379, http://$IP3:2379, http://$IP4:2379, http://$IP5:2379
 
 
 2. Start Kubernetes API servers with the flag `--etcd-servers=$IP1:2379, $IP2:2379, $IP3:2379, $IP4:2379, $IP5:2379`.
diff --git a/images/case_studies/amadeus_feature.png b/images/case_studies/amadeus_feature.png
new file mode 100644
index 0000000000..d23d7b0163
Binary files /dev/null and b/images/case_studies/amadeus_feature.png differ