From 56ad1ec942d09bf9f1bb1c5f1ef2ccabfd130b47 Mon Sep 17 00:00:00 2001
From: jeanluc <lkubb@protonmail.com>
Date: Mon, 18 Dec 2023 11:13:51 +0100
Subject: [PATCH] Fix saltext vault/pushover docs

* the correct organization is `salt-extensions`, not `saltstack`
* the release file is strict GitHub-flavoured Markdown only
---
 changelog/64893.deprecated.md                    | 2 +-
 doc/topics/releases/templates/3007.0.md.template | 5 ++---
 salt/modules/pushover_notify.py                  | 2 +-
 salt/returners/pushover_returner.py              | 2 +-
 salt/states/pushover.py                          | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/changelog/64893.deprecated.md b/changelog/64893.deprecated.md
index 50c1a1d4e0a..efb81505f9d 100644
--- a/changelog/64893.deprecated.md
+++ b/changelog/64893.deprecated.md
@@ -1 +1 @@
-Deprecate all the Vault modules in favor of the Vault Salt Extension https://github.com/saltstack/saltext-vault. The Vault modules will be removed in Salt core in 3009.0.
+Deprecate all the Vault modules in favor of the Vault Salt Extension https://github.com/salt-extensions/saltext-vault. The Vault modules will be removed in Salt core in 3009.0.
diff --git a/doc/topics/releases/templates/3007.0.md.template b/doc/topics/releases/templates/3007.0.md.template
index 6e6d36dc190..0fe99124cbe 100644
--- a/doc/topics/releases/templates/3007.0.md.template
+++ b/doc/topics/releases/templates/3007.0.md.template
@@ -68,9 +68,8 @@ peer_run:
 Please see the [Vault execution module docs](https://docs.saltproject.io/en/3007.0/ref/modules/all/salt.modules.vault.html) for
 details and setup instructions regarding AppRole issuance.
 
-.. note::
-  The Vault modules are being moved to a [Salt extension](https://github.com/salt-extensions/saltext-vault), but this improvement
-  has still been merged into core for a smoother transition.
+Note: The Vault modules are being moved to a [Salt extension](https://github.com/salt-extensions/saltext-vault),
+but this improvement has still been merged into core for a smoother transition.
 
 <!--
 Do not edit the changelog below.
diff --git a/salt/modules/pushover_notify.py b/salt/modules/pushover_notify.py
index ceab51c655e..a3448b80dcc 100644
--- a/salt/modules/pushover_notify.py
+++ b/salt/modules/pushover_notify.py
@@ -28,7 +28,7 @@ __virtualname__ = "pushover"
 __deprecated__ = (
     3009,
     "pushover",
-    "https://github.com/saltstack/saltext-pushover",
+    "https://github.com/salt-extensions/saltext-pushover",
 )
 
 
diff --git a/salt/returners/pushover_returner.py b/salt/returners/pushover_returner.py
index f3cd867deab..cb590edfad0 100644
--- a/salt/returners/pushover_returner.py
+++ b/salt/returners/pushover_returner.py
@@ -94,7 +94,7 @@ __virtualname__ = "pushover"
 __deprecated__ = (
     3009,
     "pushover",
-    "https://github.com/saltstack/saltext-pushover",
+    "https://github.com/salt-extensions/saltext-pushover",
 )
 
 
diff --git a/salt/states/pushover.py b/salt/states/pushover.py
index 5b44542439f..46c9150b822 100644
--- a/salt/states/pushover.py
+++ b/salt/states/pushover.py
@@ -30,7 +30,7 @@ The api key can be specified in the master or minion configuration like below:
 __deprecated__ = (
     3009,
     "pushover",
-    "https://github.com/saltstack/saltext-pushover",
+    "https://github.com/salt-extensions/saltext-pushover",
 )