Merge branch '6.0' into fix-broken-refs

Author: stevepiercy

docs/classic-ui/images.md

@@ -199,15 +199,15 @@ Or you can get the HTML tag back, and replace the current tag with it:
 
 ```xml
 <div tal:define="scale_view context/@@images">
-  <img tal:replace="structured python: scale_view.tag('image', 'mini')">
+  <img tal:replace="structure python: scale_view.tag('image', 'mini')">
 </div>
 ```
 
 You can also provide the following keyword arguments to set `title`, `alt`, or `css_class` for the generated tag:
 
 ```xml
 <div tal:define="scale_view context/@@images">
-  <img tal:replace="structured python: scale_view.tag('banner', 'mini', title='The Banner', alt='Alternative text', css_class='banner')">
+  <img tal:replace="structure python: scale_view.tag('banner', 'mini', title='The Banner', alt='Alternative text', css_class='banner')">
 </div>
 ```
 

docs/install/install-from-packages.md

@@ -179,6 +179,12 @@ Install the latest Yarn 3 version (not the Classic 1.x one) using `npm`.
     ```console
     3.2.3
     ```
+    
+    If you do not see a version of Yarn 3, then try the following to set the active version.
+    
+    ```shell
+    yarn set version 3.x
+    ```
 
 
 (install-prerequisites-make-label)=