Skip to content

Commit 3537b16

Browse files
committed
Screenshot fix, ask for trust fix and crossref fix
1 parent 8095435 commit 3537b16

3 files changed

Lines changed: 11 additions & 22 deletions

File tree

docs/user_manual/expressions/expression.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ To create a new function:
361361
Custom Python functions stored as Project functions can be easily shared
362362
by sharing the project file where they were saved.
363363
When opening a project with project functions, QGIS can load or ignore them
364-
depending on whether :ref:`embedded Python code is enabled <load_project_code>`.
364+
depending on whether :ref:`embedded Python code is enabled <project_trust>`.
365365

366366
A new item is added in the left panel of the :guilabel:`Function Editor` tab.
367367

-29.1 KB
Loading

docs/user_manual/introduction/qgis_configuration.rst

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,6 @@ displayed at the bottom of the frame.
139139
version of QGIS`. You can always open projects created with older version of
140140
QGIS but once the project is saved, trying to open with older release may fail
141141
because of features not available in that version.
142-
143-
.. _load_project_code:
144-
145-
* :guilabel:`Enable project's embedded Python code` |selectString|. This option
146-
handles execution of macros that are written to perform an action on project
147-
events, as well as custom Python functions to be used as expressions. You can
148-
choose between 'Never', 'Ask', 'For this session only' and
149-
'Always (not recommended)'.
150142
* :guilabel:`Default paths`: defines whether paths to files and layers used
151143
in new projects are stored as 'Absolute' or 'Relative' to the project file.
152144
This setting can be overwritten at the project level.
@@ -183,8 +175,16 @@ contained within. Trust cannot be granted to individual scripts.
183175
* :guilabel:`Never Ask for Trust`: no request for project trust is made;
184176
undetermined or already denied projects have their embedded scripts blocked.
185177
Only trusted projects or folders have their embedded scripts executed.
186-
* :guilabel:`Ask for Trust`: QGIS will display a trust dialog (see :numref:`figure_security_prompt`) listing all embedded scripts and
187-
prompt you to allow or deny execution.
178+
* :guilabel:`Ask for trust`: QGIS displays a trust dialog listing all embedded scripts
179+
and prompts you to allow or deny their execution. This is the default behavior.
180+
181+
.. _figure_security_prompt:
182+
183+
.. figure:: img/security_prompt.png
184+
:align: center
185+
186+
Security Prompt for Project Trust
187+
188188
* :guilabel:`Always Execute (Not recommended)`: enable execution of all embedded scripts;
189189
not recommended because it bypasses all safety checks and can run untrusted or malicious code without prompting.
190190

@@ -200,17 +200,6 @@ contained within. Trust cannot be granted to individual scripts.
200200
|symbologyRemove|:sup:`Remove denied project or folder` buttons to
201201
maintain the list.
202202

203-
When opening a project containing embedded scripts and whose trust state is
204-
not yet known, QGIS will present a trust dialog. The dialog shows all embedded
205-
code blocks and allows you to preview them before deciding whether to trust the
206-
project.
207-
208-
.. _figure_security_prompt:
209-
210-
.. figure:: img/security_prompt.png
211-
:align: center
212-
213-
Security Prompt for Project Trust
214203

215204
.. index:: Environment variables
216205
.. _`env_options`:

0 commit comments

Comments
 (0)