Fix merge conflicts

ngrok · Sep 19, 2024 · fb2ec39 · fb2ec39
1 parent 8d13538
commit fb2ec39
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/docs/guides/index.md b/docs/guides/index.md
@@ -27,7 +27,18 @@ Here you will find a set of guides to help you with common (and not so common) t
 | [Webhook Testing](webhook-testing)     | Learn how to use ngrok for webhook testing                                                  |
 
 ## Other Guides
+| Name                                                                                                            | Description                                                                                 |
+|-----------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| [Free Plan Limits](other-guides/limits.md)                                                                      | Learn about the resources available on our free seat-based plan                             |
+| [Licensing](other-guides/licensing.md)                                                                          | Explore frequently asked questions about ngrok licensing and plan limits                    |
+| [Upgrading to Agent v3](other-guides/upgrade-v2-v3.md)                                                          | Learn about new features and breaking changes when upgrading from ngrok Agent v2 to v3 |
+| [Secure Developer Productivity](other-guides/security-dev-productivity)                                         | Learn best security practices securing your ngrok account to enhance developer productivity |
+| [Securing ngrok](other-guides/securing-your-tunnels.md)                                                         | Explore best practices for securing your ngrok tunnels                                      |
+| [Corporate Firewall](other-guides/running-behind-firewalls.md)                                                  | Run ngrok behing your corporate firewall                                                    |
+| [Using Mutual TLS (mTLS) Authentication](other-guides/using-mtls-authentication.md)                             | Quick Start guide for enabling mTLS on your ngrok endpoints                                 |
+| [Configure Okta Single Sign-On (SSO)](other-guides/dashboard-sso-okta-setup.md)                                 | Add SSO via Okta to your ngrok account                                                      |
+| [Load Balancing with ngrok Cloud Edges](other-guides/load-balancing-with-cloud-edges.md)                        | Configure load balancing with ngrok cloud Edges                                             |
+| [Round Robin Load Balancing](other-guides/hot-to-round-robin-load-balance-with-ngrok-cloud-edges.mdx)           | Configure round robin load balancing with ngrok cloud Edges                                 |
+| [Weighted Round Robin Load Balancing](other-guides/how-to-do-weighted-load-balancing-with-ngrok-cloud-edges.md) | Configure weighted load balancing with ngrok cloud Edges                                    |
+| [Using Labels with ngrok](other-guides/using-labels-within-ngrok.md)                                            | Learn how to ngrok Labels |
 
-| Name                                       | Description                                                     |
-| ------------------------------------------ | --------------------------------------------------------------- |
-| [Free Plan Limits](other-guides/limits.md) | Learn about the resources available on our free seat-based plan |
diff --git a/docs/guides/other-guides/index.mdx b/docs/guides/other-guides/index.mdx
@@ -6,3 +6,18 @@ title: Other Guides
 # Other Guides
 
 This section provides additional guides for using ngrok.
+| Name                                                                                                            | Description                                                                                 |
+|-----------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| [Free Plan Limits](other-guides/limits.md)                                                                      | Learn about the resources available on our free seat-based plan                             |
+| [Licensing](other-guides/licensing.md)                                                                          | Explore frequently asked questions about ngrok licensing and plan limits                    |
+| [Upgrading to Agent v3](other-guides/upgrade-v2-v3.md)                                                          | Learn about new features and breaking changes when upgrading from ngrok Agent v2 to v3 |
+| [Secure Developer Productivity](other-guides/security-dev-productivity)                                         | Learn best security practices securing your ngrok account to enhance developer productivity |
+| [Securing ngrok](other-guides/securing-your-tunnels.md)                                                         | Explore best practices for securing your ngrok tunnels                                      |
+| [Corporate Firewall](other-guides/running-behind-firewalls.md)                                                  | Run ngrok behing your corporate firewall                                                    |
+| [Using Mutual TLS (mTLS) Authentication](other-guides/using-mtls-authentication.md)                             | Quick Start guide for enabling mTLS on your ngrok endpoints                                 |
+| [Configure Okta Single Sign-On (SSO)](other-guides/dashboard-sso-okta-setup.md)                                 | Add SSO via Okta to your ngrok account                                                      |
+| [Load Balancing with ngrok Cloud Edges](other-guides/load-balancing-with-cloud-edges.md)                        | Configure load balancing with ngrok cloud Edges                                             |
+| [Round Robin Load Balancing](other-guides/hot-to-round-robin-load-balance-with-ngrok-cloud-edges.mdx)           | Configure round robin load balancing with ngrok cloud Edges                                 |
+| [Weighted Round Robin Load Balancing](other-guides/how-to-do-weighted-load-balancing-with-ngrok-cloud-edges.md) | Configure weighted load balancing with ngrok cloud Edges                                    |
+| [Using Labels with ngrok](other-guides/using-labels-within-ngrok.md)                                            | Learn how to ngrok Labels |
+