diff --git a/docs/apps/services/ignored-services.mdx b/docs/apps/services/ignored-services.mdx
index 7ca927f1b..b48376a8f 100644
--- a/docs/apps/services/ignored-services.mdx
+++ b/docs/apps/services/ignored-services.mdx
@@ -3,29 +3,58 @@ title: "Ignored Services"
sidebar_position: 6
---
-Select _Apps > Services > Ignored Services_ to view, edit, or add ignored services. Click the ignored service ID to edit an existing service.
+import ThemedImage from '@theme/ThemedImage'
+import useBaseUrl from '@docusaurus/useBaseUrl'
+
+Select **Apps > Services > Ignored Services** to view, edit, or add ignored services. Click the ignored service ID to edit an existing service.
Ignored services are either Active or Inactive:
- Active ignored services are not captured in discovery.
- Inactive ignored services are captured in discovery.
-Any discovered ignored services are added to the Ignored Services page. You can edit an individual ignored service to change its ignored status or use the Action menu to edit multiple services. You can also add ignored services manually if you want.
+Any discovered ignored services are added to the **Ignored Services** list page.
+
+
-
+You can edit an individual ignored service to change its ignored status or use the **Actions** menu to edit multiple services.
-
+
### Ignored Services Actions
Select one or more ignored service, and then select an Action to apply to the ignored services. You can use the Action menu to activate or deactivate selected ignored services, and you can also delete or export ignored services.
-
+
### Add an Ignored Service
-Click _Add Ignored Service_ to add an ignored service.
+Click **Create** from the Ignored Services list page to add an ignored service.
-Enter the **Ignored Text** and select the **Ignored Level**. Click **Active** to add the ignored service as active – active ignored services are not captured in discovery. Click _Save_ to add the ignored service.
+Enter the **Ignored Text** and select the **Ignored Level**. Click **Active** to add the ignored service as active – active ignored services are not captured in discovery. Click **Save** to add the ignored service.
-
+
diff --git a/docs/apps/services/index.mdx b/docs/apps/services/index.mdx
index 3e87e4357..621c9625b 100644
--- a/docs/apps/services/index.mdx
+++ b/docs/apps/services/index.mdx
@@ -1,26 +1,39 @@
---
-title: "Services"
+title: "All Services"
sidebar_position: 1
---
import ThemedImage from '@theme/ThemedImage';
import useBaseUrl from '@docusaurus/useBaseUrl'
-The Services menu contains the items shown below.
-
-
-
-When you create a discovery job, remember to select the Discover Services option to discover services information.
-
-
+A Service is any communication process between a listener and client discovered via netstat in Device42.
+
+Use the **All Services** list page to see which services are running across your infrastructure and how many instances of each exist. View widely-deployed applications and noisy monitoring agents.
+
+- Navigate to **Resources > Services** to view and manage the discovered services.
+
+
+
+## Application Dependency Mapping and Services
+
+For [Application Dependency Mapping (ADM)](/apps/index.mdx), reviewing **All Services** and [**Service Instances**](service-instances.mdx) of the Device42 Main Appliance is particularly useful.
+
+### All Services vs Service Instances
+
+The All Services list page has records of the unique names of the discovered services and the number of **Service Instances** with that name. For example:
+
+- `15` instances of `java`
+- `8` instances of `java.exe`
+
+Identify noisy services, like agents, from the All Services list page by sorting the **Service Instances** column from high to low count.
+
+The Service Instances list page stores every discovered service as an individual entry, with the **Device** it's running on and [other details](service-instances.mdx). For example:
+
+- `java.exe` running on device `jboss-27`
+- `java.exe` running on device `jboss-29`
+
diff --git a/docs/apps/services/network-shares.mdx b/docs/apps/services/network-shares.mdx
index f65135914..1ea434f82 100644
--- a/docs/apps/services/network-shares.mdx
+++ b/docs/apps/services/network-shares.mdx
@@ -11,8 +11,8 @@ Navigate to **Resources > Storage > Network Shares** of the main appliance to vi
@@ -23,8 +23,8 @@ Select one or more network shares and choose an action from the **Select an acti
@@ -39,7 +39,7 @@ Optionally, you can select an **Install Date** and fill in the **Caption**, **St
\ No newline at end of file
diff --git a/docs/apps/services/scheduled-tasks.mdx b/docs/apps/services/scheduled-tasks.mdx
index 98caf499b..ec18f80b7 100644
--- a/docs/apps/services/scheduled-tasks.mdx
+++ b/docs/apps/services/scheduled-tasks.mdx
@@ -3,20 +3,41 @@ title: "Scheduled Tasks"
sidebar_position: 3
---
-Select _Apps > Services > Scheduled Tasks_ to view, edit, or add a scheduled task.
+import ThemedImage from '@theme/ThemedImage'
+import useBaseUrl from '@docusaurus/useBaseUrl'
-
+Select **Resources > Services > Scheduled Tasks** to view, edit, or add a scheduled task.
+
+
### Scheduled Task Actions
Select one of more scheduled tasks, and then select an Action to apply that action to the tasks.
-
+
### Add a Scheduled Task
-Click _Add Scheduled Task_ to add a new task.
+Click **Create** from the Scheduled Tasks list page to add a new task.
-
+
-Enter a **Name**, **Caption**, and select a **Device** for the task. Enter or select any other options or schedule information. Click _Save_ at the bottom of the page to save the task.
+Enter a **Name**, **Caption**, and select a **Device** for the task. Enter or select any other options or schedule information. Click **Save** at the bottom of the page to save the task.
diff --git a/docs/apps/services/service-communications.mdx b/docs/apps/services/service-communications.mdx
index abab1bfde..a9e871817 100644
--- a/docs/apps/services/service-communications.mdx
+++ b/docs/apps/services/service-communications.mdx
@@ -3,33 +3,72 @@ title: "Service Communications"
sidebar_position: 5
---
-Select Resources _> Services > Service Communications_ to view, edit, or add service communication information. Click the _Client_ device name to edit an existing service communication.
+import ThemedImage from '@theme/ThemedImage'
+import useBaseUrl from '@docusaurus/useBaseUrl'
-
+Select **Resources > Services > Service Communications** to view, edit, or add service communication information. Click the **Client** device name to edit an existing service communication.
-
+
### Service Communications Actions
-Select one or more Service Communications, and then select an Action to apply the action to the items.
+Select one or more Service Communication records, and then select an Action to apply the action to the items.
-
+
### Add a Service Communication
-Click _Add Service Communication_ to add a new communication.
+Click **Create** from the Service Communications list page to add a new communication.
-
+
Enter a Client IP Address, Listener IP Address. Port, and Protocol. You can also select the Client Device, Listener Device, and enter a Client process display name and a Client process name. Click Save at the bottom of the page to ad the service communication.
### Service Port IP Statistics
-Select _Apps > Services > Service Communications_ to view service port IP statistics. As of version 16.00.00, Device42 has revamped statistics collection. Statistics are now only kept from a listener perspective and are client-IP-centric (not per client service). Previously collected statistics now appear in the _Classic Statistics_ section of this page. See below for descriptions of the Netstat and Netflow statistics Device42 collects.
+Select **Resources > Services > Service Communications** and click on a record **ID** to view service port IP statistics.
-
+Statistics are only kept from a listener perspective and are client-IP-centric (not per client service). Collected statistics appear in the **Classic Statistics** section of this page. See below for descriptions of the Netstat and Netflow statistics Device42 collects.
-#### Netstat Statistics
+**Statistics**
+
+
+
+**Classic Statistics**
+
+
+
+### Netstat Statistics
diff --git a/docs/apps/services/service-instances.mdx b/docs/apps/services/service-instances.mdx
index 9fb677407..5565c9def 100644
--- a/docs/apps/services/service-instances.mdx
+++ b/docs/apps/services/service-instances.mdx
@@ -3,20 +3,82 @@ title: "Service Instances"
sidebar_position: 2
---
-Select _Apps > Services > Service Instances_ to view, edit, or or add service instances.Click on a _Service Name_ to view or edit that instance.
+import ThemedImage from '@theme/ThemedImage'
+import useBaseUrl from '@docusaurus/useBaseUrl'
-
+Service Instances are the running services discovered on your devices. These form the foundation for Application Dependency Mapping and help you understand what's running where.
+
+Device42 stores each discovered service as an entry in the Service Instance list page, under **Resources > Service Instances**. You'll see multiple services with the same **Service Name**. If you want a tally of the number of services with the same name, visit the [All Services](/apps/services/index.mdx) list page under **Resources > All Services**.
+
+A Service Instance record includes the service **Device**, its **State**, **Service Path**, **Listener Addresses**, and **Ports**.
+
+## Using the Service Instances Interface
+
+From **Resources > Service Instances**, click on a **Service Name** to view or edit that instance.
+
+
### Service Instances Actions
-Select one of more service instances, and then select an Action to apply that action to the instances.
+Select one or more Service Instances and select an option from the **Actions** menu to perform on the selection.
-
+
### Add a Service Instance
-Click _Add Service Instance_ to add a new instance.
+Click **Create** to add a new instance.
+
+
+
+- Click **Service** to select the service you want to add. Device42 displays the Select Service dialog – you can also add a new component from this dialog.
+- Select the **Start Mode**, **State**, and **Topology Status**.
+
+Enter or select any other information you want for the instance, and then click **Save** at the bottom of the page.
+
+## Application Dependency Mapping and Service Instances
+
+As part of the [Application Dependency Mapping (ADM) workflow](/apps/enterprise-application-dependency-mapping/index.mdx), Device42 creates Application Components (**Applications > Application Components**) from discovered data and services. Application Components are building blocks for creating Application Groups, and eventually, a Business Service.
+
+If you have an application that is absent or not quite captured as an Application Component, after running OS-level discovery jobs with ADM sampling enabled, create an Application Component Template to instruct Device42 on what to look for.
+
+The **Service Command Args** value of a Service Instance can be used as match criteria when configuring the Application Component Template you need.
+
+- Copy the **Service Command Args** value of a Service Instance.
+
+
+
+- Create a new Application Component Template using the previous Service Instance **Service Command Args** value as match criteria:
-
+
-Click **Service** to select the service you want to add. Device42 displays the Select Service dialog – you can also add a new component from this dialog. Click on the name of the service you want to add. Select the **Start Mode**, **State**, and **Topology Status**. Enter or select any other information you want for the instance, and then click _Save_ at the bottom of the page.
+Creating Application Component Templates for Java.exe applications is particularly useful - you provide the command line switches (**Service Command Args**) containing the launch details of the service.
diff --git a/docs/apps/services/service-listener-ports.mdx b/docs/apps/services/service-listener-ports.mdx
index e1203bddc..043e3f01d 100644
--- a/docs/apps/services/service-listener-ports.mdx
+++ b/docs/apps/services/service-listener-ports.mdx
@@ -3,20 +3,41 @@ title: "Service Listener Ports"
sidebar_position: 4
---
-Select _Apps > Services > Service Listener Ports_ to view, edit, or add a listener port. Click the _Service Listener Port_ IP to edit an existing listener port.
+import ThemedImage from '@theme/ThemedImage'
+import useBaseUrl from '@docusaurus/useBaseUrl'
-
+Select **Resources > Services > Service Listener Ports** to view, edit, or add a listener port. Click the service **Listener** port IP to edit an existing listener port.
+
+
### Service Listener Port Actions
Select one or more listener ports, and then select an Action to apply that action to the listener ports.
-
+
### Add a Service Listener Port
-Click _Add Service Listener Port_ to add a new port.
+Click **Create** from the Service Listener list page to add a new port.
-
+
-Click **Device** to create the listener port you want to add. Device42 displays the Select Device dialog – you can also add a new device from this dialog. Click on the name of the device for the listener port. Enter an **IP Address**, a **Port**, and select the **Protocol**. Enter any other information you want, and then click _Save_ to add the listener port.
+Click **Device** to create the listener port you want to add. Device42 displays the Select Device dialog – you can also add a new device from this dialog. Click on the name of the device for the listener port. Enter an **IP Address**, a **Port**, and select the **Protocol**. Enter any other information you want, and then click **Sav**e to add the listener port.
diff --git a/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx b/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx
index 0ad5c908b..9bed75720 100644
--- a/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx
+++ b/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx
@@ -70,7 +70,7 @@ For more information, see [Best Practices for Managing AWS Access Keys](https://
- Select **Discover Main Account** to discover the main AWS account in addition to any AWS Roles accounts you select.
- Select the **Available AWS Roles** for the account(s) you want to discover using the arrow to add them to the **Chosen AWS Roles** list.
-**Note:** See [Defining AWS Roles](#addedit-aws-roles) below for instructions on creating the AWS Roles that Devices42 displays for AWS cloud autodiscovery jobs.
+**Note:** See [Defining AWS Roles](#add-and-edit-aws-roles) below for instructions on creating the AWS Roles that Devices42 displays for AWS cloud autodiscovery jobs.
- Choose one or more Amazon regions to search.
diff --git a/docs/getstarted/deploy-device42/remote-collector-rc-installation.mdx b/docs/getstarted/deploy-device42/remote-collector-rc-installation.mdx
index 3430af945..67ca2ed87 100644
--- a/docs/getstarted/deploy-device42/remote-collector-rc-installation.mdx
+++ b/docs/getstarted/deploy-device42/remote-collector-rc-installation.mdx
@@ -54,6 +54,9 @@ This guide provides step-by-step instructions for configuring your Remote Collec
## Step 5: Connect the Remote Collector to the Main Appliance
1. Choose option **(r)** to enter the **Remote Collector Setup** menu.
+
+ 
+
2. Enter the name of the Remote Collector.
3. Enter either the Hostname or IP Address of the Main Appliance.
4. Generate a One Time Password (OTP) from the Main Appliance, which will be entered later into this menu:
diff --git a/docs/getstarted/who-section-is-for.mdx b/docs/getstarted/device42-implementation-guide.mdx
similarity index 100%
rename from docs/getstarted/who-section-is-for.mdx
rename to docs/getstarted/device42-implementation-guide.mdx
diff --git a/docs/integration/external-integrations/freshservice-integration/customize-freshservice.mdx b/docs/integration/external-integrations/freshservice-integration/customize-freshservice.mdx
index eec5fc4e8..bb607ebc5 100644
--- a/docs/integration/external-integrations/freshservice-integration/customize-freshservice.mdx
+++ b/docs/integration/external-integrations/freshservice-integration/customize-freshservice.mdx
@@ -428,7 +428,7 @@ If you can't find a task related to your custom field, you can create a new ``) and less-than (`<`) symbols also need to be escaped. The equality operator works without special quotes. Please check existing DOQL for examples.
+ **Syntax notes**: You need to escape the double quotes (`"`) by using the `"` HTML entity. The greater-than (`>`) and less-than (`<`) symbols also need to be escaped. The equality operator works without special quotes. Please check existing DOQL for examples.
- A `LEFT JOIN` is added because all custom fields in Device42 are stored in the `{CI name}_custom_fields` views. For example, the Devices CI is stored in `view_device_custom_fields_flat_v2`.
4. Now it's time to map the custom field to Freshservice. Add a new `` element in the `` tag section of the XML file. You'll need to keep Freshservice open and follow the next step to get the exact Freshservice values to use in the new `` element below.
diff --git a/docs/integration/external-integrations/freshservice-integration/use-freshservice-integration.mdx b/docs/integration/external-integrations/freshservice-integration/use-freshservice-integration.mdx
index 11b81335c..7d1ed5a57 100644
--- a/docs/integration/external-integrations/freshservice-integration/use-freshservice-integration.mdx
+++ b/docs/integration/external-integrations/freshservice-integration/use-freshservice-integration.mdx
@@ -107,7 +107,7 @@ We understand that some fields within Device42 may not easily translate to field
-4. Click **View Asset in Device42** to be redirected to the asset in Device42.
+4. Click **View Asset in Device42** to be redirected to the entity in Device42. This linking feature only supports Devices and Business Application entities.