work on

docs/ocis/deployment/basic-remote-setup.md

@@ -9,50 +9,44 @@ geekdocFilePath: basic-remote-setup.md
 
 {{< toc >}}
 
-The default configuration or the oCIS binary and the `owncloud/ocis` docker image is assuming, that you access oCIS on `localhost`. This enables you to do quick testing and development without any configuration.
+The default configuration of the oCIS binary and the `owncloud/ocis` docker image assume, that you access oCIS on `localhost`. This enables you to do quick testing and development without any configuration.
 
-If you need to access oCIS on a VM, docker container or a remote machine via an other hostname than `localhost`, you need to configure this hostname in oCIS. The same also applies if you are not using hostnames, but an IP instead (eg. `127.0.0.1`).
+If you need to access oCIS running in a docker container, on a VM or a remote machine via an other hostname than `localhost`, you need to configure this hostname in oCIS. The same applies if you are not using hostnames but instead an IP (eg. `192.168.178.25`).
 
-### Start the oCIS fullstack server
+## Start the oCIS fullstack server from binary
 
-If you start the oCIS fullstack for the first time with `./bin/ocis server` it will generate a file `identifier-registration.yml` in the config folder relative to your current working directory. This file is used to configure the clients for the built-in Identity Provider.
+Upon first start of the oCIS fullstack server with `./bin/ocis server` it will generate a file `identifier-registration.yml` in the config folder in your current working directory. This file is used to configure the clients for the built-in identity provider.
 
-For the following examples you need to have the binary in your current working directory, it must be named 'ocis' and needs to be marked as executable.
+{{< hint warning >}}
+The `identifier-registration.yml` file will only be generated if does not exist. If you want to change certain environment variables like `OCIS_URL`, please delete this file first before doing so. Otherwise your changes will not be applied correctly and you will run into errors.
+{{< /hint >}}
+
+For the following examples you need to have the oCIS binary in your current working directory, we assume it is named `ocis` and it needs to be marked as executable. See [Getting Started]({{< ref "../getting-started/#binaries" >}}) for where to get the binary from.
 
-### Start the oCIS fullstack server
+### Using automatically generated certificates
+
+In order to run oCIS with automatically generated and self signed certificates please execute following command. You need to replace `your-host` with an IP or hostname you are in control of.
 
-In order to run oCIS with self generated certificates please execute following command:
 ```bash
-OCIS_LOG_LEVEL=WARN
-KONNECTD_LOG_LEVEL=DEBUG
 PROXY_HTTP_ADDR=0.0.0.0:9200 \
-OCIS_URL=https://ocis.owncloud.test:9200 \
+OCIS_URL=https://your-host:9200 \
 ./ocis server
 ```
 
-When you have your own certificates in place, you also may running following command:
+### Using already present certificates
+
+If you have your own certificates already in place, you may want to make oCIS use them:
+
 ```bash
 PROXY_HTTP_ADDR=0.0.0.0:9200 \
 OCIS_URL=https://your-host:9200 \
 PROXY_TRANSPORT_TLS_KEY=./certs/your-host.key \
 PROXY_TRANSPORT_TLS_CERT=./certs/your-host.crt \
-./bin/ocis server
-```
-
-{{< hint info >}}
-**TLS Certificate**\
-If you have a CA signed certificate for your domain, add the following configurations:
-```
-PROXY_TRANSPORT_TLS_KEY=./certs/your-host.key \
-PROXY_TRANSPORT_TLS_CERT=./certs/your-host.crt \
+./ocis server
 ```
-{{< /hint >}}
-
-
-For more configuration options check the configuration section in [ocis](https://owncloud.github.io/ocis/configuration/) and every ocis extension.
-
 
+For more configuration options check the configuration section in [oCIS](https://owncloud.github.io/ocis/configuration/) and the oCIS extensions.
 
-## Use Docker Compose
+## Start the oCIS fullstack server with Docker Compose
 
 Please have a look at our other [deployment examples]({{< ref "./_index.md" >}}).

docs/ocis/release_roadmap.md

@@ -7,8 +7,6 @@ geekdocEditPath: edit/master/docs/ocis
 geekdocFilePath: release_roadmap.md
 ---
 
-# Release Roadmap
-
 You may have asked yourself why there are major version 1 tags in our GitHub repository but the readme still states `ownCloud Infinite Scale is currently in a technical preview state. It will be subject to a lot of changes and is not yet ready for general production deployments.`. How can that be if its a major version 1?
 
 Our initial and also our current plan is to stick to SemVer as versioning scheme. But sometimes there are other factors which cross your plans. Therefore we started releasing oCIS with version `1.0.0 Tech Preview`.