Skip to content

Commit 804e131

Browse files
committed
docs: fixed some typos
1 parent 1d8fea5 commit 804e131

File tree

6 files changed

+46
-47
lines changed

6 files changed

+46
-47
lines changed

docs/administration.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ time with all the relevant data of the specific entry. The meaning of the fields
103103
- **Language**
104104
You can select the language of your FAQ. By default, the selected language saved in the configuration will be chosen.
105105
You can create entries in multiple languages like this: Write an article in English (or any other language) and save
106-
it. Now choose _Edit FAQs_ and edit your English FAQ record. Change the question, answer and keywords and change
106+
it. Now choose _Edit FAQs_ and edit your English FAQ record. Change the question, answer, and keywords and change
107107
language to, let's say Brazilian Portuguese. _Save_ the FAQ record. Now you can, when you click _edit records_, see
108108
both FAQs in your list, having the same id, yet different languages.
109109

@@ -114,7 +114,7 @@ time with all the relevant data of the specific entry. The meaning of the fields
114114

115115
- **Keywords**
116116
Keywords are relevant for searching through the database. In case you didn't include a specific word in the FAQ
117-
itself, but it is closely related to the content you may wish to include it as a keyword, so the FAQ will come up as
117+
itself, but it is closely related to the content, you may wish to include it as a keyword, so the FAQ will come up as
118118
a search result. It is also possible to use non-related keywords so that a wrongly entered search will also lead to
119119
the right results.
120120

@@ -128,7 +128,7 @@ time with all the relevant data of the specific entry. The meaning of the fields
128128
It is possible to specify the author's email for your FAQ, but the email address won't be shown in the frontend.
129129

130130
- **Solution ID**
131-
Every FAQ generates automatically a so-called solution ID. All records can be accessed directly by putting this ID
131+
Every FAQ automatically generates a so-called solution ID. All records can be accessed directly by putting this ID
132132
into the search box.
133133

134134
- **Active?**
@@ -172,7 +172,7 @@ You can edit and delete all records as well. Please note that old revisions won'
172172
deleted.
173173

174174
phpMyFAQ lets visitors contribute to the FAQ by asking questions. Every visitor is able to view these open questions in
175-
the public area, and may give an answer. If you wish to get rid of open questions, you can do so using this section.
175+
the public area and may give an answer. If you wish to get rid of open questions, you can do so using this section.
176176
Alternatively, you can take over a question and answer it yourself and hereby add it to the FAQ.
177177

178178
### 5.2.3 Sticky FAQs
@@ -218,8 +218,8 @@ You can edit existing tags, and if you need to, you can delete the tag.
218218

219219
Below every FAQ, a visitor has the chance to rate the overall quality of a FAQ by giving ratings from one to five
220220
(whereas 1 is the worst, 5 the best rating).
221-
In the statistics, the average rating and number of votes becomes visible for every rated FAQ.
222-
To give you a quick overview, FAQs with an average rating of two or worse are displayed in red, an average
221+
In the statistics, the average rating and number of votes become visible for every rated FAQ.
222+
To give you a quick overview, FAQs with an average rating of two or worse are displayed in red; an average
223223
above 4 results in a green number.
224224

225225
### 5.3.2 View sessions
@@ -270,7 +270,7 @@ You can export your contents of your whole FAQ or just some selected categories
270270
### 5.4.3 Batch upload via phpMyAdmin
271271

272272
> [!NOTE]
273-
> You should have a table ready with the data you want to import. The titles of your new FAQ's in one column, the HTML-formatted content in the next and the keywords in a third column.
273+
> You should have a table ready with the data you want to import. The titles of your new FAQ's in one column, the HTML-formatted content in the next, and the keywords in a third column.
274274
>
275275
> You should have access to phpMyAdmin via your web host.
276276
>
@@ -309,7 +309,7 @@ Save all 5 CSV-Files in a separate folder on your computer. Then you can close p
309309
#### 5.4.3.2 Edit the tables
310310

