Address change requests and unify warnings to be notes

Author: ToothyDev

discord/channel.py

@@ -1226,7 +1226,10 @@ async def edit(self, *, reason=None, **options):
         position: :class:`int`
             The new channel's position.
         nsfw: :class:`bool`
-            Whether the channel is marked as NSFW.
+            Whether the channel is marked as NSFW. Mutually exclusive with :attr:`spoiler`.
+
+            .. note::
+                Passing both this and ``spoiler`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
         sync_permissions: :class:`bool`
             Whether to sync permissions with the channel's new or pre-existing
             category. Defaults to ``False``.
@@ -1271,6 +1274,9 @@ async def edit(self, *, reason=None, **options):
 
             .. versionadded:: 2.9
 
+            .. note::
+                Passing both this and ``nsfw`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
+
         Returns
         -------
         Optional[:class:`.ForumChannel`]
@@ -1644,7 +1650,10 @@ async def edit(self, *, reason=None, **options):
         position: :class:`int`
             The new channel's position.
         nsfw: :class:`bool`
-            Whether the channel is marked as NSFW.
+            Whether the channel is marked as NSFW. Mutually exclusive with :attr:`spoiler`.
+
+            .. note::
+                Passing both this and ``spoiler`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
         sync_permissions: :class:`bool`
             Whether to sync permissions with the channel's new or pre-existing
             category. Defaults to ``False``.
@@ -1686,6 +1695,9 @@ async def edit(self, *, reason=None, **options):
 
             .. versionadded:: 2.9
 
+            .. note::
+                Passing both this and ``nsfw`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
+
         Returns
         -------
         Optional[:class:`.MediaChannel`]
@@ -2312,15 +2324,21 @@ async def edit(self, *, reason=None, **options):
             A value of `0` disables slowmode. The maximum value possible is `21600`.
 
         nsfw: :class:`bool`
-            Whether the channel is marked as NSFW.
+            Whether the channel is marked as NSFW. Mutually exclusive with :attr:`spoiler`.
 
             .. versionadded:: 2.7
 
+            .. note::
+                Passing both this and ``spoiler`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
+
         spoiler: :class:`bool`
             Whether the channel should be a spoiler channel. Mutually exclusive with :attr:`nsfw`.
 
             .. versionadded:: 2.9
 
+            .. note::
+                Passing both this and ``nsfw`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
+
         Returns
         -------
         Optional[:class:`.VoiceChannel`]

discord/guild.py

@@ -1553,7 +1553,7 @@ async def create_text_channel(
         nsfw: :class:`bool`
             Whether the channel is marked as NSFW.
 
-            .. warning::
+            .. note::
                 Passing both this and ``spoiler`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
 
         reason: Optional[:class:`str`]
@@ -1573,7 +1573,7 @@ async def create_text_channel(
 
             .. versionadded:: 2.9
 
-            .. warning::
+            .. note::
                 Passing both this and ``nsfw`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
 
         Returns
@@ -1930,15 +1930,15 @@ async def create_stage_channel(
 
             .. versionadded:: 2.7
 
-            .. warning::
+            .. note::
                 Passing both this and ``spoiler`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
 
         spoiler: :class:`bool`
             Whether the channel is marked as a spoiler channel.
 
             .. versionadded:: 2.9
 
-            .. warning::
+            .. note::
                 Passing both this and ``nsfw`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
 
         Returns
@@ -2100,7 +2100,7 @@ async def create_forum_channel(
         nsfw: :class:`bool`
             Whether the channel is marked as NSFW.
 
-            .. warning::
+            .. note::
                 Passing both this and ``spoiler`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
 
         reason: Optional[:class:`str`]
@@ -2136,7 +2136,7 @@ async def create_forum_channel(
 
             .. versionadded:: 2.9
 
-            .. warning::
+            .. note::
                 Passing both this and ``nsfw`` as ``True`` will mark the channel as NSFW and ignore the spoiler flag.
 
         Returns