summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2024-01-27 18:23:23 -0700
committerGitHub <noreply@github.com>2024-01-27 18:23:23 -0700
commit55f9eb0bb0b72fe60ecde7529edbc27aceade187 (patch)
tree1e34614ff9be1c59ad6a2ebb1f4e8bc2a17c6c1d /docs
parent19ae96b97ea055c2e36c8fb86819c426b37ab6af (diff)
parentfd42b0c8d08f69f88e3728b1c1ff3f50071f4b30 (diff)
downloadpyramid-55f9eb0bb0b72fe60ecde7529edbc27aceade187.tar.gz
pyramid-55f9eb0bb0b72fe60ecde7529edbc27aceade187.tar.bz2
pyramid-55f9eb0bb0b72fe60ecde7529edbc27aceade187.zip
Merge pull request #3735 from adroullier/script_info
Adding script name to 'global_config' during application setup
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/startup.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index 37825d2da..27970ed88 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -101,7 +101,9 @@ Here's a high-level time-ordered overview of what happens when you press
Note that the constructor function accepts a ``global_config`` argument,
which is a dictionary of key/value pairs mentioned in the ``[DEFAULT]``
section of an ``.ini`` file (if :ref:`[DEFAULT]
- <defaults_section_of_pastedeploy_file>` is present). It also accepts a
+ <defaults_section_of_pastedeploy_file>` is present) and the executing
+ script name ``__script__`` like ``pserve``, ``prequest`` or ``pshell``.
+ It also accepts a
``**settings`` argument, which collects another set of arbitrary key/value
pairs. The arbitrary key/value pairs received by this function in
``**settings`` will be composed of all the key/value pairs that are present