Merge pull request #4180 from nekomeowww/dev/fix-docs

docs: remove conflict marker and fixed the incorrect edit link editor

docs/docs/cluster-issues.md

@@ -1,24 +1,20 @@
-<<<<<<< HEAD:docs/docs/cluster-issues.md
 # Troubleshooting Connections
 
-Welcome to the Monokle troubleshooting guide for cluster connections. 
-=======
-# Welcome to the Monokle Troubleshooting Guide for Cluster Connections. 
->>>>>>> main:docs/cluster-issues.md
+Welcome to the Monokle troubleshooting guide for cluster connections.
 
-This page will provide you with two methods to help resolve any issues you may be experiencing when attempting to connect to your Kubernetes clusters through the Monokle app.  
-The first method involves using the in-app proxy setting, while the second method involves manually configuring a proxy using the kubectl command.  
+This page will provide you with two methods to help resolve any issues you may be experiencing when attempting to connect to your Kubernetes clusters through the Monokle app.
+The first method involves using the in-app proxy setting, while the second method involves manually configuring a proxy using the kubectl command.
 
-1. Using the Proxy setting in Monokle 
-    - Within the Monokle application, navigate to the Settings panel and go to the "Global Settings" section. 
-    - Click on the checkbox for "Enable Proxy". 
+1. Using the Proxy setting in Monokle
+    - Within the Monokle application, navigate to the Settings panel and go to the "Global Settings" section.
+    - Click on the checkbox for "Enable Proxy".
     - This setting will start a proxy to the Kubernetes API server before connecting to the cluster, which can be helpful for advanced authentication setups.
 
-or 
+or
 
 2. Starting a Proxy server manually
-    - If the proxy setting does not resolve the issue, you can try using a proxy manually. 
-    - To do this, run the command "kubectl proxy --port=**PROXY_PORT**" in a terminal, replacing **PROXY_PORT** with the port you would like to open the proxy on. 
+    - If the proxy setting does not resolve the issue, you can try using a proxy manually.
+    - To do this, run the command "kubectl proxy --port=**PROXY_PORT**" in a terminal, replacing **PROXY_PORT** with the port you would like to open the proxy on.
     - Next, create a kubeconfig file in any location on your local system, using the following format:
       ```yaml
       apiVersion: v1
@@ -37,7 +33,7 @@ or
       ```
     - Remember to replace **PROXY_PORT** with the same port you've used to open the proxy.
     - In the Monokle application, open the Settings panel and navigate to the KUBECONFIG setting under Project Settings.
-    - Browse for the file you've created and select it to be used by Monokle. The Cluster Selector in the header should be updated with the new "proxy" context. 
+    - Browse for the file you've created and select it to be used by Monokle. The Cluster Selector in the header should be updated with the new "proxy" context.
     - Try connecting to the cluster again to see if the problem persists.
 
 

docs/docusaurus.config.js

@@ -46,7 +46,7 @@ const config = {
           sidebarPath: require.resolve('./sidebars.js'),
           // Please change this to your repo.
           // Remove this to remove the "edit this page" links.
-          editUrl: `https://github.com/${organizationName}/${projectName}/tree/main/`,
+          editUrl: `https://github.com/${organizationName}/${projectName}/edit/main/docs/`,
         },
         blog: false,
         theme: {