Skip to content

Commit b0dde51

Browse files
authored
Fixes #716 - Fix/align names and wording
1 parent b9b2038 commit b0dde51

27 files changed

+122
-122
lines changed

admin/console.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Console
22
=======
33

4-
Zammad uses Ruby on Rails so you can make use of the `rails console`_.
4+
Zammad uses Ruby on Rails so you can make use of the `Rails console`_.
55

66
.. _rails console:
77
http://guides.rubyonrails.org/command_line.html
@@ -12,7 +12,7 @@ Zammad uses Ruby on Rails so you can make use of the `rails console`_.
1212
might cause data loss or damaged tickets! If you're unsure,
1313
**use a test system first**!
1414

15-
To open the rails console on the shell you have to enter the following commands.
15+
To open the Rails console on the shell you have to enter the following commands.
1616

1717
Start Zammad's Rails Console
1818
----------------------------
@@ -56,7 +56,7 @@ a shell (e.g. for automation).
5656
Running Several Commands in a Shell
5757
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5858

59-
The following command will provide you a rails console.
59+
The following command will provide you a Rails console.
6060
It allows you to run several commands inside it.
6161

6262
.. tabs::
@@ -85,16 +85,16 @@ It allows you to run several commands inside it.
8585
8686
.. hint:: **Starting Rails Console in Safe Mode**
8787

88-
Normally, starting rails console requires certain
89-
:doc:`third-party services </prerequisites/software>` to be up and running.
88+
Normally, starting a Rails console requires certain
89+
:doc:`third party services </prerequisites/software>` to be up and running.
9090
You may receive errors and console will refuse to start in case they are not
9191
available.
9292

93-
However, it's possible to start rails console in safe mode by setting
93+
However, it's possible to start Rails console in safe mode by setting
9494
the environment variable ``ZAMMAD_SAFE_MODE=1``. With this setting enabled,
9595
the availability of these services will be ignored.
9696

97-
**Set variable and run rails console:**
97+
**Set variable and run Rails console:**
9898

9999
.. tabs::
100100

@@ -116,7 +116,7 @@ It allows you to run several commands inside it.
116116
.. code-block:: text
117117
:class: no-copybutton
118118
119-
Zammad is running in safe mode. Any third-party services like Redis are ignored.
119+
Zammad is running in safe mode. Any third party services like Redis are ignored.
120120
121121
There was an error trying to connect to Redis via redis://localhost:6379.
122122
Please provide a Redis instance at localhost:6379 or set REDIS_URL to point to a different location.

admin/console/zammad-settings.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,19 @@ Configuring Elasticsearch
127127
If your Elasticsearch installation changes, you can use the following commands
128128
to ensure that Zammad still can access Elasticsearch.
129129

130-
Change elasticsearch URL:
130+
Change Elasticsearch URL:
131131

132132
.. code-block:: irb
133133
134134
>> Setting.set('es_url', 'http://127.0.0.1:9200')
135135
136-
Set elasticsearch user (e.g. for authentication):
136+
Set Elasticsearch user (e.g. for authentication):
137137

138138
.. code-block::
139139
140140
>> Setting.set('es_user', 'elasticsearch')
141141
142-
Set the password for authentication of the elasticsearch user:
142+
Set the password for authentication of the Elasticsearch user:
143143

144144
.. code-block:: irb
145145
@@ -157,7 +157,7 @@ Set ignored file extensions / file types (they will not be indexed):
157157
158158
>> Setting.set('es_attachment_ignore', %w[.png .jpg .jpeg .mpeg .mpg .mov .bin .exe .box .mbox])
159159
160-
Set the maximum attachment to be indexed by elasticsearch:
160+
Set the maximum attachment to be indexed by Elasticsearch:
161161

162162
.. code-block:: irb
163163

api/intro.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Please note that these clients may not provide access to all available
1515
endpoints listed here.
1616

1717
* `Ruby Client <https://github.com/zammad/zammad-api-client-ruby>`_
18-
*(Official)*
18+
*(official)*
1919
* `PHP Client <https://github.com/zammad/zammad-api-client-php>`_
20-
*(Official)*
21-
* `Python Client <https://pypi.org/project/zammad-py/>`_ *(Third-Party)*
22-
* `.NET Client <https://github.com/Asesjix/Zammad-Client>`_ *(Third-Party)*
20+
*(official)*
21+
* `Python Client <https://pypi.org/project/zammad-py/>`_ *(third party)*
22+
* `.NET Client <https://github.com/Asesjix/Zammad-Client>`_ *(third party)*
2323
* `Android API-Client <https://github.com/KirkBushman/zammad-android>`_
24-
*(Third-Party)*
24+
*(third party)*
2525
* `Go Client <https://github.com/AlessandroSechi/zammad-go>`_
26-
*(Third-Party; API client only, no "ready to use" App)*
26+
*(third party; API client only, no "ready to use" app)*
2727

2828
Authentication
2929
--------------

