resolve conflicts

Author: Nadia-JSch

docs/auto-discovery/operating-systems-supported-in-auto-discovery.mdx

@@ -40,7 +40,7 @@ Discovery of the **IBM i powered mid-range** line and **IBM z/OS** powered mainf
 <table>
   <tbody>
     <tr>
-      <td width="450">
+      <td width="450" style={{verticalAlign: 'top'}}>
         <ul>
           <li>AIX 5</li>
           <li>AIX 6</li>
@@ -73,13 +73,14 @@ Discovery of the **IBM i powered mid-range** line and **IBM z/OS** powered mainf
           <li>Microsoft Windows Server 2008 R2 Standard SP1</li>
         </ul>
       </td>
-      <td width="414">
+      <td width="450" style={{verticalAlign: 'top'}}>
         <ul>
           <li>Microsoft Windows Server 2012</li>
           <li>Microsoft Windows Server 2012 R2</li>
           <li>Microsoft Windows Server 2016</li>
           <li>Microsoft Windows Server 2019</li>
           <li>Microsoft Windows Server 2022</li>
+          <li>Microsoft Windows Server 2025</li>
           <li>Miracle Linux 8.4</li>
           <li>OpenVMS 8.4</li>
           <li>Oracle Linux Server 6.7</li>
@@ -108,4 +109,4 @@ Discovery of the **IBM i powered mid-range** line and **IBM z/OS** powered mainf
       </td>
     </tr>
   </tbody>
-</table>
+</table>

docs/auto-discovery/virtual-machine-auto-discovery.mdx

@@ -61,6 +61,10 @@ From the Device42 main menu, under **Discovery > Hypervisors/\*nix/Windows**, ad
 
 **Discovery Target(s):**  This is the FQDN or IP of the vCenter server or the ESX server. If using FQDN, set up DNS resolution in the Device42 VM console first.
 
+:::note
+You need to add each vCenter server you wish to discover. Device42 does not automatically find or crawl additional vCenter servers linked to your first one.
+:::
+
 **Port:** This is 443 by default. Only change if you have changed it.
 
 **Enable Resource Utilization Tracking for Device(s):** This option enables the periodic collection and examination of server resource usage metrics. See [Resource Utilization](/auto-discovery/resource-utilization-overview/) for more information.
@@ -202,4 +206,4 @@ Newly created jobs will not run on the first day they are created to prevent an
 
 ## Under the Hood
 
-Device42 uses VMware APIs and the open-source library [pyvmomi](https://github.com/vmware/pyvmomi).
+Device42 uses VMware APIs and the open-source library [pyvmomi](https://github.com/vmware/pyvmomi).

docs/infrastructure-management/assets.mdx

@@ -6,13 +6,13 @@ sidebar_position: 5.5
 import ThemedImage from "@theme/ThemedImage";
 import useBaseUrl from "@docusaurus/useBaseUrl";
 
-Assets are useful for tracking items that may not be directly discoverable. Like devices in Device42, assets can be racked, support lifecycle events, and assigned parts. However, assets do not consume licenses.
+Assets are useful for tracking items that may not be directly discoverable. Like devices in Device42, assets can support lifecycle events, be racked, and be assigned parts. However, assets do not consume licenses.
 
 You can search, view, add, and edit assets from the list page under **Resources > All Assets**. 
 
 ## Adding Assets
 
-From the assets list page, click the **+ Add Asset** button to create a new asset.
+From the Assets list page, click the **Create** button to create a new asset.
 
 <ThemedImage
   alt="Assets list page"
@@ -24,7 +24,7 @@ From the assets list page, click the **+ Add Asset** button to create a new asse
 
 ### Asset Types
 
-Choose an asset **Type** from the dropdown menu or create a custom asset type by clicking **+** to the right. Different options in the add asset form will be available depending on the asset **Type** you select.
+Choose an asset **Type** from the dropdown menu or create a custom asset type by clicking **+** to the right. Different options in the Add Asset form will be available depending on the asset type you select.
 
 <ThemedImage
   alt="Assets Types menu"
@@ -34,15 +34,14 @@ Choose an asset **Type** from the dropdown menu or create a custom asset type by
   }}
 />
 
