Merge branch 'master' into config-doc-descriptions

docs/services/proxy/.gitignore

@@ -0,0 +1 @@
+grpc.md

docs/services/proxy/_index.md

@@ -0,0 +1,16 @@
+---
+title: Proxy
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/services/proxy
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+This service provides a proxy service that routes requests to the correct extensions.
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/services/proxy/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/services/proxy
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="services/_includes/proxy-config-example.yaml"  language="yaml" >}}
+
+{{< include file="services/_includes/proxy_configvars.md" >}}