Attachment 9988 Details for Bug 47008 – wording.diff

[patch] wording.diff

wording.diff (text/plain), 2.39 KB, created by Arvid Requate on 2019-04-23 19:32:01 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2019-04-23 19:32:01 CEST

Size: 2.39 KB

patch

obsolete

>diff --git a/doc/errata/staging/univention-s4-connector.yaml b/doc/errata/staging/univention-s4-connector.yaml
>index e4af21150f..5e4ac713de 100644
>--- a/doc/errata/staging/univention-s4-connector.yaml
>+++ b/doc/errata/staging/univention-s4-connector.yaml
>@@ -8,6 +8,7 @@ desc: |
>  This update addresses the following issues:
>  * Duplicated code for the detection of superordinates has been removed.
>  * Dead code for obsolete custom attributes from UCS 2 has been removed.
>- * Excluding subtrees from synchronization in s4connector is now possible
>-   by configuring UCR variable connector/s4/mapping/ignoresubtree/.*
>+ * Excluding subtrees from synchronization by S4-Connector is now possible
>+   by configuring UCR variables matching the pattern
>+   connector/s4/mapping/ignoresubtree/.*
> bug: [45068, 41554, 47008]
>diff --git a/services/univention-s4-connector/debian/univention-s4-connector.univention-config-registry-variables b/services/univention-s4-connector/debian/univention-s4-connector.univention-config-registry-variables
>index de5bcf236d..45d38b3057 100644
>--- a/services/univention-s4-connector/debian/univention-s4-connector.univention-config-registry-variables
>+++ b/services/univention-s4-connector/debian/univention-s4-connector.univention-config-registry-variables
>@@ -317,8 +317,8 @@ Type=str
> Categories=service-s4con
> 
> [connector/s4/mapping/ignoresubtree/.*]
>-Description[de]=Definiert die Positionen im Verzeichnisdienst, die nicht durch den Connector synchronisiert werden sollen. StandardmÃ¤Ãig ist die Variable nicht gesetzt.
>-Description[en]=Defines the locations in the directory service that shall not be synchronised by the connector. By default, the variable is not set.
>+Description[de]=Definiert die Positionen im Verzeichnisdienst, die nicht durch den Connector synchronisiert werden sollen. Die Werte kÃ¶nnen sowohl Positionen im Samba/AD als auch im UCS-LDAP enthalten. Mehrere zu ignorierende Zweige mÃ¼ssen jeweils ein einer eigenen, z.B. durchnummerierten Variable konfiguriert werden. StandardmÃ¤Ãig sind keine dieser Variablen gesetzt.
>+Description[en]=Defines the locations in the directory service that shall not be synchronised by the connector. The values can contain positions in Samba/AD and in the UCS LDAP. If multiple subtrees shal be ignored, they need to be configured in separate, e.g. numbered variables. By default, none of these variables are set.
> Type=str
> Categories=service-s4con
>

Actions: View | Diff

Attachments on bug 47008: 9988