.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve Oh My Zsh
-labels: 'Type: support'
+about: Create a report to help us improve
 
 ---
 
@@ -11,26 +10,29 @@ an issue where no sections have been filled will be deleted without comment.
 -->
 
 **Describe the bug**
-A clear description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 **To Reproduce**
-Steps to reproduce the behavior, for example:
-1. Enable this plugin '...'
-2. Run command '...' or try the autocomplete command '...'
+<!--
+Steps to reproduce the behavior:
+1. Enable plugin '...'
+2. Run command '...', _or_ try to complete command '...', _etc._
 3. See error
+-->
 
 **Expected behavior**
-A brief description of what should happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
-**Screenshots and/or Recordings**
-If applicable, add screenshots to help explain your problem.
-You can also record an asciinema session: https://asciinema.org/
+**Screenshots or recordings**
+<!--
+If applicable, add screenshots or record an asciinema session (https://asciinema.org/)
+to help explain your problem.
+-->
 
-**Desktop (please complete the following information):**
- - OS / Distro: [e.g. Arch Linux, macOS]
- - Latest ohmyzsh Update?: [e.g. Yes/No]
- - ZSH Version: [e.g. 5.6]
+**System:**
+ - OS: [e.g. macOS]
+ - Zsh version [e.g. 5.6]
  - Terminal emulator [e.g. iTerm2]
 
 **Additional context**
-Add any other context about the problem here. This can be themes, plugins, custom configs.
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,16 +11,16 @@ an issue where no sections have been filled will be deleted without comment.
 -->
 
 **Is your feature request related to a particular plugin or theme? If so, specify it.**
-The name of the plugin or theme that you would like us to improve. [...]
+<!-- The name of the plugin or theme you'd like us to improve. -->
 
 **Is your feature request related to a problem? Please describe.**
-A description of what the problem is. Ex. I'm always frustrated when [...]
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
-A description of what you want to happen.
+<!-- A clear and concise description of what you want to happen. -->
 
 **Describe alternatives you've considered**
-A description of any alternative solutions or features you've considered. This can also include other plugins or aliases.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/support.md

@@ -5,6 +5,8 @@ labels: 'Type: support'
 
 ---
 
+<!--
 1. Look for similar issues already posted (including closed ones)
 2. Include as much relevant information as possible
 3. Try to make sure the issue is due to Oh My Zsh
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-## Standards checklist:
-
-- [ ] The PR title is descriptive.
-- [ ] The PR doesn't replicate another PR which is already open.
-- [ ] I have read the contribution guide and followed all the instructions.
-- [ ] The code follows the code style guide detailed in the wiki.
-- [ ] The code is mine or it's from somewhere with an MIT-compatible license.
-- [ ] The code is efficient, to the best of my ability, and does not waste computer resources.
-- [ ] The code is stable and I have tested it myself, to the best of my abilities.
-
-## Changes:
-
-- [...]
-
-## Other comments:
-
-...

plugins/kube-ps1/README.md

@@ -55,8 +55,6 @@ plugins=(
 
 # After the "source Oh My Zsh" line
 PROMPT=$PROMPT'$(kube_ps1) '
-# Or in double quotes, don't forget to escape
-PROMPT=$PROMPT"\$(kube_ps1) "
 ```
 
 Note: The `PROMPT` example above was tested with the theme `robbyrussell`.

plugins/systemd/systemd.plugin.zsh

@@ -1,65 +1,12 @@
 user_commands=(
-  cat
-  get-default
-  help
-  is-active
-  is-enabled
-  is-failed
-  is-system-running
-  list-dependencies
-  list-jobs
-  list-sockets
-  list-timers
-  list-unit-files
-  list-units
-  show
-  show-environment
-  status)
+  list-units is-active status show help list-unit-files
+  is-enabled list-jobs show-environment cat list-timers)
 
 sudo_commands=(
-  add-requires
-  add-wants
-  cancel
-  daemon-reexec
-  daemon-reload
-  default
-  disable
-  edit
-  emergency
-  enable
-  halt
-  hibernate
-  hybrid-sleep
-  import-environment
-  isolate
-  kexec
-  kill
-  link
-  list-machines
-  load
-  mask
-  poweroff
-  preset
-  preset-all
-  reboot
-  reenable
-  reload
-  reload-or-restart
-  reset-failed
-  rescue
-  restart
-  revert
-  set-default
-  set-environment
-  set-property
-  start
-  stop
-  suspend
-  switch-root
-  try-reload-or-restart
-  try-restart
-  unmask
-  unset-environment)
+  start stop reload restart try-restart isolate kill
+  reset-failed enable disable reenable preset mask unmask
+  link load cancel set-environment unset-environment
+  edit)
 
 for c in $user_commands; do; alias sc-$c="systemctl $c"; done
 for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done