8 files changed, 22 insertions, 2 deletions
diff --git a/doc/administration/troubleshooting/group_saml_scim.md b/doc/administration/troubleshooting/group_saml_scim.md
index 109379f98ca..7c2733d9d63 100644
--- a/doc/administration/troubleshooting/group_saml_scim.md
+++ b/doc/administration/troubleshooting/group_saml_scim.md
@@ -55,3 +55,23 @@ Adding a user:
 SSO settings:
 
 ![OneLogin SSO settings](img/OneLogin-SSOsettings.png)
+
+## ADFS
+
+Setup SAML SSO URL:
+
+![ADFS Setup SAML SSO URL](img/ADFS-saml-setup-sso-url.png)
+
+Configure Assertions:
+
+![ADFS Configure Assertions](img/ADFS-configure-assertions.png)
+
+Configure NameID:
+
+![ADFS ADFS-configure-NameID](img/ADFS-configure-NameID.png)
+
+Determine Certificate Fingerprint:
+
+| Via UI | Via Shell |
+|--------|-----------|
+| ![ADFS Determine Token Signing Certificate Fingerprint](img/ADFS-determine-token-signing-certificate-fingerprint.png) | ![ADFS Determine Token Signing Fingerprint From Shell](img/ADFS-determine-token-signing-fingerprint-from-shell.png) |
diff --git a/doc/administration/troubleshooting/img/ADFS-configure-NameID.png b/doc/administration/troubleshooting/img/ADFS-configure-NameID.png
new file mode 100644
index 00000000000..d45e189b3ab
--- /dev/null
+++ b/doc/administration/troubleshooting/img/ADFS-configure-NameID.png
diff --git a/doc/administration/troubleshooting/img/ADFS-configure-assertions.png b/doc/administration/troubleshooting/img/ADFS-configure-assertions.png
new file mode 100644
index 00000000000..53c26ad0be1
--- /dev/null
+++ b/doc/administration/troubleshooting/img/ADFS-configure-assertions.png
diff --git a/doc/administration/troubleshooting/img/ADFS-determine-token-signing-certificate-fingerprint.png b/doc/administration/troubleshooting/img/ADFS-determine-token-signing-certificate-fingerprint.png
new file mode 100644
index 00000000000..cd1b9db31d9
--- /dev/null
+++ b/doc/administration/troubleshooting/img/ADFS-determine-token-signing-certificate-fingerprint.png
diff --git a/doc/administration/troubleshooting/img/ADFS-determine-token-signing-fingerprint-from-shell.png b/doc/administration/troubleshooting/img/ADFS-determine-token-signing-fingerprint-from-shell.png
new file mode 100644
index 00000000000..431141dd3ef
--- /dev/null
+++ b/doc/administration/troubleshooting/img/ADFS-determine-token-signing-fingerprint-from-shell.png
diff --git a/doc/administration/troubleshooting/img/ADFS-saml-setup-sso-url.png b/doc/administration/troubleshooting/img/ADFS-saml-setup-sso-url.png
new file mode 100644
index 00000000000..a837f1b19cc
--- /dev/null
+++ b/doc/administration/troubleshooting/img/ADFS-saml-setup-sso-url.png
diff --git a/doc/api/api_resources.md b/doc/api/api_resources.md
index 2adc0087474..a20b903d534 100644
--- a/doc/api/api_resources.md
+++ b/doc/api/api_resources.md
@@ -131,7 +131,7 @@ The following API resources are available outside of project and group contexts
 | [Projects](projects.md)                           | `/users/:id/projects` (also available for projects)                     |
 | [Runners](runners.md)                             | `/runners` (also available for projects)                                |
 | [Search](search.md)                               | `/search` (also available for groups and projects)                      |
-| [Settings](settings.md)                           | `/application/settings`                                                 |
+| [Settings](settings.md) **(CORE ONLY)**           | `/application/settings`                                                 |
 | [Statistics](statistics.md)                       | `/application/statistics`                                               |
 | [Sidekiq metrics](sidekiq_metrics.md)             | `/sidekiq`                                                              |
 | [Suggestions](suggestions.md)                     | `/suggestions`                                                          |
diff --git a/doc/api/settings.md b/doc/api/settings.md
index ae44c317dbb..cae51579afb 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -1,4 +1,4 @@
-# Application settings API
+# Application settings API **(CORE ONLY)**
 
 These API calls allow you to read and modify GitLab instance
 [application settings](#list-of-settings-that-can-be-accessed-via-api-calls)