more

Author: mjang

content/nginx-one/api/_index.md

@@ -1,9 +1,13 @@
 ---
 <<<<<<< 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)
 description:
 weight: 700
 url: /nginx-one/api

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

@@ -2,13 +2,17 @@
 description:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Manage your NGINX instances
 =======
 title: Organize your NGINX instances
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)
 =======
 title: Watch your NGINX instances
 >>>>>>> 09d8a53f (More)
+=======
+title: Access and connect to your NGINX instances
+>>>>>>> 614bafed (more)
 weight: 300
 url: /nginx-one/nginx-configs
 ---

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

@@ -1,11 +1,15 @@
 ---
 description:
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Draft new configurations
 weight: 400
 url: /nginx-one/staged-configs
 =======
 title: Set up new instances
+=======
+title: Draft new instances
+>>>>>>> 614bafed (more)
 weight: 200
 url: /nginx-one/how-to/staged-configs
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)