Skip to content

Commit 29b1384

Browse files
authored
Fixes #669 - Merge environment variables pages
1 parent 6ab8948 commit 29b1384

File tree

17 files changed

+420
-555
lines changed

17 files changed

+420
-555
lines changed

admin/console.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ It allows you to run several commands inside it.
9191
available.
9292

9393
However, it's possible to start rails console in safe mode by setting
94-
:ref:`a special environment variable <safe_mode>`. With
95-
``ZAMMAD_SAFE_MODE=1`` set, availability of these services will be ignored.
94+
the environment variable ``ZAMMAD_SAFE_MODE=1``. With this setting enabled,
95+
the availability of these services will be ignored.
9696

9797
.. tabs::
9898

api/ticket.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ For better overview, they have been split into different sections:
1616
/api/ticket/states
1717
/api/ticket/tags
1818
/api/ticket/index
19-
/api/ticket/ticket-summary
2019
/api/ticket/timeaccounting

api/ticket/ticket-summary.rst

Lines changed: 0 additions & 52 deletions
This file was deleted.

appendix/backup-and-restore/add-missing-environment.include.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
If you've set any environmental settings like higher web concurrency
2-
due to required :ref:`performance_tuning`, please re-apply your settings now.
2+
due to required :ref:`performance-tuning`, please re-apply your
3+
settings now.
34

45
If not already done, please install Elasticsearch now (if you want to use it).
56
Follow :ref:`configure_zammad_with_elasticsearch` to reconfigure your

appendix/backup-and-restore/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ or availability:
100100
:doc:`here </appendix/migrate-to-postgresql>` how to manually switch
101101
databases.
102102
* System settings (like
103-
:doc:`environment variables </appendix/configure-env-vars>`) are
103+
:doc:`environment variables </appendix/environment-variables>`) are
104104
not backed up.
105105
* Restore to an older Zammad version is not possible.
106106
* **Do not** restore backup files from custom scripts with the

appendix/backup-and-restore/migrate-hosts.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ note this in the relevant parts.
1919
received an attachment dump! 🤓
2020

2121
Step 1: Note down your environmental adjustments
22-
This mainly affects :ref:`performance tuning settings <performance_tuning>`.
23-
This will be important after restoring.
22+
This mainly affects :ref:`performance-tuning` via environment variables and
23+
will be important after restoring.
2424

2525
Step 2: Install Zammad on the destination host
2626
For the easiest restoration path possible, please install the same version

appendix/configure-env-vars.rst

Lines changed: 0 additions & 260 deletions
This file was deleted.

0 commit comments

Comments
 (0)