Merge branch 'main' of github.com:Mainstay-Noah-Huppert/coder into main

Mainstay-Noah-Huppert · Mainstay-Noah-Huppert · commit 338cf1c6a803 · 2022-07-28T16:13:31.000Z
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -32,7 +32,7 @@
           "title": "GitHub OAuth",
           "description": "Learn how to set up OAuth using your GitHub organization.",
           "path": "./install/oauth.md"
-        } 
+        }
       ]
     },
     {
@@ -84,6 +84,11 @@
           "title": "Configuring Web IDEs",
           "description": "Learn how to configure web IDEs in your templates",
           "path": "./ides/configuring-web-ides.md"
+        },
+        {
+          "title": "Configuring Emacs (with TRAMP)",
+          "description": "Learn how to configure Emacs in Coder",
+          "path": "./ides/configuring-emacs-tramp.md"
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"title": "GitHub OAuth",`
`33`	`33`	`"description": "Learn how to set up OAuth using your GitHub organization.",`
`34`	`34`	`"path": "./install/oauth.md"`
`35`		`- }`
	`35`	`+ }`
`36`	`36`	`]`
`37`	`37`	`},`
`38`	`38`	`{`
`@@ -84,6 +84,11 @@`
`84`	`84`	`"title": "Configuring Web IDEs",`
`85`	`85`	`"description": "Learn how to configure web IDEs in your templates",`
`86`	`86`	`"path": "./ides/configuring-web-ides.md"`
	`87`	`+ },`
	`88`	`+ {`
	`89`	`+ "title": "Configuring Emacs (with TRAMP)",`
	`90`	`+ "description": "Learn how to configure Emacs in Coder",`
	`91`	`+ "path": "./ides/configuring-emacs-tramp.md"`
`87`	`92`	`}`
`88`	`93`	`]`
`89`	`94`	`},`