aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGravatar Thomas Renes <thomas@renesweb.nl> 2022-01-08 16:25:17 +0100
committerGravatar GitHub <noreply@github.com> 2022-01-08 16:25:17 +0100
commit916df412f5b6f7fb9bcfb705a3c8c23e35304410 (patch)
treed87c483688575cb5a6b674849e2aefa2052116c8 /docs
parent127b7f0a3aad7012055c058e8aba0d27192a8cbc (diff)
Fix various typos and spelling errors in documentation, comments and code. (#4134)
Diffstat (limited to 'docs')
-rw-r--r--docs/en/admins/06_LinuxInstall.md2
-rw-r--r--docs/en/admins/12_User_management.md6
-rw-r--r--docs/en/developers/03_Backend/05_Extensions.md8
-rw-r--r--docs/en/users/03_Main_view.md2
4 files changed, 9 insertions, 9 deletions
diff --git a/docs/en/admins/06_LinuxInstall.md b/docs/en/admins/06_LinuxInstall.md
index fa980a647..ab42fb992 100644
--- a/docs/en/admins/06_LinuxInstall.md
+++ b/docs/en/admins/06_LinuxInstall.md
@@ -105,7 +105,7 @@ ln -s /usr/share/FreshRSS/p /var/www/html/
## Part 3: Creating a Database for FreshRSS
-Start a MySQL session. running this command will ask you for the MySQL password you set earler, and then put you into a prompt that should look like `MariaDB [(none)]>`
+Start a MySQL session. running this command will ask you for the MySQL password you set earlier, and then put you into a prompt that should look like `MariaDB [(none)]>`
```sh
mysql -u root -p
diff --git a/docs/en/admins/12_User_management.md b/docs/en/admins/12_User_management.md
index e2c19b467..6e0492a91 100644
--- a/docs/en/admins/12_User_management.md
+++ b/docs/en/admins/12_User_management.md
@@ -2,13 +2,13 @@
## User list
-Settings page: `Administation` -> `Manage Users`.
+Settings page: `Administration` -> `Manage Users`.
The [default user](13_Default_user.md) is marked with italic letters.
## Create new user
-Settings page: `Administation` → `Manage Users`.
+Settings page: `Administration` → `Manage Users`.
For a new user the following information is necessary:
* language
@@ -24,7 +24,7 @@ New users could use the self registration form in the frontend.
The user registration form is available via the login form, when the maximum number of accounts is smaller than the number of created accounts (Set up in `Administration` → `System configuration`). If the maximum number of accounts is 0, than there is no limit on the number of user accounts.
-If in the `System configuration` the `Force email addres validation` is enabled, than the email address input is shown and mandatory.
+If in the `System configuration` the `Force email address validation` is enabled, than the email address input is shown and mandatory.
It is optional to have a `Terms of Service` (`ToS`). If ToS is enabled, then it is mandatory to check it for registration.
diff --git a/docs/en/developers/03_Backend/05_Extensions.md b/docs/en/developers/03_Backend/05_Extensions.md
index 1104b30f5..90fe6f699 100644
--- a/docs/en/developers/03_Backend/05_Extensions.md
+++ b/docs/en/developers/03_Backend/05_Extensions.md
@@ -39,7 +39,7 @@ Minz relies on and imposes an MVC architecture on projects using it. This archit
### Routing
In order to link a URL to a controller, first you have to go through a "routing" phase. In FreshRSS, this is particularly simple because it suffices to specify the name of the controller to load into the URL using a `c` parameter.
-For example, the address <http://exemple.com?c=hello> will execute the code contained in the `hello` controller.
+For example, the address <http://example.com?c=hello> will execute the code contained in the `hello` controller.
One concept that has not yet been discussed is the "actions" system. An action is executed *on* a controller. Concretely, a controller is represented by a class and its actions by methods. To execute an action, it is necessary to specify an `a` parameter in the URL.
@@ -61,10 +61,10 @@ class FreshRSS_hello_Controller extends FreshRSS_ActionController {
?>
```
-When loading the address <http://exemple.com?c=hello&a=world>, the `world` action is executed on the `hello` controller.
+When loading the address <http://example.com?c=hello&a=world>, the `world` action is executed on the `hello` controller.
Note: if `c` or `a` is not specified, the default value for each of these variables is `index`.
-So the address <http://exemple.com?c=hello> will execute the `index` action of the `hello` controller.
+So the address <http://example.com?c=hello> will execute the `index` action of the `hello` controller.
From now on, the `hello/world` naming convention will be used to refer to a controller/action pair.
@@ -125,7 +125,7 @@ To take full advantage of the Minz routing system, it is strongly discouraged to
</p>
```
-If one day it was decided to use a "url rewriting" system to have addresses in a <http://exemple.com/controller/action> format, all previous addresses would become ineffective!
+If one day it was decided to use a "url rewriting" system to have addresses in a <http://example.com/controller/action> format, all previous addresses would become ineffective!
So use the `Minz_Url` class and its `display()` method instead. `Minz_Url::display()` takes an array of the following form as its argument:
diff --git a/docs/en/users/03_Main_view.md b/docs/en/users/03_Main_view.md
index 8e7563200..11fd20d65 100644
--- a/docs/en/users/03_Main_view.md
+++ b/docs/en/users/03_Main_view.md
@@ -271,4 +271,4 @@ Display the user queries drop-down by clicking the button next to the state butt
Then click on the bookmarked query, the previously stored query will be applied.
> Note that only the query is stored, not the articles.
-> The results you are seing now could be different from the results on the day you've created the query.
+> The results you are seeing now could be different from the results on the day you've created the query.