311311
Open the first CSV file _faqdata.csv_ with the spreadsheet program of your choice.
312-
(You can use LibreOffice, OpenOffice or Excel, for example.)
312+
(You can use LibreOffice, OpenOffice, or Excel, for example.)
313313
Look at the table BEFORE you make any changes.
314314
Pay attention to the column headings and the contents of the individual fields.
315315
DO NOT change the column headings.
@@ -367,9 +367,9 @@ So we open phpMyAdmin again.
367367
Select the correct table on the left.
368368
Click on Import at the top.
369369
Select the correct one of our 4 CSV tables out of your folder.
370-
For Skip number of queries, select 1 so that our column headings are not created as a post.
370+
To Skip the number of queries, select 1 so that our column headings are not created as a post.
371371
The format must be CSV.
372-
Check also **update data when duplicate keys found on import**.
372+
Check also **update data when duplicate keys are found on import**.
373373
Otherwise, changes to existing entries won't be saved.
374374
Else everything should be fine.
375375
Now click on Import.
@@ -389,7 +389,7 @@ regular backups of your FAQ.
389389
- **backup data**
390390
A backup of all **data** will include all entries, users, comments, etc.
391391
- **backup logs**
392-
The sessions of visits and the admin log will be saved (i.e. all **log** files). This information is not necessary
392+
The sessions of visits and the admin log will be saved (i.e., all **log** files). This information is not necessary
393393
for running phpMyFAQ, they serve only statistical purposes.
394394

395395
During the backup process, phpMyFAQ generates a hash on the whole backup file and stores this information. The hashes
@@ -434,7 +434,7 @@ For example, if you want to use _faq.example.org_ and _beta.faq.example.org_, it
434434
### 5.6.3 Stop Words configuration
435435

436436
We need stop words for the smart answering feature and the related answers. If a user is adding a new question to your
437-
FAQ the words will be checked against all FAQs in your database but without the stop words. Stop words are words with a
437+
FAQ, the words will be checked against all FAQs in your database but without the stop words. Stop words are words with a
438438
very low relevance like the English word _the_.
439439

440440
### 5.6.4 phpMyFAQ Update (Experimental feature)

docs/deployment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ This guide explains how to deploy phpMyFAQ in production using Docker Compose wi
6363
- Go to **Stacks****Add stack**
6464
- Give it a name: `phpmyfaq`
6565

66-
3. **Upload or paste the compose file**
66+
3. **Upload or paste the docker-compose file**
6767
- **Option A**: Use the Web editor
6868
- Paste the contents of `docker-compose.prod.yml`
6969

@@ -98,14 +98,14 @@ This guide explains how to deploy phpMyFAQ in production using Docker Compose wi
9898
9999
7. **Verify deployment**
100100
- Go to **Containers** to see running services
101-
- Check health status of each container
101+
- Check the health status of each container
102102
- Access the application at the configured port
103103
104104
### Method 2: Using Portainer Custom Templates
105105
106106
1. **Create a Custom Template**
107107
- Go to **App Templates** → **Custom Templates**
108-
- Create new template
108+
- Create a new template
109109
- Name: `phpMyFAQ Production`
110110
- Platform: `Linux`
111111
- Type: `Stack`

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This documentation serves as a guide to help you install, update, use, and admin
2525
### Copyright
2626

2727
phpMyFAQ is published under the [Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/2.0/) (MPL).
28-
This license guarantees you the free usage of phpMyFAQ, access to the source code and the right to modify and distribute
28+
This license guarantees you the free usage of phpMyFAQ, access to the source code, and the right to modify and distribute
2929
phpMyFAQ.
3030

3131
The only restrictions apply to the copyright, which remains at all times at Thorsten Rinne and the phpMyFAQ Team. Any
@@ -35,7 +35,7 @@ certain functions of phpMyFAQ is not affected by these restrictions and may be d
3535
A commercial usage or commercial distribution of phpMyFAQ is allowed, as long as the conditions mentioned above are
3636
met.
3737

38-
We decided to use MPL as the licensing model for phpMyFAQ because we feel that it is a good compromise between the
38+
We decided to use MPL as the licensing model for phpMyFAQ. We feel that it is a good compromise between the
3939
protection of the openness and free distribution on the one hand and the interaction with other software regardless of
4040
its licensing model. When compared to other licensing models, its text is short and easily comprehensible, even for
4141
newcomers.

