Merged main into live

Author: mijacobs

docs/extensibility/visualstudio.extensibility/toc.yml

@@ -31,10 +31,6 @@ items:
     href: ./command/menus-and-toolbars.md
 - name: Editor
   items:
-  - name: Editor concepts
-    href: ./editor/editor-concepts.md
-  - name: Editor RPC
-    href: ./editor/editor-rpc.md
   - name: Extending the editor
     href: ./editor/editor.md
   - name: Walkthroughs
@@ -46,7 +42,11 @@ items:
       - name: Extending Visual Studio editor with a new margin
         href: ./editor/walkthroughs/textview-margin.md  
       - name: Extending Visual Studio editor with a new CodeLens
-        href: ./editor/walkthroughs/codelens.md    
+        href: ./editor/walkthroughs/codelens.md  
+  - name: Editor concepts
+    href: ./editor/editor-concepts.md
+  - name: Editor RPC
+    href: ./editor/editor-rpc.md  
 - name: Documents
   href: ./document/documents.md
 - name: Output window