Minor content re-org, edits

Gemfile.lock

@@ -17,6 +17,7 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
+    ffi (1.9.14-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (2.1.0)
     html-pipeline (2.4.2)
@@ -74,6 +75,9 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-x64-mingw32)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
     pathutil (0.14.0)
@@ -94,6 +98,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   activesupport (= 4.2.7)

docs/admin/addons.md

@@ -12,8 +12,7 @@ This page lists some of the available add-ons and links to their respective inst
 * [Weave Net](https://github.com/weaveworks/weave-kube) provides networking and network policy, will carry on working on both sides of a network partition, and does not require an external database.
 * [Calico](https://github.com/projectcalico/calico-containers/tree/master/docs/cni/kubernetes/manifests/kubeadm) is a secure L3 networking and network policy provider.
 * [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm) unites Flannel and Calico, providing networking and network policy.
-* [Romana](romana.io) is a Layer 3 networking solution for network policy. Kubeadmin add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize) 
+* [Romana](http://romana.io) is a Layer 3 networking solution for network policy. Kubeadmin add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize).
-
 
 ## Visualization & Control
 

docs/admin/networking.md

@@ -1,4 +1,4 @@
----
+---
 assignees:
 - lavalamp
 - thockin
@@ -191,7 +191,7 @@ Calico can also be run in policy enforcement mode in conjunction with other netw
 
 ### Romana
 
-[Romana](http://romana.io) is an open source software defined networking (SDN) solution that lets you deploy Kubernetes without an overlay network. 
+[Romana](http://romana.io) is an open source network and security automation solution that lets you deploy Kubernetes without an overlay network. Romana supports Kubernetes [Network Policy](/docs/user-guide/networkpolicies/) to provide isolation across network namespaces.
 
 ### Contiv
 

docs/getting-started-guides/kubeadm.md

@@ -158,15 +158,14 @@ Before you can deploy applications to it, you need to install a pod network.
 You must install a pod network add-on so that your pods can communicate with each other when they are on different hosts.
 **It is necessary to do this before you try to deploy any applications to your cluster.**
 
-Several projects provide Kubernetes pod networks.
+Several projects are available that enable Kubernetes pod networks including Calico, Romana and Weave. Some may also support [Network Policy](/docs/user-guide/networkpolicies/). See the [add-ons page](/docs/admin/addons/) for a complete list of available network add-ons.
-You can see a complete list of available network add-ons on the [add-ons page](/docs/admin/addons/).
 
 By way of example, you can install [Weave Net](https://github.com/weaveworks/weave-kube) by logging in to the master and running:
 
     # kubectl apply -f https://git.io/weave-kube
     daemonset "weave-net" created
 
-If you prefer [Calico](https://github.com/projectcalico/calico-containers/tree/master/docs/cni/kubernetes/manifests/kubeadm) or [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm), or [Romana](https://github.com/romana/romana/tree/master/containerize) please refer to their respective installation guides.
+If you prefer [Calico](https://github.com/projectcalico/calico-containers/tree/master/docs/cni/kubernetes/manifests/kubeadm) or [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm), or [Romana](/docs/getting-started-guides/network-policy/romana/) please refer to their respective installation guides.
 You should only install one pod network per cluster.
 
 Once a pod network has been installed, you can confirm that it is working by checking that the `kube-dns` pod is `Running` in the output of `kubectl get pods --all-namespaces`.

docs/getting-started-guides/network-policy/romana.md

@@ -4,6 +4,14 @@ assignees:
 
 ---
 
-Romana details
+# Installation with kubeadmin
+
+Begin by following the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/) and complete steps 1, 2, and 3.
+
+Once completed, follow the [containerized installation guide](https://github.com/romana/romana/tree/master/containerize) for kubeadmin.
+
+## Romana Network Policy Resources
+
+* [Overview of Romana Network Policy](https://github.com/romana/romana/wiki/Romana-policies)
+* [Example Policies](https://github.com/romana/core/tree/master/policy)
 
-More changes.

docs/getting-started-guides/network-policy/walkthrough.md

@@ -6,7 +6,14 @@ assignees:
 
 Kubernetes can be used to declare network policies which govern how Pods can communicate with each other.  This document helps you get started using the Kubernetes [NetworkPolicy API](/docs/user-guide/networkpolicies), and provides a demonstration thereof. 
 
-In this article we assume that a Kubernetes cluster has been created with network policy support.  There are a number of network providers which support NetworkPolicy (see the "Using X for NetworkPolicy" articles in this section).  The reference implementation is [Calico](/docs/getting-started-guides/network-policy/calico) running on GCE.
+In this article, we assume a network provider that supports the NetworkPolicy API has been installed. Network providers can be installed as add-ons using [kubeadmin](/docs/getting-started-guides/kubeadm/), or any other suitable cluster installer.
+
+There are a number of network providers which support NetworkPolicy including:
+
+* [Calico](/docs/getting-started-guides/network-policy/calico/)
+* [Romana](/docs/getting-started-guides/network-policy/romana/)
+
+The reference implementation is [Calico](/docs/getting-started-guides/network-policy/calico) running on GCE.
 
 The following example walkthrough will work on a Kubernetes cluster using any of the listed providers.
 

docs/getting-started-guides/scratch.md

@@ -85,6 +85,7 @@ to implement one of the above options:
     - [Flannel](https://github.com/coreos/flannel)
     - [Calico](http://https://github.com/projectcalico/calico-containers)
     - [Weave](http://weave.works/)
+    - [Romana](http://romana.io/)
     - [Open vSwitch (OVS)](http://openvswitch.org/)
     - [More found here](/docs/admin/networking#how-to-achieve-this)
   - You can also write your own.
@@ -129,14 +130,8 @@ Also, you need to pick a static IP for master node.
 
 #### Network Policy
 
-Kubernetes enables the definition of fine-grained network policy between Pods 
+Kubernetes enables the definition of fine-grained network policy between Pods using the [NetworkPolicy](/docs/user-guide/network-policy) resource.
-using the [NetworkPolicy](/docs/user-guide/networkpolicy) resource.
 
-Not all networking providers support the Kubernetes NetworkPolicy features.
-For clusters which choose to enable NetworkPolicy, the 
-[Calico policy controller addon](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/calico-policy-controller) 
-can enforce the NetworkPolicy API on top of native cloud-provider networking, 
-Flannel, or Calico networking.
 
 ### Cluster Naming