master-port 51949 and 51996

doc/ref/engines/all/index.rst

@@ -11,7 +11,6 @@ engine modules
     :template: autosummary.rst.tmpl
 
     docker_events
-    hipchat
     http_logstash
     ircbot
     junos_syslog

doc/ref/modules/all/index.rst

@@ -171,7 +171,6 @@ execution modules
     hashutil
     heat
     hg
-    hipchat
     hosts
     http
     ifttt

doc/ref/returners/all/index.rst

@@ -19,7 +19,6 @@ returner modules
     elasticsearch_return
     etcd_return
     highstate_return
-    hipchat_return
     influxdb_return
     kafka_return
     librato_return

doc/ref/states/all/index.rst

@@ -115,7 +115,6 @@ state modules
     group
     heat
     hg
-    hipchat
     host
     http
     icinga2

doc/topics/releases/neon.rst

@@ -3,3 +3,35 @@
 ==================================
 Salt Release Notes - Codename Neon
 ==================================
+
+Deprecations
+============
+
+Module Deprecations
+-------------------
+
+- The hipchat module has been removed due to the service being retired.
+  :py:func:`Google Chat <salt.modules.google_chat>`,
+  :py:func:`MS Teams <salt.modules.msteams>`, or
+  :py:func:`Slack <salt.modules.slack_notify>` may be suitable replacements.
+
+
+State Deprecations
+------------------
+
+- The hipchat state has been removed due to the service being retired.
+  :py:func:`MS Teams <salt.states.msteams>` or
+  :py:func:`Slack <salt.states.slack>` may be suitable replacements.
+
+Engine Removal
+--------------
+
+- The hipchat engine has been removed due to the service being retired. For users migrating
+  to Slack, the :py:func:`slack <salt.engines.slack>` engine may be a suitable replacement.
+
+Returner Removal
+----------------
+
+- The hipchat returner has been removed due to the service being retired. For users migrating
+  to Slack, the :py:func:`slack <salt.returners.slack_returner>` returner may be a suitable
+  replacement.