diff --git a/defaults/main.yml b/defaults/main.yml
index 518a11c..e7cae04 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -31,7 +31,10 @@ owncloud__base_packages:
 # .. envvar:: owncloud__packages_recommended
 #
 # List of recommended packages for ownCloud.
-# If you don’t want to install them, set::
+# If you don’t want to install them, set:
+#
+# .. code-block:: yaml
+#   :linenos:
 #
 #    owncloud__packages_recommended: []
 #
@@ -46,7 +49,10 @@ owncloud__packages_recommended:
 # .. envvar:: owncloud__packages_optional
 #
 # List of optional packages for ownCloud.
-# If you don’t want to install them, set::
+# If you don’t want to install them, set:
+#
+# .. code-block:: yaml
+#   :linenos:
 #
 #    owncloud__packages_optional: []
 #
@@ -511,7 +517,10 @@ owncloud__app_user_webfinger_support: False
 #
 # See `ownCloud config.php configuration`_.
 # This variable is a set of required settings for ownCloud to be usable.
-# Set::
+# Set:
+#
+# .. code-block:: yaml
+#   :linenos:
 #
 #    owncloud__config_role_required: {}
 #
@@ -532,7 +541,10 @@ owncloud__config_role_required:
 # See `ownCloud config.php configuration`_.
 # This variable is a set of optional settings for ownCloud recommended by the
 # maintainers of this role.
-# Set::
+# Set:
+#
+# .. code-block:: yaml
+#   :linenos:
 #
 #    owncloud__config_role_optional: {}
 #
@@ -628,6 +640,7 @@ owncloud__config_host: {}
 #      federation:
 #        autoAddServers: '0'
 #
+# Refer to the `official ownCloud Dokumentation <https://doc.owncloud.org/server/9.0/admin_manual/configuration_server/occ_command.html#config-commands-label>`__ for details.
 
 # .. envvar:: owncloud__apps_config
 #
@@ -823,12 +836,6 @@ owncloud__ldap_method: 'ssl'
 #
 # The attribute that should be used as display name in ownCloud.
 # Refer to the `official ownCloud Dokumentation <https://doc.owncloud.org/server/9.0/admin_manual/configuration_user/user_auth_ldap.html#directory-settings>`__ for details.
-#
-# Example for a Microsoft Windows environment::
-#
-#    owncloud__ldap_user_display_name: 'sAMAccountName'
-#
-# FIXME
 owncloud__ldap_user_display_name: 'cn'
 
 
@@ -950,12 +957,14 @@ owncloud__ldap_cache_ttl: '600'
 # You will need to add this variable yourself to :envvar:`owncloud__ldap_conf_map`
 # right now.
 #
-# Settings this to::
+# For a Microsoft Windows environment, putting this:
 #
-#    owncloud__ldap_expert_username_attr: 'sAMAccountName'
+# .. code-block:: yaml
+#   :linenos:
 #
-# FIXME: Needs testing.
+#    owncloud__ldap_expert_username_attr: 'sAMAccountName'
 #
+# in your inventory might come in handy to use the user names from AD as user names in ownCloud.
 owncloud__ldap_expert_username_attr: ''
 
 # .. ]]]
@@ -1155,7 +1164,10 @@ owncloud__theme_doc_link_to_key: '$this->getDocBaseUrl() . ''/server/{{ owncloud
 # The ``state`` value allows to make files absent.
 # All other options correspond to the options of the `Ansible copy module`_.
 #
-# To change the logo on the login page you can use::
+# To change the logo on the login page you can use:
+#
+# .. code-block:: yaml
+#   :linenos:
 #
 #    owncloud__theme_copy_files:
 #
diff --git a/tasks/setup_owncloud.yml b/tasks/setup_owncloud.yml
index 7a2a3bc..e42ac74 100644
--- a/tasks/setup_owncloud.yml
+++ b/tasks/setup_owncloud.yml
@@ -125,7 +125,7 @@
 
 # .. ]]]
 
-# ownCloud raw occ commands [[[1
+# ownCloud raw occ commands [[[
 
 - name: Combine owncloud__apps_config variables
   set_fact: