saltstack · twangboy · Sep 1, 2026
@@ -341,7 +341,7 @@ jobs:
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
           git config --global user.name "Salt Project Packaging"
-          git config --global user.email saltproject-packaging@vmware.com
+          git config --global user.email saltproject.pdl@broadcom.com
 
       - name: Setup Pre-Commit
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

@@ -352,7 +352,7 @@ jobs:
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
           git config --global user.name "Salt Project Packaging"
-          git config --global user.email saltproject-packaging@vmware.com
+          git config --global user.email saltproject.pdl@broadcom.com
 
       - name: Setup Pre-Commit
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

@@ -405,7 +405,7 @@ jobs:
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
           git config --global user.name "Salt Project Packaging"
-          git config --global user.email saltproject-packaging@vmware.com
+          git config --global user.email saltproject.pdl@broadcom.com
 
       - name: Setup Pre-Commit
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

@@ -390,7 +390,7 @@ jobs:
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
           git config --global user.name "Salt Project Packaging"
-          git config --global user.email saltproject-packaging@vmware.com
+          git config --global user.email saltproject.pdl@broadcom.com
 
       - name: Setup Pre-Commit
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

@@ -364,7 +364,7 @@ jobs:
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
           git config --global user.name "Salt Project Packaging"
-          git config --global user.email saltproject-packaging@vmware.com
+          git config --global user.email saltproject.pdl@broadcom.com
 
       - name: Setup Pre-Commit
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

@@ -154,7 +154,7 @@
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
           git config --global user.name "Salt Project Packaging"
-          git config --global user.email saltproject-packaging@vmware.com
+          git config --global user.email saltproject.pdl@broadcom.com
 
       - name: Setup Pre-Commit
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

@@ -69,7 +69,7 @@ In addition to configuration management Salt can also:
 About our sponsors
 ==================
 
-Salt powers VMware by Broadcom's `Tanzu Salt`_
+Salt powers VMware by Broadcom's `VMware Salt`_
 (previously Aria Automation Config / vRealize Automation SaltStack Config / SaltStack Enterprise), and can be found
 under the hood of products from Juniper, Cisco, Cloudflare, Nutanix, SUSE, and
 Tieto, to name a few.
@@ -178,7 +178,7 @@ A complete list of attributions and dependencies can be found here:
 `salt/DEPENDENCIES.md <https://github.com/saltstack/salt/blob/master/DEPENDENCIES.md>`_
 
 .. _Salt Project Community Discord: https://discord.com/invite/J7b7EscrAs
-.. _Tanzu Salt: https://www.vmware.com/products/app-platform/tanzu-salt
+.. _VMware Salt: https://techdocs.broadcom.com/us/en/vmware-cis/other/vmware-salt/8-18.html
 .. _Latest Salt Documentation: https://docs.saltproject.io/en/latest/
 .. _Open an issue: https://github.com/saltstack/salt/issues/new/choose
 .. _SECURITY.md: https://github.com/saltstack/salt/blob/master/SECURITY.md
@@ -22,4 +22,4 @@ guidelines for filing bug reports:
 
 **Salt Project Support** - If you need dedicated, prioritized support, please
 consider taking a look at the Enterprise product:
-`Tanzu Salt <https://www.vmware.com/products/app-platform/tanzu-salt>`__
+`VMware Salt <https://techdocs.broadcom.com/us/en/vmware-cis/other/vmware-salt/8-18.html>`__
@@ -0,0 +1,16 @@
+Updated stale ``vmware.com`` references left over from the VMware acquisition by Broadcom:
+
+- Replaced dead/broken VMware documentation links (vSphere API reference pages, ESXCLI docs,
+  the Tanzu/VMware Salt product page, the privacy policy link) with their current
+  ``broadcom.com``/``developer.broadcom.com``/``techdocs.broadcom.com`` equivalents.
+- Removed a dead 2012 VMware blog link and a dead VMware Flings deep link, keeping the
+  surrounding explanatory text.
+- Removed personal ``@vmware.com`` addresses from ``:codeauthor:`` docstring attributions,
+  keeping the author names.
+- Switched the packaging automation email used in changelog generation and most CI workflows to
+  ``saltproject.pdl@broadcom.com`` going forward (historical changelog/spec entries are left
+  untouched as a record of what was true at the time). The release workflow, which GPG-signs
+  commits/tags, keeps ``saltproject-packaging@vmware.com`` until it's confirmed the signing key
+  has a UID for the new address, to avoid losing GitHub's commit verification.
+- In ``tools/changelog.py``, also renamed the changelog author from ``Salt Project Packaging`` to
+  ``Salt Project`` (there's no longer a separate packaging distro).
@@ -265,7 +265,7 @@
                                 <p><a href="https://saltproject.io/">saltproject.io</a></p>
 
                                 <div class="footer">
-                                    <p>© {{ copyright }} VMware, Inc. | <a href="https://www.vmware.com/help/privacy.html" target="_blank">Privacy Policy</a></p>
+                                    <p>© {{ copyright }} VMware, Inc. | <a href="https://www.broadcom.com/company/legal/privacy" target="_blank">Privacy Policy</a></p>
                                 </div>
                             </div>
                             <div class="col-sm-6">

@@ -542,7 +542,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
     Specify the guest id of the VM. For a full list of supported values see the
     VMware vSphere documentation:
 
-    https://code.vmware.com/apis?pid=com.vmware.wssdk.apiref.doc&release=vsphere-60&topic=vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
+    https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
 
     .. note::
 
@@ -566,27 +566,27 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
     Specify windows vm user's organization. Default organization name is Organization
    	VMware vSphere documentation:
 
-    https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html
+    https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.UserData.html
 
 ``win_user_fullname``
     Specify windows vm user's fullname. Default fullname is "Windows User"
    	VMware vSphere documentation:
 
-    https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html
+    https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.UserData.html
 
 ``plain_text``
 	Flag to specify whether or not the password is in plain text, rather than encrypted.
 	VMware vSphere documentation:
 
-	https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.Password.html
+	https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.Password.html
 
 ``win_installer``
     Specify windows minion client installer path
 
 ``win_run_once``
     Specify a list of commands to run on first login to a windows minion
 
-    https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.GuiRunOnce.html
+    https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.GuiRunOnce.html
 
 ``verify_ssl``
     Verify the vmware ssl certificate. The default is True.

@@ -97,7 +97,7 @@
 
     Please see the `vSphere Comparison`_ page for more information.
 
-.. _vSphere Comparison: https://www.vmware.com/products/vsphere/compare
+.. _vSphere Comparison: https://www.vmware.com/products/vsphere.html#compare
 
 
 About
@@ -1260,8 +1260,6 @@ def set_syslog_config(
         use for logging. Multiple log servers can be specified by listing them,
         comma-separated, but without spaces before or after commas.
 
-        (reference: https://blogs.vmware.com/vsphere/2012/04/configuring-multiple-syslog-servers-for-esxi-5.html)
-
     protocol
         Optionally set to alternate protocol if the host is not using the default
         protocol. Default protocol is ``https``.
@@ -8115,7 +8113,8 @@ def add_host_to_dvs(
     to vSphere, this will fail with an unhelpful "busy" error.
 
     There is, however, a Powershell PowerCLI cmdlet called Add-VDSwitchPhysicalNetworkAdapter
-    that does what we want.  I used Onyx (https://labs.vmware.com/flings/onyx)
+    that does what we want.  I used Onyx (search for it at
+    https://community.broadcom.com/flings/home)
     to sniff the SOAP stream from Powershell to our vSphere server and got
     this snippet out:
 

@@ -72,11 +72,10 @@
 the ESXCLI package be installed on the machine running the Proxy Minion process.
 
 The ESXCLI package is also referred to as the VMware vSphere CLI, or vCLI. VMware
-provides vCLI package installation instructions for `vSphere 5.5`_ and
-`vSphere 6.0`_.
+provides the `ESXCLI command reference`_ for current installation and usage
+instructions.
 
-.. _vSphere 5.5: http://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html
-.. _vSphere 6.0: http://pubs.vmware.com/vsphere-60/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html
+.. _ESXCLI command reference: https://developer.broadcom.com/xapis/esxcli-command-reference/latest/
 
 Once all of the required dependencies are in place and the vCLI package is
 installed, you can check to see if you can connect to your ESXi host or vCenter

@@ -83,7 +83,7 @@
 
     Please see the `vSphere Comparison`_ page for more information.
 
-.. _vSphere Comparison: https://www.vmware.com/products/vsphere/compare
+.. _vSphere Comparison: https://www.vmware.com/products/vsphere.html#compare
 
 About
 -----
@@ -949,8 +949,6 @@ def syslog_configured(
         logging. Multiple log servers can be specified by listing them,
         comma-separated, but without spaces before or after commas
 
-        (reference: https://blogs.vmware.com/vsphere/2012/04/configuring-multiple-syslog-servers-for-esxi-5.html)
-
     firewall
         Enable the firewall rule set for syslog. Defaults to ``True``.
 

@@ -53,11 +53,10 @@
 writing, no other functions in this module rely on ESXCLI.
 
 The ESXCLI package is also referred to as the VMware vSphere CLI, or vCLI. VMware
-provides vCLI package installation instructions for `vSphere 5.5`_ and
-`vSphere 6.0`_.
+provides the `ESXCLI command reference`_ for current installation and usage
+instructions.
 
-.. _vSphere 5.5: http://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html
-.. _vSphere 6.0: http://pubs.vmware.com/vsphere-60/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html
+.. _ESXCLI command reference: https://developer.broadcom.com/xapis/esxcli-command-reference/latest/
 
 Once all of the required dependencies are in place and the vCLI package is
 installed, you can check to see if you can connect to your ESXi host or vCenter
@@ -905,8 +904,10 @@ def get_content(
     """
     Returns the content of the specified type of object for a Service Instance.
 
-    For more information, please see:
-    http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.pg.doc_50%2FPG_Ch5_PropertyCollector.7.6.html
+    For more information, please see the ``PropertyCollector`` reference in the
+    `vSphere Web Services API`_ documentation.
+
+    .. _vSphere Web Services API: https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/
 
     service_instance
         The Service Instance from which to obtain content.

@@ -1,6 +1,6 @@
 """
     :codeauthor: Nicole Thomas <nicole@saltstack.com>
-    :codeauthor: Gareth J. Greenaway <greenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 import pytest

@@ -1,5 +1,5 @@
 """
-:codeauthor: Gareth J. Greenaway (ggreenaway@vmware.com)
+:codeauthor: Gareth J. Greenaway
 """
 
 import logging

@@ -3,7 +3,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :codeauthor: Erik Johnson <erik@saltstack.com>
-    :codeauthor: David Murphy <damurphy@vmware.com>
+    :codeauthor: David Murphy
 """
 
 import errno

@@ -24,7 +24,7 @@
 ``latest/api/token`` on that 401, caches the token in ``__context__``, and
 sends it with every subsequent metadata query.
 
-:codeauthor: :email: `Gareth J. Greenaway <ggreenaway@vmware.com>`
+:codeauthor: Gareth J. Greenaway
 """
 
 import logging

@@ -2,7 +2,7 @@
     Unit test for salt.grains.metadata_azure
 
 
-    :codeauthor: :email" `Vishal Gupta <guvishal@vmware.com>
+    :codeauthor: Vishal Gupta
 
 """
 

@@ -2,7 +2,7 @@
     Unit test for salt.grains.metadata_gce
 
 
-    :codeauthor: :email" `Thomas Phipps <tphipps@vmware.com>
+    :codeauthor: Thomas Phipps
 
 """
 

@@ -1,5 +1,5 @@
 """
-    :codeauthor: :email:`David Murphy <damurphy@vmware.com>`
+    :codeauthor: David Murphy
 """
 
 import logging

@@ -1,5 +1,5 @@
 """
-    :codeauthor: :email:`Gareth J. Greenaway <ggreenaway@vmware.com>`
+    :codeauthor: Gareth J. Greenaway
 """
 
 import logging

@@ -1,5 +1,5 @@
 """
-    :codeauthor: Gareth J. Greenaway <ggreenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 import pytest

@@ -1,5 +1,5 @@
 """
-    :codeauthor: Gareth J. Greenaway <ggreenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 import pytest

@@ -1,5 +1,5 @@
 """
-    :codeauthor: Gareth J. Greenaway <ggreenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 import os

@@ -1,7 +1,7 @@
 """
     Test cases for salt.pillar.etcd_pillar
 
-    :codeauthor: Caleb Beard <calebb@vmware.com>
+    :codeauthor: Caleb Beard
 """
 
 import pytest

@@ -1,7 +1,7 @@
 """
     Test cases for salt.returners.etcd_return
 
-    :codeauthor: Caleb Beard <calebb@vmware.com>
+    :codeauthor: Caleb Beard
 """
 
 import copy

@@ -1,5 +1,5 @@
 """
-    :codeauthor: Gareth J. Greenaway <ggreenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 import pytest

@@ -6,7 +6,7 @@
     If the contents of this state were to add more logic besides
     essentially acting as a wrapper, then functional tests would be required.
 
-    :codeauthor: Caleb Beard <calebb@vmware.com>
+    :codeauthor: Caleb Beard
 """
 
 import pytest

@@ -1,6 +1,6 @@
 """
     :codeauthor: Jayesh Kariya <jayeshk@saltstack.com>
-    :codeauthor: Gareth J. Greenaway <ggreenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 from collections import OrderedDict

@@ -1,5 +1,5 @@
 """
-    :codeauthor: Gareth J. Greenaway <ggreenaway@vmware.com>
+    :codeauthor: Gareth J. Greenaway
 """
 
 import logging

@@ -109,7 +109,9 @@ def update_rpm(ctx: Context, salt_version: Version, draft: bool = False):
     ).stdout.decode()
     dt = datetime.datetime.utcnow()
     date = dt.strftime("%a %b %d %Y")
-    header = f"* {date} Salt Project Packaging <saltproject-packaging@vmware.com> - {str_salt_version}\n"
+    header = (
+        f"* {date} Salt Project <saltproject.pdl@broadcom.com> - {str_salt_version}\n"
+    )
     parts = orig.split("%changelog")
     tmpspec = "pkg/rpm/salt.spec.1"
     with open(tmpspec, "w", encoding="utf-8") as wfp:
@@ -158,9 +160,7 @@ def update_deb(ctx: Context, salt_version: Version, draft: bool = False):
     with open(tmp_debian_changelog_path, "w", encoding="utf-8") as wfp:
         wfp.write(f"salt ({salt_version}) stable; urgency=medium\n\n")
         wfp.write(formated)
-        wfp.write(
-            f"\n -- Salt Project Packaging <saltproject-packaging@vmware.com>  {date}\n\n"
-        )
+        wfp.write(f"\n -- Salt Project <saltproject.pdl@broadcom.com>  {date}\n\n")
         with open(debian_changelog_path, encoding="utf-8") as rfp:
             wfp.write(rfp.read())
     try:

@@ -487,7 +487,7 @@ def pypi_upload(ctx: Context, files: list[pathlib.Path], test: bool = False):
 def configure_git(
     ctx: Context,
     user: str = "Salt Project Packaging",
-    email: str = "saltproject-packaging@vmware.com",
+    email: str = "saltproject.pdl@broadcom.com",
 ):
     cwd = pathlib.Path.cwd()
     ctx.info("Setting name and email in git global config")
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
         Unit test for salt.grains.metadata_azure
-        :codeauthor: :email" `Vishal Gupta <guvishal@vmware.com>
+        :codeauthor: Vishal Gupta
     """
@@ Expand Down @@