-Name your custom asset type. If you want to associate assets of this new type to devices, check the **Asset Device Relation** checkbox. Designate the types of locations that assets of this type will be assigned to (**Storage Room**, **Server Room**, **Building**, and **Rack**).
+Name your custom asset type. If you want to associate assets of this new type with devices, check the **Asset Device Relation** checkbox. Designate the types of locations (**Storage Room**, **Server Room**, **Building**, and **Rack**) that assets of this type will be assigned to.
 
 <ThemedImage
   alt="Create a custom asset type"
   sources={{
     light: useBaseUrl("/assets/images/assets-page/custom-type-light.png"),
     dark: useBaseUrl("/assets/images/assets-page/custom-type-dark.png"),
   }}
-  style={{ width: "80%" }}
 />
 
 ### Asset Lifecycle
@@ -59,7 +58,7 @@ Add the **Date** and choose the lifecycle **Event**. Optionally, add an **End Us
 
 ### Rack Info
 
-Depending on the selected asset **Type**, the **Rack Info** box will be available.
+Show the **Rack Info** section by choosing **ACL** from the **Type** dropdown (or another similarly configured custom asset type).
 
 <ThemedImage
   alt="Asset Rack Info box"
@@ -71,15 +70,15 @@ Depending on the selected asset **Type**, the **Rack Info** box will be availabl
 
 ### Object Category Field
 
-In v19.06, the **Object Category** field on the view pages of individual Assets is displayed when **Role-Based Access Control** (RBAC) is enabled globally.
+In v19.06, the **Object Category** field on individual asset view pages is displayed only when **Role-Based Access Control** (RBAC) is enabled globally.
 
 A workaround on view pages is to use the **Legacy View** button to see the **Object Category** field.
 
 Turn on **Role-Based Access Control** under **Tools > Settings > Global Settings**.
 
 ## Asset Actions
 
-The action menu has options to delete, export, and update assets. You can also **Generate QR/Barcodes for selected Items** for asset management.
+The action menu has options for deleting, exporting, and updating assets. You can also **Generate QR/Barcodes for selected Items** for asset management.
 
 Select one or several assets from the table, and select an action from the menu:
 - Delete with Detailed Confirmation
@@ -92,8 +91,7 @@ Select one or several assets from the table, and select an action from the menu:
 - Assign lifecycle state to selected Items
 - Generate QR/Barcodes for selected Items
 - Add tags to selected items
-  
-Click the **hammer icon** to execute the selected action. 
+- Set Custom Field Value
 
 <ThemedImage
   alt="Asset Actions menu options"

docs/infrastructure-management/devices/device-blade-chassis.mdx

@@ -10,7 +10,7 @@ import useBaseUrl from '@docusaurus/useBaseUrl'
 
 Locate your blade chassis in Device42 by navigating to **Resources > All Devices** and filtering for blade chassis devices:
 
-- Click **+ More** and select the **Blade Chassis** checkbox to display its dropdown menu.
+- Click **More Filters** and select the **Blade Chassis** checkbox to display its dropdown menu.
 - Choose **Yes** from the dropdown. 
 
 <ThemedImage
@@ -23,7 +23,7 @@ Locate your blade chassis in Device42 by navigating to **Resources > All Devices
 
 ## The Blades Tab
 
-Select a blade chassis from the Devices list page. Scroll down to the **Blades** tab, located below the device basic details section.
+Select a blade chassis from the Devices list page and, from the **Breakdown** panel on the right, click **Blades**.
 
 The **Blades** tab shows information about each device in the chassis. Blades are sorted by **Slot** number. Each blade has a link to its device page and displays its **Serial #**, **Asset #**, **Slot Location**, and **Hardware Model**.
 
@@ -37,7 +37,7 @@ The **Blades** tab shows information about each device in the chassis. Blades ar
 
 ### Add a New Blade 
 
-In device **Edit** mode, from the **Blade** tab, you can add blades to a chassis by clicking **+ Add New Blade**. The hardware model for the blade device must exist beforehand.
+In device **Edit** mode, from the **Blade** tab, you can add blades to a chassis by clicking **+ Add New**. The hardware model for the blade device must exist beforehand.
 
 <ThemedImage
   alt="Adding a new blade"
