based on Jason's feedback

Author: mjang

content/nginx-one/api/_index.md

@@ -1,13 +1,17 @@
 ---
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Automate with the NGINX One API
 =======
 title: NGINX One API
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)
 =======
 title: Automation with the NGINX One API
 >>>>>>> 614bafed (more)
+=======
+title: Automate with the NGINX One API
+>>>>>>> 4da8aa7e (based on Jason's feedback)
 description:
 weight: 700
 url: /nginx-one/api

content/nginx-one/certificates/manage-certificates.md

@@ -193,5 +193,5 @@ To convert these cerificates to managed, start with the Certificates menu, and s
 ## See also
 
 - [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
+- [Add an instance]({{< ref "/nginx-one/nginx-configs/add-instance.md" >}})
 - [Add a file in a configuration]({{< ref "/nginx-one/nginx-configs/add-file.md" >}})

content/nginx-one/config-sync-groups/add-file-csg.md

@@ -63,5 +63,5 @@ With this option, You can incorporate [Managed certificates]({{< ref "/nginx-one
 ## See also
 
 - [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
+- [Add an NGINX instance]({{< ref "/nginx-one/nginx-configs/add-instance.md" >}})
 - [Manage certificates]({{< ref "/nginx-one/certificates/manage-certificates.md" >}})

content/nginx-one/config-sync-groups/manage-config-sync-groups.md

@@ -258,4 +258,4 @@ Monitor the **Config Sync Status** column. It can help you ensure that your conf
 ## See also
 
 - [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
+- [Add an NGINX instance]({{< ref "/nginx-one/nginx-configs/add-instance.md" >}})

content/nginx-one/nginx-configs/_index.md

@@ -3,6 +3,7 @@ description:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Manage your NGINX instances
 =======
 title: Organize your NGINX instances
@@ -13,6 +14,9 @@ title: Watch your NGINX instances
 =======
 title: Access and connect to your NGINX instances
 >>>>>>> 614bafed (more)
+=======
+title: Manage your NGINX instances
+>>>>>>> 4da8aa7e (based on Jason's feedback)
 weight: 300
 url: /nginx-one/nginx-configs
 ---

content/nginx-one/nginx-configs/add-file.md

@@ -76,6 +76,6 @@ Enter the name of the desired configuration file, such as `abc.conf` and select
 - [Manage certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md" >}})
 =======
 - [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
+- [Add an NGINX instance]({{< ref "/nginx-one/nginx-configs/add-instance.md" >}})
 - [Manage certificates]({{< ref "/nginx-one/certificates/manage-certificates.md" >}})
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)

content/nginx-one/nginx-configs/view-edit-nginx-configurations.md

@@ -1,11 +1,15 @@
 ---
 # We use sentence case and present imperative tone
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: View and edit an NGINX instance
 # Weights are assigned in increments of 100: determines sorting order
 weight: 200
 =======
 title: View and edit NGINX configurations
+=======
+title: View and edit an NGINX instance
+>>>>>>> 4da8aa7e (based on Jason's feedback)
 # Weights are assigned in increments of 100: determines sorting order
 weight: 300
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)
@@ -18,6 +22,7 @@ product: NGINX One
 ---
 <!-- Possible future include, with similar files in config-sync-groups/ and staged-configs/ subdirectories -->
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 This guide explains how to edit the configuration of an existing **Instance** in your NGINX One Console.
 =======
@@ -33,6 +38,9 @@ Before you add **Instances** to NGINX One Console, ensure:
 
 Once you've registered your NGINX Instances with the F5 NGINX One Console, you can view and edit their NGINX configurations on the **Instances** details page.
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)
+=======
+This guide explains how to edit the configuration of an existing **Instance** in your NGINX One Console.
+>>>>>>> 4da8aa7e (based on Jason's feedback)
 
 To view and edit an NGINX configuration, follow these steps:
 

content/nginx-one/rbac/_index.md

@@ -1,10 +1,14 @@
 ---
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Organize users with RBAC
 description:
 weight: 600
 =======
 title: Organize your administrators with RBAC
+=======
+title: Organize administrators with RBAC
+>>>>>>> 4da8aa7e (based on Jason's feedback)
 description:
 weight: 500
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)

content/nginx-one/staged-configs/_index.md

@@ -2,6 +2,7 @@
 description:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Draft new configurations
 weight: 400
 url: /nginx-one/staged-configs
@@ -10,6 +11,9 @@ title: Set up new instances
 =======
 title: Draft new instances
 >>>>>>> 614bafed (more)
+=======
+title: Draft new instances (Staged Configuration)
+>>>>>>> 4da8aa7e (based on Jason's feedback)
 weight: 200
 url: /nginx-one/how-to/staged-configs
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)