Merge branch 'patch-37' into 'master'

Link highlighting of jon.doe@example.com swallowed the trailing backtick, destroying formatting.

See merge request gitlab-org/gitlab-ce!24133

doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md

@@ -255,7 +255,7 @@ After configuring LDAP, basic authentication will be available. Users can then l
 Users that are removed from the LDAP base group (e.g `OU=GitLab INT,DC=GitLab,DC=org`) will be **blocked** in GitLab. [More information](../ldap.md#security) on LDAP security.
-If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab will ignore everything after the first '@' in the LDAP username used on login. Example: The username `jon.doe@example.com` is converted to `jon.doe` when authenticating with the LDAP server. Disable this setting if you use `userPrincipalName` as the `uid`.
+If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab will ignore everything after the first '@' in the LDAP username used on login. Example: The username `` jon.doe@example.com `` is converted to `jon.doe` when authenticating with the LDAP server. Disable this setting if you use `userPrincipalName` as the `uid`.
 ## LDAP extended features on GitLab EE