docs/installation.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ phpMyFAQ uses a modern HTML5/CSS3 powered markup. The supported browsers are the
8585
(Windows/macOS/Linux), the latest Safari (macOS/iOS), the latest Chrome (Windows/macOS/Linux), the latest Opera
8686
(Windows/macOS/Linux) and Microsoft Edge (Windows/macOS/Linux).
8787

88-
We recommend using the latest version of Firefox, Chrome, Safari, Opera or Microsoft Edge.
88+
We recommend using the latest version of Firefox, Chrome, Safari, Opera, or Microsoft Edge.
8989

9090
## 2.2 Preparations
9191

@@ -125,7 +125,7 @@ All other directories shouldn't be world-writable for your own security.
125125

126126
**Note**: If you're running SELinux, you may need further configuration, or you should completely disable it.
127127

128-
The database user needs the permissions for CREATE, DROP, ALTER, INDEX, INSERT, UPDATE, DELETE and SELECT on all tables
128+
The database user needs the permissions for CREATE, DROP, ALTER, INDEX, INSERT, UPDATE, DELETE, and SELECT on all tables
129129
in the database.
130130

131131
### 2.2.2 Cloud Hosting via Docker
@@ -198,7 +198,7 @@ You have to add at least one Elasticsearch or OpenSearch node and the index name
198198
### Step 4: Admin user setup
199199

200200
In addition, you can enter your language, the default here is English.
201-
Furthermore, you should register your name, your email address and - very importantly - your password.
201+
Furthermore, you should register your name, your email address, and - very importantly - your password.
202202
You must enter the password twice, and it has to be at least eight characters long.
203203
Then click the button **"install"** to initialize the tables in your database.
204204

@@ -233,9 +233,9 @@ You can change
233233

234234
## 2.8 Notes regarding the search functionality
235235

236-
- The boolean full-text search will only work with MySQL and if there are some entries in the database (5 or more).
236+
- The boolean full-text search will only work with MySQL/MariaDB and if there are some entries in the database (5 or more).
237237
The term you are looking for should also not be in more than 50% of all your entries, or it will automatically be
238-
excluded from search. This is not a bug, but rather a feature of MySQL.
238+
excluded from search. This is not a bug, but rather a feature of MySQL/MariaDB.
239239
- The search on other databases is using the LIKE operator currently.
240240
- To improve the search functionality, you should consider using Elasticsearch or OpenSearch.
241241

@@ -251,15 +251,15 @@ How this is done depends on the browser you are using.
251251

252252
## 2.10 Enabling LDAP or Microsoft Active Directory support
253253

254-
If you're entered the correct LDAP or Microsoft Active Directory information during the installation, you have to enable
254+
If you entered the correct LDAP or Microsoft Active Directory information during the installation, you have to enable
255255
the LDAP or Microsoft Active Directory support in the configuration in the admin backend. Now your user can authenticate
256256
themselves in phpMyFAQ against your LDAP server or a Microsoft Active Directory server.
257257

258258
If you need special options for your LDAP or ADS configuration, you can change the LDAP configuration in the admin
259259
configuration panel.
260260

261-
If you want to add LDAP support later, you can use the file **content/core/config/ldap.php.original** as template, and
262-
if you rename it to **content/core/config/ldap.php** you can use the LDAP features as well after you enabled it in the
261+
If you want to add LDAP support later, you can use the file **content/core/config/ldap.php.original** as a template.
262+
If you rename it to **content/core/config/ldap.php** you can use the LDAP features as well after you enabled it in the
263263
administration backend.
264264

265265
Please note that you have to use the correct LDAP attributes for your LDAP server.
@@ -280,9 +280,9 @@ you have to add the following configuration to /etc/ldap/ldap.conf:
280280
Main features of the PDF export:
281281

282282
- supports all ISO page formats;
283-
- supports custom page formats, margins and units of measure;
283+
- supports custom page formats, margins, and units of measure;
284284
- supports UTF-8 Unicode and Right-To-Left languages;
285-
- supports TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
285+
- supports TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1, and CID-0 fonts;
286286
- includes methods to publish some HTML code;
287287
- includes graphic (geometric) and transformation methods;
288288
- includes methods to set Bookmarks and print a Table of Content;
@@ -318,7 +318,7 @@ support for Google Recaptcha by adding your site and secret key. You can get the
318318
## 2.14 Attachments
319319

