diff --git a/docs/index.rst b/docs/index.rst
index 307f858e..87889587 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,11 +31,11 @@ on **Windows** and **Mac**.
 
         Use advanced features such as:
 
+        * xlwings Server (self-hosted): no local Python required
+        * xlwings Reports: work with templates
         * 1-click installer: bundle Python and all your packages
         * Embedded code: easy deployment
         * Ultra fast file reader: no Excel required
-        * xlwings Reports: work with templates
-        * xlwings Server: no local Python required
         * No more VBA: Call Python from Office Scripts and Office.js
         * Excel on the web & Google Sheets
 
diff --git a/docs/pro/server/index.rst b/docs/pro/server/index.rst
index 9547d0a9..f9236181 100644
--- a/docs/pro/server/index.rst
+++ b/docs/pro/server/index.rst
@@ -1,5 +1,5 @@
-xlwings Server
-==============
+xlwings Server (self-hosted)
+============================
 
 .. toctree::
     :maxdepth: 2
@@ -10,7 +10,7 @@ xlwings Server
     officejs_custom_functions
     server_authentication
 
-xlwings Server turns the Python dependency into a web app that runs on the server (in the form of a serverless function, a fully managed container, etc.). It can be used from various clients:
+xlwings Server is a self-hosted and privacy-compliant solution that turns the Python dependency into a web app running on *your own* server (in the form of a serverless function, a fully managed container, etc.). Unlike Microsoft's *Python in Excel* solution, xlwings Server is not restricted to Office 365 but also works with the permanent versions of Office such as Office 2016 and Office 2021. It can be used from various clients:
 
 * **VBA**: Desktop Excel (Windows and macOS)
 * **Office Scripts**: Desktop Excel (Windows and macOS) and Excel on the web
diff --git a/docs/whatsnew.rst b/docs/whatsnew.rst
index 62de8d11..1c251483 100644
--- a/docs/whatsnew.rst
+++ b/docs/whatsnew.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v0.30.11 (Aug 26, 2023)
+-----------------------
+
+* :bdg-warning:`Bug Fix` Enabled a conflict-free co-existence with Microsoft's new Python in Excel feature as xlwings was internally also using ``=PY()``. This requires that you re-import your User-defined functions (UDFs) (:issue:`2319`).
+* :bdg-danger:`Breaking Change` xlwings Server: The ``@pro`` decorators have been deprecated in favor of ``@server`` decorators, so e.g., functions are now decorated with ``@server.func`` instead of ``@pro.func``. The latter keeps working though for now (:issue:`2320`).
+
 v0.30.10 (Jun 23, 2023)
 -----------------------