Docs feedback: SMTP configuration for Office 365

The docs have two different configuration examples for using Office 365 for the SMTP connection:

• https://docs.gitlab.com/omnibus/settings/smtp.html#office365
• https://docs.gitlab.com/omnibus/settings/smtp.html#office-365

The first link lists this:

gitlab_rails['smtp_enable'] = true
gitlab_rails['smtp_address'] = "smtp.office365.com"
gitlab_rails['smtp_port'] = 587
gitlab_rails['smtp_user_name'] = "username@yourdomain.com"
gitlab_rails['smtp_password'] = "password"
gitlab_rails['smtp_domain'] = "yourdomain.com"
gitlab_rails['smtp_authentication'] = "login"
gitlab_rails['smtp_enable_starttls_auto'] = true
gitlab_rails['smtp_openssl_verify_mode'] = 'peer'
gitlab_rails['gitlab_email_from'] = 'username@yourdomain.com'

The second one uses port 25 instead of 587 and replaces the last two lines:

- gitlab_rails['smtp_openssl_verify_mode'] = 'peer'
- gitlab_rails['gitlab_email_from'] = 'username@yourdomain.com'
+ gitlab_rails['smtp_tls'] = false

Which one is correct/what are the different use cases?

Also: Would it be better to sort the different examples alphabetically to make them easier to find?