320320
phpMyFAQ supports encrypted attachments. The encryption uses the [AES](http://en.wikipedia.org/wiki/Advanced_Encryption_Standard)
321-
algorithm implemented in mcrypt extension (if available) or with native PHP Rijndael implementation. The key size vary
321+
algorithm implemented in mcrypt extension (if available) or with native PHP Rijndael implementation. The key size varies
322322
depending on the implementation used and can be max 256 bits long. Use of mcrypt extension is strongly recommended because
323323
of performance reasons, its availability is checked automatically at the run time.
324324

@@ -327,7 +327,7 @@ Please be aware:
327327
- Disabling encryption will cause all files to be saved unencrypted.
328328
In this case, you'll benefit from sparing disk space because identical files are saved only once.
329329
- Do not change the default attachment encryption key once files were uploaded.
330-
Doing so will cause all the previously uploaded files to be wrong decrypted.
330+
Doing so will cause all the previously uploaded files to be wrongly decrypted.
331331
If you need to change the default key, you will have to re-upload all files.
332332
- Always memorize your encryption keys. There is no way to decrypt files without a correct key.
333333
- Files are always saved with names based on a virtual hash generated from several tokens (just like key and issue id
@@ -356,7 +356,7 @@ You need a running Elasticsearch instance accessible by phpMyFAQ via HTTP/REST.
356356
You can add the IP(s)/Domain(s) and port(s) of your Elasticsearch cluster during installation or later by renaming the
357357
Elasticsearch file located in the folder config/.
358358
If you choose to add this during installation, the file will be automatically written and the index will be built.
359-
If you enabled Elasticsearch support in the admin configuration panel, you can create, re-import and delete your
359+
If you enabled Elasticsearch support in the admin configuration panel, you can create, re-import, and delete your
360360
index with a user-friendly interface.
361361

362362
## 2.17 OpenSearch Support
@@ -366,7 +366,7 @@ You need a running OpenSearch instance accessible by phpMyFAQ via HTTP/REST.
366366
You can add the IP(s)/Domain(s) and port(s) of your OpenSearch cluster during installation or later by renaming the
367367
OpenSearch file located in the folder config/.
368368
If you choose to add this during installation, the file will be automatically written and the index will be built.
369-
If you enabled OpenSearch support in the admin configuration panel, you can create, re-import and delete your
369+
If you enabled OpenSearch support in the admin configuration panel, you can create, re-import, and delete your
370370
index with a user-friendly interface.
371371

372372
## 2.18 SSO (Single Sign-On) Support

docs/update.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ Click the button of the update script, your version will automatically be update
128128
If you're running phpMyFAQ 4.0.0 or later, you can use the built-in online update feature.
129129
Log in as admin into the admin section and enable the maintenance mode.
130130
(Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
131-
Then go to the "phpMyFAQ Update" page in the configuration section click through the update wizard:
131+
Then go to the "phpMyFAQ Update" page in the configuration section and click through the update wizard:
132132

133133
1. Check for System Health: this checks if your system is ready for the upgrade
134134
2. Check for Updates: this checks if there is a new version of phpMyFAQ available
135135
3. Download of phpMyFAQ: this downloads the latest version of phpMyFAQ in the background, this can take some seconds
136136
4. Extracting phpMyFAQ: this extracts the downloaded archive, this can take a while
137137
5. Install downloaded package: first, it creates a backup of your current installation, then it copies the downloaded
138-
files into your installation and in the end, the database is updated
138+
files into your installation, and in the end, the database is updated
139139

140140
Note:
141141
The online update feature is experimental and might not work in all environments.
@@ -148,6 +148,6 @@ You have to compile the SCSS files into CSS using a SCSS compiler with Node.js.
148148

149149
If you need help with theming phpMyFAQ, please don't hesitate to ask in our [forum](https://forum.phpmyfaq.de/).
150150

151-
Note: The character set for all languages and templates is UTF-8. If you notice problems with e.g. German umlauts, you
151+
Note: The character set for all languages and templates is UTF-8. If you notice problems with e.g., German umlauts, you
152152
have to convert your templates to UTF-8 encoding. Please use UNIX file endings \n instead of Windows file endings with
153153
\r\n.

0 commit comments

Comments
 (0)