more merges from rancher docs repo

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

docs/os/amazon-ecs/index.md

@@ -28,6 +28,9 @@ For the **User Data**, you'll need to pass in the [cloud-config]({{site.baseurl}
 rancher:
   environment:
     ECS_CLUSTER: your-ecs-cluster-name
+    # Note: You will need to add this variable, if using awslogs for ECS task.
+    ECS_AVAILABLE_LOGGING_DRIVERS: |-
+      ["json-file","awslogs"]
 # If you have selected a RancherOS AMI that does not have ECS enabled by default,
 # you'll need to enable the system service for the ECS agent.
   services_include:

docs/os/configuration/docker/index.md

@@ -5,6 +5,7 @@ layout: os-default
 ---
 
 ## Configuring Docker or System Docker
+---
 
 In RancherOS, you can configure System Docker and Docker daemons by using [cloud-config]({{site.baseurl}}/os/configuration/#cloud-config).
 

docs/os/configuration/kernel-modules-kernel-headers/index.md

@@ -5,6 +5,7 @@ layout: os-default
 ---
 
 ## Installing Kernel Modules that require Kernel Headers
+---
 
 
 To compile any kernel modules, you will need to download the kernel headers. The kernel headers are available in the form of a system service. Since the kernel headers are a system service, they need to be enabled using the `ros service` command.

docs/os/configuration/switching-docker-versions/index.md

@@ -76,3 +76,25 @@ If you don't want to automatically switch Docker engines, you can also set which
 ```
 $ sudo ros engine enable docker-1.10.3
 ```
+
+## Using a Custom Version of Docker
+
+If you're using a version of Docker that isn't available by default or a custom build of Docker then you can create a custom Docker image and service file to distribute it.
+
+Docker engine images are built by adding the binaries to a folder named `engine` and then adding this folder to a `FROM scratch` image. For example, the following Dockerfile will build a Docker engine image.
+
+```
+FROM scratch
+COPY engine /engine
+```
+
+Once the image is built a [system service]({{site.baseurl}}/os/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.3.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
+
+All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.
+
+```yaml
+#cloud-config
+rancher:
+  docker:
+    engine: https://myservicefile
+```

docs/os/networking/interfaces/index.md

@@ -6,6 +6,7 @@ redirect_from:
 ---
 
 ## Interfaces
+---
 
 Using `ros config`, you can configure specific interfaces. Wildcard globbing is supported so `eth*` will match `eth1` and `eth2`.  The available options you can configure are `address`, `gateway`, `mtu`, and `dhcp`.
 
@@ -94,3 +95,19 @@ rancher:
       eth0:
         vlans: 100,200:foobar
 ```
+
+### Bridging
+
+In this example, you can create a bridge interface.
+
+```
+#cloud-config
+rancher:
+  network:
+    interfaces:
+      br0:
+        bridge: true
+        dhcp: true
+      eth0:
+        bridge: br0
+```

docs/os/running-rancheros/server/raspberry-pi/index.md

@@ -12,6 +12,8 @@ When installing, there is no ability to pass in a [cloud-config]({{site.baseurl}
 
 Currently, only Raspberry Pi 2 and 3 are tested and known to work.
 
+> **Note:** It is not necessary to run `ros install` after installing RancherOS to an SD card.
+
 ### Using the entire SD Card
 
 RancherOS does not currently expand the root partition to fill the remainder of the SD card automatically. Instead, the following workaround can be used to store Docker containers on a larger partition that fills the remainder.

docs/os/storage/state-partition/index.md

@@ -4,6 +4,7 @@ layout: os-default
 ---
 
 ## Persistent State Partition
+---
 
 RancherOS will store its state in a single partition specified by the `dev` field.  The field can be a device such as `/dev/sda1` or a logical name such `LABEL=state` or `UUID=123124`.  The default value is `LABEL=RANCHER_STATE`.  The file system type of that partition can be set to `auto` or a specific file system type such as `ext4`.
 

docs/os/storage/using-zfs/index.md

@@ -6,6 +6,7 @@ redirect_from:
 ---
 
 ## Using ZFS
+---
 
 #### Installing the ZFS service
 

docs/os/system-services/adding-system-services/index.md

@@ -7,6 +7,7 @@ redirect_from:
 ---
 
 ## System Services
+---
 
 A system service is a container that can be run in either System Docker or Docker. Rancher provides services that are already available in RancherOS by adding them to the [os-services repo](https://github.com/rancher/os-services). Anything in the `index.yml` file from the repository for the tagged release will be an available system service when using the `ros service list` command.
 

docs/os/upgrading/index.md

@@ -13,6 +13,9 @@ Since RancherOS is a kernel and initrd, the upgrade process is downloading a new
 
 To see all of our releases, please visit our [releases page](https://github.com/rancher/os/releases) in GitHub.
 
+> **Note:** If you are using [`docker-machine`]({{site.baseurl}}/os/running-rancheros/workstation/docker-machine/) then you will not be able to upgrade your RancherOS version. You need to delete and re-create the machine.
+
+
 ### Version Control
 
 First, let's check what version you have running on your system.