api/object.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Object
88
fields.
99

1010
If you want to hide fields, consider :admin-docs:`Core Workflows </system/core-workflows.html>`
11-
instead. For states and priorities use either API endpoints or rails console.
11+
instead. For states and priorities use either API endpoints or Rails console.
1212

1313
List
1414
----

api/ticket/articles.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ type
6767
requests via twitter.
6868

6969
``facebook feed post`` & ``facebook feed comment``
70-
These articles types are used by Zammads facebook channel.
70+
These articles types are used by Zammads Facebook channel.
7171
Technically you can use these to automatically respond to existing
72-
requests via facebook.
72+
requests via Facebook.
7373

7474
``telegram personal-message``
7575
Used by Zammads Telegram channel.

api/ticket/states.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Required permission: ``admin.object``
173173
specific set of IDs. State types indicate how the state will work.
174174

175175
As there's no endpoint for retreiving these,
176-
please use the :ref:`rails console <state_types>`.
176+
please use the :ref:`Rails console <state_types>`.
177177

178178
``POST``-Request sent: ``/api/v1/ticket_states``
179179

appendix/backup-and-restore/console-command-note.include.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.. note::
44

5-
Keep in mind that docker-compose and source code installations do not know
5+
Keep in mind that Docker Compose and source code installations do not know
66
``zammad run``. Below commands show the package installation way, just remove
77
all ``zammad run`` parts from the commands and run them.
88

appendix/backup-and-restore/docker-compose.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Backup & Restore (Docker)
66

77
docker-file-handling
88

9-
This section shows some basics about the backup and restore process for a docker
10-
compose based deployment of Zammad.
9+
This section shows some basics about the backup and restore process for a Docker
10+
Compose based deployment of Zammad.
1111

12-
If you are familiar with volume based backup and restore procedures in docker,
12+
If you are familiar with volume based backup and restore procedures in Docker,
1313
and perhaps already use a different method or tool, then you can keep using it.
1414
A backup would typically mean shutting down the stack to ensure all in-memory
1515
files get written to disk, then backing up the volume contents, and then starting
@@ -18,12 +18,12 @@ using the :ref:`disable-backup-service scenario <additional-scenarios>` so that
1818
the built-in backup and restore mechanism of Zammad is not activated.
1919

2020
The rest of this page describes the built-in backup and restore mechanism of
21-
Zammad's docker compose stack.
21+
Zammad's Docker Compose stack.
2222

23-
If you're familiar with docker, the sections below include the
23+
If you're familiar with Docker, the sections below include the
2424
information you'll need. The
2525
:doc:`/appendix/backup-and-restore/docker-file-handling` page covers some
26-
examples about how to handle the backup files and to copy it into a docker
26+
examples about how to handle the backup files and to copy it into a Docker
2727
volume to restore it.
2828

2929
Backup
@@ -45,7 +45,7 @@ Restore
4545
#. Copy or move the backup files to ``/var/tmp/zammad/restore/`` inside the
4646
volume of the **zammad-backup** container. Be aware that the restore process
4747
always uses the latest backup according to the timestamp of the file name.
48-
Only backups from package and docker installations are supported by this
48+
Only backups from package and Docker installations are supported by this
4949
built-in backup method. Don't provide the ``latest_zammad_*.gz`` files
5050
because they link to an unknown location for the restore process.
5151
#. Start the stack. The restore process is triggered if the ``restore``

appendix/backup-and-restore/docker-file-handling.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ File Handling Examples
22
======================
33

44
If you're not sure how to handle the backup files and how to create the
5-
``restore`` directory in the docker volume, you can find some examples below.
5+
``restore`` directory in the Docker volume, you can find some examples below.
66

77
Restore Inside the Same Stack
88
-----------------------------
@@ -25,7 +25,7 @@ Restore from Another Installation
2525

2626
**Requires:** console access to the host system and the zammad-backup container.
2727

28-
To **obtain** your backup files from another docker compose deployment, one way
28+
To **obtain** your backup files from another Docker Compose deployment, one way
2929
is to copy it to the host system with ``docker compose cp``:
3030

3131
.. code-block:: console

appendix/configure-database-server.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Adjust ``max_connections`` (mandatory)
6262
6363
$ sed -i "/max_connections/c\max_connections = 2000" <postgresql-configuration-file>
6464
65-
Apply changes by restarting postgresql and Zammad (in this order):
65+
Apply changes by restarting PostgreSQL and Zammad (in this order):
6666

6767
.. code-block:: console
6868
@@ -92,7 +92,7 @@ Adjust PostgreSQL for bigger instances (optional)
9292
9393
$ sed -i "/max_stack_depth/c\max_stack_depth = 5MB" <postgresql-configuration-file>
9494
95-
Apply changes by restarting postgresql and Zammad (in this order):
95+
Apply changes by restarting PostgreSQL and Zammad (in this order):
9696

9797
.. code-block:: console
9898

0 commit comments

Comments
 (0)