From 016008e097594067d07deec6a696c70d8602053c Mon Sep 17 00:00:00 2001
From: Falk David <falk@blender.org>
Date: Tue, 15 Oct 2024 13:04:50 +0200
Subject: [PATCH 1/2] Formatting

---
 .../keyconfig/keymap_data/blender_default.py   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py
index dd8d13942ee..aa99147ca81 100644
--- a/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -3770,7 +3770,8 @@ def km_grease_pencil_paint_mode(params):
         op_menu("GREASE_PENCIL_MT_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}),
 
         # Merge Down
-        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS', "ctrl": True, "shift": True}, {"properties": [("mode", 'ACTIVE')]}),
+        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS',
+         "ctrl": True, "shift": True}, {"properties": [("mode", 'ACTIVE')]}),
 
         op_tool_optional(
             ("grease_pencil.interpolate", {"type": 'E', "value": 'PRESS', "ctrl": True}, None),
@@ -3893,7 +3894,8 @@ def km_grease_pencil_edit_mode(params):
         op_menu("GREASE_PENCIL_MT_move_to_layer", {"type": 'M', "value": 'PRESS'}),
 
         # Merge Down
-        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS', "ctrl": True, "shift": True},  {"properties": [("mode", 'ACTIVE')]}),
+        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS',
+         "ctrl": True, "shift": True}, {"properties": [("mode", 'ACTIVE')]}),
 
         # Edit Lines overlay
         ("wm.context_toggle", {"type": 'Q', "value": 'PRESS', "shift": True},
@@ -3985,7 +3987,8 @@ def km_grease_pencil_sculpt_mode(params):
          {"properties": [("type", "ALL_FRAMES")]}),
 
         # Merge Down
-        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS', "ctrl": True, "shift": True},  {"properties": [("mode", 'ACTIVE')]}),
+        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS',
+         "ctrl": True, "shift": True}, {"properties": [("mode", 'ACTIVE')]}),
 
         # Copy/paste
         ("grease_pencil.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None),
@@ -4000,7 +4003,8 @@ def km_grease_pencil_sculpt_mode(params):
         op_menu("GREASE_PENCIL_MT_layer_active", {"type": 'Y', "value": 'PRESS'}),
 
         # Automasking menu
-        op_menu_pie("VIEW3D_MT_grease_pencil_sculpt_automasking_pie", {"type": 'A', "value": 'PRESS', "shift": True, "alt": True}),
+        op_menu_pie("VIEW3D_MT_grease_pencil_sculpt_automasking_pie", {
+                    "type": 'A', "value": 'PRESS', "shift": True, "alt": True}),
 
         *_template_paint_radial_control("gpencil_sculpt_paint"),
         op_asset_shelf_popup(
@@ -4051,7 +4055,8 @@ def km_grease_pencil_weight_paint(params):
         op_menu("GREASE_PENCIL_MT_layer_active", {"type": 'Y', "value": 'PRESS'}),
 
         # Merge Down
-        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS', "ctrl": True, "shift": True},  {"properties": [("mode", 'ACTIVE')]}),
+        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS',
+         "ctrl": True, "shift": True}, {"properties": [("mode", 'ACTIVE')]}),
 
         # Keyframe Menu
         op_menu("VIEW3D_MT_edit_greasepencil_animation", {"type": 'I', "value": 'PRESS'}),
@@ -4134,7 +4139,8 @@ def km_grease_pencil_vertex_paint(params):
         op_menu("GREASE_PENCIL_MT_layer_active", {"type": 'Y', "value": 'PRESS'}),
 
         # Merge Down
-        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS', "ctrl": True, "shift": True},  {"properties": [("mode", 'ACTIVE')]}),
+        ("grease_pencil.layer_merge", {"type": 'M', "value": 'PRESS',
+         "ctrl": True, "shift": True}, {"properties": [("mode", 'ACTIVE')]}),
 
         # Keyframe Menu
         op_menu("VIEW3D_MT_edit_greasepencil_animation", {"type": 'I', "value": 'PRESS'}),

From 888473b0642df8d4eb11b00b74bdc1e690bfa158 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <thomas@blender.org>
Date: Tue, 15 Oct 2024 13:15:15 +0200
Subject: [PATCH 2/2] Readme: Update various links.

---
 release/text/readme.html | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/release/text/readme.html b/release/text/readme.html
index 1338a14480b..0fcf612ed91 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -106,33 +106,30 @@
         <a href="https://docs.blender.org/manual/en/latest/">
           <span class="s4">https://docs.blender.org/manual/en/latest/</span>
         </a><br>
-        User Forum <a href="https://www.blenderartists.org/">
-          <span class="s4">www.blenderartists.org</span>
+        User Community <a href="https://www.blender.org/community/">
+          <span class="s4">https://www.blender.org/community/</span>
         </a><br>
         Chat
-        <a href="https://blender.chat/channel/today">
-          <span class="s4">#today</span>
-        </a> or
-        <a href="https://blender.chat/channel/support">
-          <span class="s4">#support</span>
-        </a> on blender.chat
+        <a href="https://chat.blender.org/#/room/#general:blender.org">
+          <span class="s4">#general</span>
+        </a>
       </span>
     </p>
     <p class="p4">Developers:</p>
     <p class="p5">
       <span class="s3">
         Development
-        <a href="https://www.blender.org/get-involved/developers/">
-          <span class="s4">www.blender.org/get-involved/developers/</span>
+        <a href="https://developer.blender.org/">
+          <span class="s4">https://developer.blender.org/</span>
         </a><br>
         GIT and Bug Tracker
         <a href="https://projects.blender.org/">
           <span class="s4">projects.blender.org</span>
         </a><br>
         Chat
-        <a href="https://blender.chat/channel/blender-coders">
+        <a href="https://chat.blender.org/#/room/#blender-coders:blender.org">
           <span class="s4">#blender-coders</span>
-        </a> on blender.chat
+        </a> on chat.blender.org
       </span>
     </p>
     <p class="p2"><br></p>