qgis · DelazJ · Dec 13, 2024 · Dec 5, 2024 · Dec 5, 2024 · Dec 5, 2024
diff --git a/docs/user_manual/print_composer/composer_items/composer_items_options.rst b/docs/user_manual/print_composer/composer_items/composer_items_options.rst
@@ -280,6 +280,11 @@ QGIS allows advanced rendering for layout items just like vector and raster laye
 * |checkbox| :guilabel:`Exclude item from exports`: Combined with data-defined expressions,
   you can decide to make an item invisible in some exports.
   After activating this checkbox, the item will not be included in export to PDF, print etc..
+* :guilabel:`Geospatial PDF group`: When set, a matching layer tree group will be created
+  in the exported Geospatial PDF and the item will only be visible when this group is checked.
+  This allows content to be selectively displayed as a group by viewers of the Geospatial PDF.
+  E.g., it can allow extra layout content such as descriptive labels or legends to only be shown
+  when layers from the group are visible, making the file export much more flexible.
 
 Variables
 .........

diff --git a/docs/user_manual/print_composer/composer_items/composer_label.rst b/docs/user_manual/print_composer/composer_items/composer_label.rst
@@ -119,9 +119,16 @@ Appearance
 
   * :guilabel:`Left`, :guilabel:`Center`, :guilabel:`Right` or
     :guilabel:`Justify` for :guilabel:`Horizontal alignment`
-  * and :guilabel:`Top`, :guilabel:`Middle`, :guilabel:`Bottom` for
+  * and :guilabel:`Top`, :guilabel:`Vertical Center`, :guilabel:`Bottom` for
     :guilabel:`Vertical alignment`.
 
+.. _figure_layout_label_appearance:
+
+.. figure:: img/label_appearance.png
+   :align: center
+
+   Label Item Appearance Properties
+
 .. _layout_label_expressions:
 
 Exploring expressions in a label item

diff --git a/docs/user_manual/print_composer/composer_items/composer_scale_bar.rst b/docs/user_manual/print_composer/composer_items/composer_scale_bar.rst
@@ -86,6 +86,11 @@ provides the functionalities to set the units of display and some text formattin
   QGIS locale, or when you would like to vary the style from the locale
   defaults (e.g. adding thousands separators when the locale default is to hide
   them).
+* Select the :guilabel:`Method` for scale bar calculation: Depending on the map CRS and extent,
+  the distance reported in the scale bar may not be the same measured over the map.
+  This option lets you specify the method you would like to use:
+  :guilabel:`Average Top, Middle and Bottom Scales`, :guilabel:`Calculate along Top of Map`,
+  :guilabel:`Calculate along Middle of Map` or :guilabel:`Calculate along Bottom of Map`.
 
 Segments
 --------
@@ -119,27 +124,26 @@ subdivisions (see :numref:`figure_layout_scalebar_segments`):
 * :guilabel:`Subdivision height` is used to define the height of the subdivision
   segment.
 
-Display
---------
+Appearance
+----------
 
-The :guilabel:`Display` group of the scale bar :guilabel:`Item Properties`
+The :guilabel:`Appearance` group of the scale bar :guilabel:`Item Properties`
 panel provides the following functionalities:
 
-.. _figure_layout_scalebar_display:
+.. _figure_layout_scalebar_appearance:
 
-.. figure:: img/scalebar_display.png
+.. figure:: img/scalebar_appearance.png
    :align: center
 
-   Scale Bar Display group
+   Scale Bar Appearance group
 
 You can define how the scale bar will be displayed in its frame.
 
 * :guilabel:`Box margin` : space between text and frame borders
 * :guilabel:`Label margin` : space between text and scale bar drawing
-* :guilabel:`Vertical label placement`: it can be above or below the scale bar
-  segment
-* :guilabel:`Horizontal label placement`: which would be centered at the scale
-  bar segment's edge or center
+* :guilabel:`Distance label placement` defines the position of the text relative to the scale bar segments:
+  :guilabel:`Above Segment Edges`, :guilabel:`Above Segment Centers`,
+  :guilabel:`Below Segment Edges` or :guilabel:`Below Segment Centers`
 * :guilabel:`Primary fill` and :guilabel:`Secondary fill` of the scale bar
   drawing using :ref:`fill symbols properties <vector_fill_symbols>`
   (color, opacity, patterns, effects...) --- for *Single Box*, *Double Box*

