Merge pull request #3714 from owncloud/fix-adoc

escape adoc pipe & remove linewrap in output

docs/helpers/adoc-generator.go.tmpl

@@ -91,6 +91,8 @@ func GetAnnotatedVariables(s interface{}) []ConfigField {
 			td := strings.Split(env, ";")
 			re := regexp.MustCompile(`^(https?:\/\/)`)
 			v = re.ReplaceAllString(v,"\\$1")
+			re = regexp.MustCompile(`(\|)`)
+			v = re.ReplaceAllString(v, "\\$1")
 			fields = append(fields, ConfigField{EnvVars: td, DefaultValue: v, Description: desc, Type: value.Type().Name()})
 		case reflect.Ptr:
 			// PolicySelectors in the Proxy are being skipped atm

docs/templates/ADOC.tmpl

@@ -9,7 +9,8 @@
 
 {{- range .Fields}}
 {{ $numVars := len .EnvVars }}
-| {{- range $i, $value := .EnvVars }}{{- if $i }} +{{ end }}
+| {{- range $i, $value := .EnvVars }}{{- if $i }} +
+{{ end -}}
 `{{- $value }}` 
 {{- end }}
 | {{.Type}}