From 1beebb9fa101715a8949e74e7147da1fc1a1f663 Mon Sep 17 00:00:00 2001
From: Lauryn Menard <lauryn@zulip.com>
Date: Tue, 23 May 2023 19:18:59 +0200
Subject: [PATCH] api-changelog: Update feature level 168 entry and changes
 notes.

Original API changelog entry from commit ae72777c77.
---
 api_docs/changelog.md     |  8 ++++----
 zerver/openapi/zulip.yaml | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/api_docs/changelog.md b/api_docs/changelog.md
index bd66265216..7e8c832b1d 100644
--- a/api_docs/changelog.md
+++ b/api_docs/changelog.md
@@ -153,10 +153,10 @@ format used by the Zulip server that they are interacting with.
 
 **Feature level 168**
 
-* [`PATCH /realm/user_settings_defaults`](/api/update-realm-user-settings-defaults),
-  [`POST /register`](/api/register-queue),
-  [`PATCH /settings`](/api/update-settings): Replaced the `realm_name_in_notifications`
-  boolean field with an integer field `realm_name_in_email_notifications_policy`.
+* [`POST /register`](/api/register-queue), [`PATCH /settings`](/api/update-settings),
+  [`PATCH /realm/user_settings_defaults`](/api/update-realm-user-settings-defaults):
+  Replaced the boolean user setting `realm_name_in_notifications`
+  with an integer `realm_name_in_email_notifications_policy`.
 
 **Feature level 167**
 
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 43c3467432..4b792385f4 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -9708,7 +9708,8 @@ paths:
         - name: realm_name_in_email_notifications_policy
           in: query
           description: |
-            Whether to [include organization name in subject of message notification emails](/help/email-notifications#include-organization-name-in-subject-line).
+            Whether to [include organization name in subject of message notification
+            emails](/help/email-notifications#include-organization-name-in-subject-line).
 
             - 1 - Automatic
             - 2 - Always
@@ -11765,7 +11766,8 @@ paths:
                           realm_name_in_email_notifications_policy:
                             type: integer
                             description: |
-                              Whether to [include organization name in subject of message notification emails](/help/email-notifications#include-organization-name-in-subject-line).
+                              Whether to [include organization name in subject of message notification
+                              emails](/help/email-notifications#include-organization-name-in-subject-line).
 
                               - 1 - Automatic
                               - 2 - Always
@@ -12177,12 +12179,14 @@ paths:
                           See [PATCH /settings](/api/update-settings) for details on
                           the meaning of this setting.
 
-                          **Changes**: Deprecated `realm_name_in_notifications` in Zulip 5.0 (feature level 89).
-                          Replaced `realm_name_in_notifications` boolean with
-                          `realm_name_in_email_notifications_policy` in Zulip 7.0 (feature level 168);
-                          `true` corresponded to `Always`, and `false` to `Never`.
+                          **Changes**: In Zulip 7.0 (feature level 168), replaced previous
+                          `realm_name_in_notifications` global notifications setting with
+                          `realm_name_in_email_notifications_policy`.
 
-                          Clients connecting to newer servers should declare the `user_settings_object`
+                          **Deprecated** since Zulip 5.0 (feature level 89); both
+                          `realm_name_in_notifications` and the newer
+                          `realm_name_in_email_notifications_policy` are deprecated. Clients
+                          connecting to newer servers should declare the `user_settings_object`
                           client capability and access the `user_settings` object instead.
                       presence_enabled:
                         deprecated: true
@@ -13714,7 +13718,8 @@ paths:
                           realm_name_in_email_notifications_policy:
                             type: integer
                             description: |
-                              Whether to [include organization name in subject of message notification emails](/help/email-notifications#include-organization-name-in-subject-line).
+                              Whether to [include organization name in subject of message notification
+                              emails](/help/email-notifications#include-organization-name-in-subject-line).
 
                               - 1 - Automatic
                               - 2 - Always
@@ -14909,7 +14914,8 @@ paths:
         - name: realm_name_in_email_notifications_policy
           in: query
           description: |
-            Whether to [include organization name in subject of message notification emails](/help/email-notifications#include-organization-name-in-subject-line).
+            Whether to [include organization name in subject of message notification
+            emails](/help/email-notifications#include-organization-name-in-subject-line).
 
             - 1 - Automatic
             - 2 - Always