diff --git a/neonContext/Address/Address.aod b/neonContext/Address/Address.aod
index 13b957704c92aa14a876f57f46d38937acf71628..d52b486fe764514b9aca06652f49d2b8ab1751e9 100644
--- a/neonContext/Address/Address.aod
+++ b/neonContext/Address/Address.aod
@@ -3,6 +3,7 @@
   <name>Address</name>
   <title>Addresses</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/neonContext/Address/documentation.adoc</documentation>
   <lookupView>AddressLookup_view</lookupView>
   <entity>Address_entity</entity>
   <references>
diff --git a/neonContext/Address/documentation.adoc b/neonContext/Address/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..760bf3632350b96ff6dca33d9e287ab5311f816e
--- /dev/null
+++ b/neonContext/Address/documentation.adoc
@@ -0,0 +1,3 @@
+The address Entity provides addresses for contacts.
+
+If you need address completion / validation support, see documentatioin of AddressValidation Context.
\ No newline at end of file
diff --git a/neonContext/AddressValidation/AddressValidation.aod b/neonContext/AddressValidation/AddressValidation.aod
index 38a48ce6cf054279fd21d25d17c8e8a8c68aee69..1671b0b2133757534fa750087b6f555e99e94378 100644
--- a/neonContext/AddressValidation/AddressValidation.aod
+++ b/neonContext/AddressValidation/AddressValidation.aod
@@ -2,6 +2,7 @@
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
   <name>AddressValidation</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/neonContext/AddressValidation/documentation.adoc</documentation>
   <lookupView>AddressValidationLookup_view</lookupView>
   <entity>AddressValidation_entity</entity>
   <references>
diff --git a/neonContext/AddressValidation/documentation.adoc b/neonContext/AddressValidation/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cce138a1fb353940dbdff96a6f330b3eee55647b
--- /dev/null
+++ b/neonContext/AddressValidation/documentation.adoc
@@ -0,0 +1,15 @@
+The AddressValidation Context provides a way to load a list of valid addresses by using a custom datasource (e.g. a webservice) based on the user input.
+
+To enable the address-lookups for the address-entity, go to 
+preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT (in the navigator) -> and enable the checkbox "nominatim.enable"
+
+There are the following configurations are possible to control the nominatim-server, which is used in xrmBasic:
+"nominatim.enable"
+"nominatim.url"
+"nominatim.user"
+"nominatim.pw"
+
+If you would like to use a different webservice (or other datasource are also possible), you can extend the WsValidation_lib.
+See the documentation inside of the lib.
+Basically you just have to add a new type and the respective callbacks.
+