diff --git a/modules/core/docs/authproc_attributevaluemap.md b/modules/core/docs/authproc_attributevaluemap.md
index cf7468a5f4ff2b9537777c08d3ad1dd2e1b89427..eb571a4faae993be5ad0a81d5db546db9a0f72d0 100644
--- a/modules/core/docs/authproc_attributevaluemap.md
+++ b/modules/core/docs/authproc_attributevaluemap.md
@@ -3,17 +3,18 @@
 
 Filter that creates a target attribute based on one or more value(s) in source attribute.
 
-%replace can be used to replace all existing values in target with new ones (any existing values will be lost)
-%keep can be used to keep the source attribute, otherwise it will be removed.
+Besides the mapping of source values to target values, the filter has the following options:
+* `%replace` can be used to replace all existing values in target with new ones (any existing values will be lost)
+* `%keep` can be used to keep the source attribute, otherwise it will be removed.
 
 Examples
 --------
 
-Add student affiliation based on LDAP groupmembership.
-Will add eduPersonAffiliation containing value "student" if memberOf attribute contains
-either 'cn=student,o=some,o=organization,dc=org' or 'cn=student,o=other,o=organization,dc=org'.
-'memberOf' attribute will be removed (use %keep, to keep it) and existing values in
-'eduPersonAffiliation' will be merged (use %replace to replace them).
+### Add student affiliation based on LDAP groupmembership
+Will add eduPersonAffiliation containing value "`student`" if the `memberOf` attribute contains
+either '`cn=student,o=some,o=organization,dc=org`' or '`cn=student,o=other,o=organization,dc=org`'.
+The '`memberOf`' attribute will be removed (use `%keep`, to keep it) and existing values in
+'`eduPersonAffiliation`' will be merged (use `%replace` to replace them).
 
     'authproc' => array(
         50 => array(
@@ -29,8 +30,8 @@ either 'cn=student,o=some,o=organization,dc=org' or 'cn=student,o=other,o=organi
         ),
     )
 
-Multiple assignments.
-Add student, employee and both affiliation based on LDAP groupmembership in memberOf attribute.
+### Multiple assignments
+Add `student`, `employee` and `both` affiliation based on LDAP groupmembership in the `memberOf` attribute.
 
     'authproc' => array(
         50 => array(
@@ -58,8 +59,8 @@ Add student, employee and both affiliation based on LDAP groupmembership in memb
         ),
     )
 
-Replace and Keep.
-Replace any existing 'affiliation' attribute values and keep 'groups' attribute.
+### Replace and Keep
+Replace any existing '`affiliation`' attribute values and keep the '`groups`' attribute.
     
     'authproc' => array(
         50 => array(