[Bf-docboard-svn] bf-manual: [9847] Merge branch 'blender-3.4-release'

[Aaron Carlisle]

Revision: 9847
          https://developer.blender.org/rBM9847
Author:   Blendify
Date:     2023-01-06 23:07:09 +0100 (Fri, 06 Jan 2023)
Log Message:
-----------
Merge branch 'blender-3.4-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/getting_started/installing/linux_windowing_environment.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2023-01-06 22:05:45 UTC (rev 9846)
+++ trunk/blender_docs	2023-01-06 22:07:09 UTC (rev 9847)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -4,5 +4,5 ##
 /branches/blender-3.1-release/blender_docs:8904-9238
 /branches/blender-3.2-release/blender_docs:9236-9417
 /branches/blender-3.3-release/blender_docs:9438-9611
-/branches/blender-3.4-release/blender_docs:9673-9788,9796
+/branches/blender-3.4-release/blender_docs:9673-9846
 /trunk/blender_docs:9673-9675
\ No newline at end of property
Modified: trunk/blender_docs/manual/getting_started/installing/linux_windowing_environment.rst
===================================================================
--- trunk/blender_docs/manual/getting_started/installing/linux_windowing_environment.rst	2023-01-06 22:05:45 UTC (rev 9846)
+++ trunk/blender_docs/manual/getting_started/installing/linux_windowing_environment.rst	2023-01-06 22:07:09 UTC (rev 9847)
@@ -6,7 +6,7 @@
 
 On Linux Blender supports both X11 and Wayland for official releases.
 
-When Wayland is detected, is is the preferred system, otherwise X11 will be used.
+When Wayland is detected, it is the preferred system, otherwise X11 will be used.
 
 .. hint::