@@ -51,7 +51,7 @@ In device **Edit** mode, from the **Blade** tab, you can add blades to a chassis
 
 Layouts allow you to visualize blades within their chassis. The overall layout architecture is defined by the chassis [Hardware Model](#editing-hardware-models), which needs to be defined before you add and position specific blades. 
 
-From the view mode of the [device chassis page](#view-blade-chassis-devices), click the **ellipsis menu** and select **Layout** from the dropdown. 
+From the view mode of the [device chassis page](#view-blade-chassis-devices), click the **Layout** button.
 
 <ThemedImage
   alt="Device Layout button"
@@ -78,19 +78,17 @@ For blade-specific templating information, see the [Blade Slots documentation](d
 
 ### Editing Hardware Models
 
-To edit the layout of a blade, first define its Hardware Model under **Infrastructure > Hardware Models > + Add Device Hardware Model**. 
+To edit the layout of a blade, select its hardware model from the list page under **Infrastructure > Hardware Models** and click the **Model Layout** tab.
 
 <ThemedImage
   alt="Hardware Model menu"
   sources={{
-    light: useBaseUrl('/assets/images/device-blade-chassis/hardware-model-menu-light.png'),
-    dark: useBaseUrl('/assets/images/device-blade-chassis/hardware-model-menu-dark.png'),
+    light: useBaseUrl('/assets/images/device-blade-chassis/model-layout-tab-light.png'),
+    dark: useBaseUrl('/assets/images/device-blade-chassis/model-layout-tab-dark.png'),
   }}
 />
 
-You can find a link to an existing Hardware Model in the right panel of an individual **Layout**.
-
-Add a **New Slot** to an existing model by dragging it to the layout and filling in the fields:
+Turn on edit mode and add a **New Slot** to an existing model by dragging the slot box to the layout and filling in the fields:
 
 <ThemedImage
   alt="Add new blade"

docs/infrastructure-management/devices/device-blade-slots.mdx

@@ -10,7 +10,7 @@ A blade slot is a placeholder for a blade server in a blade chassis. You can add
 
 ## Create or Edit a Chassis Hardware Model 
 
-Navigate to **Infrastructure > Hardware Models** and select an existing hardware model or click **+ Add Device Hardware Model** to create a new one.
+Navigate to **Infrastructure > Hardware Models** and select an existing hardware model or click **Create** to create a new one.
 
 For **Physical Subtype**, choose **Rackable** or a similarly defined subtype to reveal the **Blade Host/Chassis** option and select it.
 
@@ -29,8 +29,8 @@ Scroll down to **Chassis Blade Slots** and add as many blade slots as necessary
 <ThemedImage
   alt="Add blade slots to chassis Hardware Model"
   sources={{
-    light: useBaseUrl('/assets/images/device-blade-slots/add-hardware-model-light.png'),
-    dark: useBaseUrl('/assets/images/device-blade-slots/add-hardware-model-dark.png'),
+    light: useBaseUrl('/assets/images/device-blade-slots/chassis-blade-slots-light.png'),
+    dark: useBaseUrl('/assets/images/device-blade-slots/chassis-blade-slots-dark.png'),
   }}
 />
 
@@ -63,7 +63,7 @@ Click **Turn ON** to enable edit mode, then drag and drop blade slots as desired
 
 The slots created when the Hardware Model was defined will appear in the left column under **Un-mapped Existing Blade Slots**.
 
-Toggle the grid background on or off using the **third semi-circle icon** to help you align the slots.
+Toggle the grid background on or off using the **Grid** icon to help you align the slots.
 
 <ThemedImage
   alt="Unmapped blade slots"
@@ -75,7 +75,7 @@ Toggle the grid background on or off using the **third semi-circle icon** to hel
 
 ### Editing a Blade Slot
 
-Double-click a blade slot to change the slot size, orientation, or number. 
+Double-click a blade slot or select it and click the **Pencil** icon to change the slot size, orientation, or number. 
 
 Note that parts cannot be placed into a blade slot; however, you can specify the height of the blade that occupies the slot.
 

docs/infrastructure-management/devices/device-cluster.mdx

@@ -12,7 +12,7 @@ A device cluster can be a server farm, an active-active cluster, an active-passi
 
 **Cluster** is one of the available device types, in addition to the **physical**, **virtual**, and **unknown** types. 
 
-To create a new cluster, navigate to **Resources > All Devices** and click **+ Add New Device**. Select **cluster** as the device **Type** to reveal the cluster-related options. 
+To create a new cluster, navigate to **Resources > All Devices** and click **Create**. Select **cluster** as the device **Type** to reveal the cluster-related options. 
 
 <ThemedImage
   alt="Adding a cluster-type device"
@@ -22,9 +22,7 @@ To create a new cluster, navigate to **Resources > All Devices** and click **+ A
   }}
 />
 
-Search for and select the devices you want to add to the cluster and move them across to the right-hand box using the **right arrow** button.
-
-Use the search box to narrow down the list of available devices and make it easy to select one among hundreds or thousands of devices. Add new devices using the **+ (plus sign)** button.
+Start typing in the **Devices in Cluster** field to narrow down the list of available devices and make it easy to select one among hundreds or thousands of devices. Add new devices using the **plus sign** button.
 
 <ThemedImage
   alt="Select devices for a cluster"

docs/infrastructure-management/devices/device-lifecycle-tab.mdx

@@ -6,41 +6,43 @@ sidebar_position: 7
 import ThemedImage from '@theme/ThemedImage'
 import useBaseUrl from '@docusaurus/useBaseUrl'
 
-## The LifeCycle Tab
+From version 19.05 of the Device42 UI onward, the **Lifecycle Tab** is only available using the device **Legacy** view. 
 
-Under the **Lifecycle tab** you can record and track asset lifecycle events, assign an asset QR code or barcode, and add purchasing information for a device. **Purchase/Support Info** includes fields to add **Vendor**, **Cost**, **Contract Type**, and **Service Type** details.
+In the device details view, from version 19.05 and later, the following sections have been moved from the **Lifecycle Tab** to the right-hand **Breakdown** panel:
+- **Asset Lifecycle**
+- **Purchase/Support Info**
+
+The **Device QR/Barcode** field is now under the **Details** section of the device details view.
 
 <ThemedImage
-  alt="The LifeCycle tab"
+  alt="The Breakdown panel"
   sources={{
-    light: useBaseUrl('/assets/images/device-lifecycle-tab/lifecycle-tab-light.png'),
-    dark: useBaseUrl('/assets/images/device-lifecycle-tab/lifecycle-tab-dark.png'),
+    light: useBaseUrl('/assets/images/device-lifecycle-tab/device-breakdown-panel-light.png'),
+    dark: useBaseUrl('/assets/images/device-lifecycle-tab/device-breakdown-panel-dark.png'),
   }}
-  style={{ width: '110%' }} 
 />
 
 ### Asset Lifecycle
 
-Provide the required details of **Date**, **Time**, and lifecycle **Event** to associate a new lifecycle event to the device. Optionally add an **End User** and related **Notes** and **Tags** to the event. Tags are useful for adding additional categories to manage your devices.
+Provide the required details of **Date**, **Time**, and lifecycle **Event** to associate a new lifecycle event with the device. Optionally add an **End User** and related **Notes** and **Tags** to the event. Tags are useful for adding additional categories to manage your devices.
 
-Add a new lifecycle event to the device using the **+ Add another Asset lifecycle** button. 
+Add a new lifecycle event to the device using the **+ Add New** button. 
 
 <ThemedImage
   alt="Asset lifecycle"
   sources={{
     light: useBaseUrl('/assets/images/device-lifecycle-tab/asset-lifecycle-event-light.png'),
     dark: useBaseUrl('/assets/images/device-lifecycle-tab/asset-lifecycle-event-dark.png'),
   }}
-  style={{ width: '110%' }} 
 />
 
-Some of the predefined **Events** have logic built-in. For example, you cannot choose **Checked Out** on a device or asset already checked out. Similarly, you can only select **Checked In** if the device is checked out.
+Some of the predefined **Events** have logic built in. For example, you cannot choose **Checked Out** on a device or asset already checked out. Similarly, you can only select **Checked In** if the device is checked out.
 
 To add logic to asset lifecycle **Events**, go to **Tools > Lifecycle Event Actions**.
 
 ### Add a New LifeCycle Event
 
-Define a custom lifecycle **Event** by clicking the **+** button near the **Events** dropdown menu.
+Define a custom lifecycle **Event** by clicking the **plus sign** button near the **Events** dropdown menu and then **Create** on the pop-up window. 
 
 <ThemedImage
   alt="Add new lifecycle event"
@@ -99,7 +101,7 @@ Enter purchase information related to the device under **Purchase/Support Info**
   }}
 />
 
-Add new **Purchase/Support Info** using the **+ Add New Purchase/Support Info** button.
+Add new **Purchase/Support Info** using the **+ Add New** button.
 
 <ThemedImage
   alt="Add new Purchase/Support Info"
@@ -109,4 +111,4 @@ Add new **Purchase/Support Info** using the **+ Add New Purchase/Support Info**
   }}
 />
 
-See [managing purchases](infrastructure-management/accounting/purchases.mdx) for more information.
+See [managing purchases](infrastructure-management/accounting/purchases.mdx) for more information.