diff --git a/docs/user_manual/print_composer/composer_items/img/label_appearance.png b/docs/user_manual/print_composer/composer_items/img/label_appearance.png
diff --git a/docs/user_manual/print_composer/composer_items/img/rendering_mode.png b/docs/user_manual/print_composer/composer_items/img/rendering_mode.png
diff --git a/docs/user_manual/print_composer/composer_items/img/scalebar_appearance.png b/docs/user_manual/print_composer/composer_items/img/scalebar_appearance.png
diff --git a/docs/user_manual/print_composer/composer_items/img/scalebar_display.png b/docs/user_manual/print_composer/composer_items/img/scalebar_display.png
diff --git a/docs/user_manual/print_composer/composer_items/img/scalebar_properties.png b/docs/user_manual/print_composer/composer_items/img/scalebar_properties.png
diff --git a/docs/user_manual/print_composer/composer_items/img/scalebar_units.png b/docs/user_manual/print_composer/composer_items/img/scalebar_units.png
diff --git a/docs/user_manual/print_composer/create_output.rst b/docs/user_manual/print_composer/create_output.rst
@@ -284,6 +284,9 @@ To export a layout as PDF:
    * :guilabel:`Include vector feature information` (choose the layers and
      group them into logical PDF groups).
 
+     .. When expanding on the Geospatial PDF description,
+      mention also the "Geospatial PDF group" property of layout items?
+
 .. note:: Exporting a print layout to formats that supports georeferencing
    (e.g. ``PDF`` and ``TIFF``) creates a georeferenced output by default.
 

diff --git a/docs/user_manual/print_composer/overview_composer.rst b/docs/user_manual/print_composer/overview_composer.rst
@@ -244,13 +244,14 @@ with some convenient information.
  :menuselection:`Layouts -->`
  :guilabel:`Layout Properties...`                                                                        :ref:`layout_panel`
  :guilabel:`Rename Layout...`
+ :guilabel:`Page Properties...`                                                                          :ref:`page_properties`
  |newPage| :guilabel:`Add Pages...`                                           :guilabel:`Layout`         :ref:`page_properties`
  |fileOpen| :guilabel:`Add Items from Template`                               :guilabel:`Layout`         :ref:`create_layout_item`
  |fileSaveAs| :guilabel:`Save as Template...`                                 :guilabel:`Layout`         :ref:`layout_manager`
  |saveMapAsImage| :guilabel:`Export as Image...`                              :guilabel:`Layout`         :ref:`export_layout_image`
  |saveAsSVG| :guilabel:`Export as SVG...`                                     :guilabel:`Layout`         :ref:`export_layout_svg`
  |saveAsPDF| :guilabel:`Export as PDF...`                                     :guilabel:`Layout`         :ref:`export_layout_pdf`
- :guilabel:`Page Setup...`                         :kbd:`Ctrl+Shift+P`
+ :guilabel:`Printer Page Setup...`                 :kbd:`Ctrl+Shift+P`
  |filePrint| :guilabel:`Print...`                  :kbd:`Ctrl+P`              :guilabel:`Layout`         :ref:`create-output`
  :guilabel:`Close`                                 :kbd:`Ctrl+Q`
 ================================================= ========================== ========================== =====================================
@@ -646,8 +647,12 @@ Updating page properties
 ........................
 
 Any page can be later customized through the Page :guilabel:`Item Properties` panel.
-To access a page's properties, left-click on an empty section of the page
-or right-click on a page and select :guilabel:`Page Properties...`.
+To access a page's properties, either:
+
+* Left-click on an empty section of the page
+* Right-click on a page and select :guilabel:`Page Properties...`.
+* Go to :menuselection:`Layout --> Page properties...` while hovering over the page
+
 The :guilabel:`Item Properties` panel opens with settings such as:
 
 * for layouts with several pages, it displays the active page number