Merge #21428 docs: naming conventions, guidelines

3 files changed, 25 insertions, 25 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5fd7bc37b6..8795a7306c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,15 +6,14 @@ body:
   - type: markdown
     attributes:
       value: |
-        _Before reporting:_ search [existing issues](https://github.com/neovim/neovim/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ). Usage questions such as "How do I...?" belong on the [Neovim Discourse](https://neovim.discourse.group/c/7-category/7) and will be closed.
+        _Before reporting:_ search [existing issues](https://github.com/neovim/neovim/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ). Usage or "How to" questions belong on the [stackoverflow](https://vi.stackexchange.com/) and will be closed.
 
   - type: textarea
     attributes:
-      label: "Describe the bug"
+      label: "Problem"
       description: "Describe the current behavior. May include logs, images, or videos."
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: "Steps to reproduce"
@@ -27,7 +26,6 @@ body:
         yiwp
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: "Expected behavior"
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 1e717ba6c5..f25732f90d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Question
-    url: https://neovim.discourse.group/
+    url: https://vi.stackexchange.com/
     about: Ask questions about configuration and usage of Neovim
diff --git a/.github/ISSUE_TEMPLATE/lsp_bug_report.yml b/.github/ISSUE_TEMPLATE/lsp_bug_report.yml
index f453d3864e..bdad12e412 100644
--- a/.github/ISSUE_TEMPLATE/lsp_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/lsp_bug_report.yml
@@ -6,27 +6,14 @@ body:
   - type: markdown
     attributes:
       value: |
-        _Before reporting:_ search [existing issues](https://github.com/neovim/neovim/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ). Usage questions such as "How do I...?" or "Why isn't X language server/feature working?" belong on the [Neovim Discourse](https://neovim.discourse.group/c/7-category/7) and will be closed.
+        _Before reporting:_ search [existing issues](https://github.com/neovim/neovim/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ). Usage questions or "Why isn't X language server/feature working?" belong on [stackoverflow](https://vi.stackexchange.com/) and will be closed.
 
-  - type: input
-    attributes:
-      label: "Neovim version (nvim -v)"
-      placeholder: "0.6.0 commit db1b0ee3b30f"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Language server name/version"
-      placeholder: "rls 0.5.2"
-    validations:
-      required: true
-  - type: input
+  - type: textarea
     attributes:
-      label: "Operating system/version"
-      placeholder: "emacs 23"
+      label: "Problem"
+      description: "Describe the bug caused by the Nvim LSP client."
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: 'Steps to reproduce using "nvim -u minimal_init.lua"'
@@ -65,14 +52,29 @@ body:
         _Note_: if the issue is with an autocompletion or other LSP plugin, report to that plugin's issue tracker.
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: "Expected behavior"
       description: "Describe the behavior you expect. May include logs, images, or videos."
-  - type: textarea
+
+  - type: input
+    attributes:
+      label: "Neovim version (nvim -v)"
+      placeholder: "0.6.0 commit db1b0ee3b30f"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: "Language server name/version"
+      placeholder: "rls 0.5.2"
+    validations:
+      required: true
+  - type: input
     attributes:
-      label: "Actual behavior"
+      label: "Operating system/version"
+      placeholder: "emacs 23"
+    validations:
+      required: true
 
   - type: input
     attributes: