diff --git a/account/eth_guest_accounts.markdown b/account/eth_guest_accounts.markdown
index 089e837fc7932169fa432ee9e8dc628eecf17f15..a2cd2c7fb813a9bdd4ca061b543aa7d67414222a 100644
--- a/account/eth_guest_accounts.markdown
+++ b/account/eth_guest_accounts.markdown
@@ -5,5 +5,5 @@ Please refer to the official documentation regarding the rules of ETH guest acco
* [ETH guests overview](https://ethz.ch/staffnet/en/employment-and-work/guests.html)
* [ETH guest categories](https://ethz.ch/staffnet/en/employment-and-work/guests/guest-categories.html)
-* [ETH guest authorisations](https://ethz.ch/staffnet/en/employment-and-work/guests/general-overview-of-authorisations.html)
+* [ETH guest authorizations](https://ethz.ch/staffnet/en/employment-and-work/guests/general-overview-of-authorisations.html)
- in particular the PDF linked on the bottom contains a matrix with the list of allowed services for each guest category
diff --git a/account/groups.markdown b/account/groups.markdown
index cab728f53381b859782fea6c5dba405ec1b551d5..5452f0112e6671b77093607b9c99a2238abb3ba5 100644
--- a/account/groups.markdown
+++ b/account/groups.markdown
@@ -12,7 +12,7 @@ Please note: ISG can't decide who gets access to what, the OK must always come f
## How to view group membership
-You can view group membership on our webinterface. To do so, please log in on [account.phys.ethz.ch](https://account.phys.ethz.ch/) with your D-PHYS user account and navigate to **Account Info** or **Show Members** or use the links below:
+You can view group membership on our web interface. To do so, please log in on [account.phys.ethz.ch](https://account.phys.ethz.ch/) with your D-PHYS user account and navigate to **Account Info** or **Show Members** or use the links below:
- [Show your group membership](https://account.phys.ethz.ch/info)
- [Show group members](https://account.phys.ethz.ch/group/info)
diff --git a/account/index.markdown b/account/index.markdown
index f0e5c03ce4e572ab2c2a6f5e5f1a42aa1f45bb28..cf780d4b540bb25e89b8123e956fc1d71a510870 100644
--- a/account/index.markdown
+++ b/account/index.markdown
@@ -13,7 +13,7 @@ The **ETH Account** is given by the [ETH Rektorat](http://www.rektorat.ethz.ch/)
This account is required to access your @ethz.ch (or @student.ethz.ch) [email](https://mail.ethz.ch), the [wireless network](/network/wireless), [VPN](http://www.vpn.ethz.ch), licensed software via [IT Shop](http://itshop.ethz.ch) and several other ETH-wide services. Just to make things even more interesting, there are two passwords associated with each ETH Account: the LDAP/AD password and the Radius password. The following list gives you an idea of which one to use:
-| Service | Link / Docu | Password | Description |
+| Service | Link / Docs | Password | Description |
|-----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------|
| Network | [[network/]] | Radius | Wired network |
| Wireless | [[network/wireless]] | Radius | Wireless (Wi-Fi) network |
@@ -25,7 +25,7 @@ This account is required to access your @ethz.ch (or @student.ethz.ch) [email](h
| IT Shop | [itshop](https://itshop.ethz.ch/) | LDAP | Licensed Software Catalog |
| HPC Clusters | [id sis hpc](https://scicomp.ethz.ch/) | LDAP | EULER, Leonhard |
| Password | [password](https://password.ethz.ch) | LDAP | Set password, account info |
-| ID/ITS Helpdesk | [faq](https://ethz.ch/staffnet/en/it-services/service-desk/support.html), [services](https://www.ethz.ch/services/en/it-services/catalogue.html), [help](https://www.ethz.ch/services/en/it-services/service-desk.html) | LDAP | ETH Account specific help |
+| ID/ITS Helpdesk | [FAQ](https://ethz.ch/staffnet/en/it-services/service-desk/support.html), [services](https://www.ethz.ch/services/en/it-services/catalogue.html), [help](https://www.ethz.ch/services/en/it-services/service-desk.html) | LDAP | ETH Account specific help |
The passwords can be changed at [password.ethz.ch](https://password.ethz.ch).
@@ -37,7 +37,7 @@ The **D-PHYS Account** (or **Physics Account**) is given by [[ISG|services/conta
This account is required to access your @phys.ethz.ch [[mail/]], network file [[storage/]], provides the login for our [[services/workstations]], [[servers|/services/hostnames_of_our_services/]], [[websites|web/]] and several other services:
-| Service | Link / Docu | Description |
+| Service | Link / Docs | Description |
|---------------|---------------------------------------------------------------------------------------------|-----------------------------|
| Host Login | [[services/workstations]] | Managed workstations |
| SSH Login | [[/documentation/ssh]], [[computing/]] | Managed servers |
@@ -47,11 +47,11 @@ This account is required to access your @phys.ethz.ch [[mail/]], network file [[
| Groups | [[/account/groups]] | Group/Access management |
| Backups | [[backups/]] | Daily backups |
| Web services | [[web/]] | Websites (\*.phys.ethz.ch) |
-| Public html | [homepage howto](/web/how_to_get_a_personal_homepage/) | Personal/Group Homepages |
+| Public HTML | [homepage how-to](/web/how_to_get_a_personal_homepage/) | Personal/Group Homepages |
| Chat | [[chat]], [#helpdesk chat room](https://m.ethz.ch/#/#helpdesk:phys.ethz.ch) | Matrix/Element chat server |
| Calendar | [[calendar/]] | Calendar, address book |
| Password | [password](https://account.phys.ethz.ch) | Set password, account info |
-| ISG Helpdesk | [faq](/), [[services/]], [help](/services/contact/) | IT Support for the D-PHYS |
+| ISG Helpdesk | [FAQ](/), [[services/]], [help](/services/contact/) | IT Support for the D-PHYS |
The password can be changed at [account.phys.ethz.ch](https://account.phys.ethz.ch/passwd).
diff --git a/account/ldap.markdown b/account/ldap.markdown
index 7baaf1941d59b6eb1dc721484bf20d935ea7c612..a1cd91131d628d9726df13d829712614e2d48b19 100644
--- a/account/ldap.markdown
+++ b/account/ldap.markdown
@@ -36,9 +36,9 @@ ldap(s)://ldap1.phys.ethz.ch, ldap(s)://ldap2.phys.ethz.ch, ldap(s)://ldap3.phys
The TLS certificates of the LDAP servers are issued/signed by [DigiCert Inc](http://cacerts.digicert.com/DigiCertGlobalRootCA.crt)
-#### Restrict Access in Apache Webserver
+#### Restrict Access in Apache web server
-To configure the Apache Webserver to authenticate using a D-PHYS Account, you need to modify your `.htaccess` file, `<Directory>` block or `<Location>` block in the server configuration to look like the following:
+To configure the Apache web server to authenticate using a D-PHYS Account, you need to modify your `.htaccess` file, `<Directory>` block or `<Location>` block in the server configuration to look like the following:
```
AuthType Basic
@@ -60,9 +60,9 @@ Require ldap-group cn=<groupname>,ou=groups,dc=phys,dc=ethz,dc=ch
Require valid-user
```
-#### Apache webserver configuration
+#### Apache web server configuration
-If you host your own Apache webserver, additionally the following configuration in the server-context is recommended. This has to be configured server wide and will have an effect on all `<VirtualHost>`, `<Directory>` and `<Location>` blocks in the configuration.
+If you host your own Apache web server, additionally the following configuration in the server-context is recommended. This has to be configured server wide and will have an effect on all `<VirtualHost>`, `<Directory>` and `<Location>` blocks in the configuration.
```
LDAPTrustedGlobalCert CA_BASE64 /etc/ssl/certs/ca-certificates.crt
diff --git a/account/mfa.markdown b/account/mfa.markdown
index d3109d280e546a003ee3f3533da5615d25855095..4d37c2d611fd6b5b0a91a070164f73a8e4b74b5d 100644
--- a/account/mfa.markdown
+++ b/account/mfa.markdown
@@ -37,7 +37,7 @@ the following open-source alternatives can be used:
TL'DR instructions
------------------
-The [MFA registration](https://www.password.ethz.ch/qrcode/) page will show the secret as qr-code and plaintext.
+The [MFA registration](https://www.password.ethz.ch/qrcode/) page will show the secret as qr-code and plain-text.
Add the secret to your authenticator or password manager:
diff --git a/attic/hardware_comparison_agisoft_photoscan.markdown b/attic/hardware_comparison_agisoft_photoscan.markdown
index c1e4eef34bfca8c15a14e0a61772e54d0e89df49..617f7645b68b70a944151267f2b58f1d8957a0c2 100644
--- a/attic/hardware_comparison_agisoft_photoscan.markdown
+++ b/attic/hardware_comparison_agisoft_photoscan.markdown
@@ -13,9 +13,9 @@ This page shows a comparison of several CPU types for use with Agisoft PhotoScan
Only the "Build Dense Cloud" step is able to utilize the GPU. However, that one step takes longer than all the others combined.
-### Optimal CPU-corecount / GPU balance
+### Optimal CPU-core count / GPU balance
-**For a good price-performance ratio** use a mimimum of 6-8 CPU cores, add one core for every additional GPU. For Multi-GPU one core must be reserved per GPU. While multi-core CPU and multi-GPU efficiency decreases for every added CPU-core/GPU, multi-core CPU efficiency increases when addig more GPUs:
+**For a good price-performance ratio** use a minimum of 6-8 CPU cores, add one core for every additional GPU. For Multi-GPU one core must be reserved per GPU. While multi-core CPU and multi-GPU efficiency decreases for every added CPU-core/GPU, multi-core CPU efficiency increases when adding more GPUs:
- multi-core CPU efficiency 50%-92% (depending on step and data)
- multi-core CPU efficiency increases by ~5% per GPU
@@ -33,7 +33,7 @@ Only the "Build Dense Cloud" step is able to utilize the GPU. However, that one
## CPU comparison
-The last 3 columns show the buildtimes in seconds (total and stages 1 and 2) from [anandtech 2017 CPU tests win10 - photoscan 1.3.3 large](https://www.anandtech.com/bench/CPU).
+The last 3 columns show the build times in seconds (total and stages 1 and 2) from [anandtech 2017 CPU tests win10 - photoscan 1.3.3 large](https://www.anandtech.com/bench/CPU).
| cpu | socket | mem | max-mem | cores | frequency | turbo | cost | total | s1 | s2 |
|-----------|--------|-----------|---------|-------|-----------|-------|------|-------|-----|------|
@@ -160,7 +160,7 @@ Below are the test results comparing Windows and Linux. This test was finished 7
| Ubuntu 18.04 | Default (High) | 257 | 24 | 87 | 107 | 40 |
| Windows 10 | Default (High) | 365 | 20 | 185 | 97 | 63 |
-I made some addtional tests on Linux (Ubuntu 18.04) using the same settings as above to compare the performance between version 1.3 and 1.4 and using OpenCL:
+I made some additional tests on Linux (Ubuntu 18.04) using the same settings as above to compare the performance between version 1.3 and 1.4 and using OpenCL:
| os | quality (dense cloud) | version | total | s1 | s2 | s3 | s4 |
|--------------|-----------------------|------------|-------|----|----|-----|----|
diff --git a/attic/migrating_a_single_user_from_mbx_to_maildir.markdown b/attic/migrating_a_single_user_from_mbx_to_maildir.markdown
index 0c4ad6c21748c319569698907cf7d72b647d312c..d1650eef8355df8b8b056c7e0dfc9b4450ce0c67 100644
--- a/attic/migrating_a_single_user_from_mbx_to_maildir.markdown
+++ b/attic/migrating_a_single_user_from_mbx_to_maildir.markdown
@@ -44,7 +44,7 @@ Make procmail defer all incoming mails
For minimized risk, all mails which the MDA attempted to deliver get deferred and saved to the backup mailbox created in the previous step.
-Add the following lines between the variable and the rules section of your `.procmailrc`, i.e. very close to the top so that it matches all incoming mails amd all others rules are not evaluated. A log file helps diagnosting potientally occuring errors.
+Add the following lines between the variable and the rules section of your `.procmailrc`, i.e. very close to the top so that it matches all incoming mails amd all others rules are not evaluated. A log file helps diagnosing potentially occurring errors.
```
LOGFILE=/home/abe/procmail-migration.log
@@ -58,7 +58,7 @@ As soon as the '.procmailrc' has been saved, the migration has begun.
Convert all existing mailboxes
------------------------------
-Shell script which converts all MBX boxes given as parameter. They should all reside in the current directory. (still the braindump version)
+Shell script which converts all MBX boxes given as parameter. They should all reside in the current directory. (still the brain-dump version)
```sh
#!/bin/sh
diff --git a/attic/openldap_bdb_maintenance.markdown b/attic/openldap_bdb_maintenance.markdown
index 26db64fc1823b8d234e2df11c88745730494a2cd..0a6d5053d8e11d801a03a60d781258f8bdf1f2b5 100644
--- a/attic/openldap_bdb_maintenance.markdown
+++ b/attic/openldap_bdb_maintenance.markdown
@@ -1,11 +1,11 @@
OpenLDAP Berkeley Database Maintenance
======================================
-OpenLDAP uses Oracle's (formerly Sleepycat's) Berkeley Database (BDB) as storage backend. BDB generates logfiles which accumulate over the time. Here are some hints (for now only links) how to deal with this issue.
+OpenLDAP uses Oracle's (formerly Sleepycat's) Berkeley Database (BDB) as storage back-end. BDB generates log files which accumulate over the time. Here are some hints (for now only links) how to deal with this issue.
Links
-----
* [How to maintain Berkeley DB (logs etc.)?](http://www.openldap.org/faq/data/cache/738.html)
-* [How do I configure the BDB backend?](http://www.openldap.org/faq/data/cache/893.html)
-* [Why isn't checkpointing working?](http://www.openldap.org/faq/data/cache/1162.html)
+* [How do I configure the BDB back-end?](http://www.openldap.org/faq/data/cache/893.html)
+* [Why isn't check-pointing working?](http://www.openldap.org/faq/data/cache/1162.html)
diff --git a/audience/administrator_at_isg.markdown b/audience/administrator_at_isg.markdown
index 9dfe9cc420e49e0aa70c9e74ecfb16132a8e4429..6bddf46395e8aee6966bbd6ef6816a57a347faba 100644
--- a/audience/administrator_at_isg.markdown
+++ b/audience/administrator_at_isg.markdown
@@ -1,4 +1,4 @@
-Howtos for Administrators at ISG
+Documentation for Administrators at ISG
================================
... and possibly helpful for others, too. :-)
@@ -19,7 +19,7 @@ Administrative Tasks
* [[services/Berufsbildung Modul IT]]
* [[services/LVMchart]] - generate LVM usage charts
-### Howtos
+### How-To
* [[How to setup Bonding (Link Aggregation, IEEE 802.3ad)|documentation/How to setup Bonding Link Aggregation IEEE 802.3ad]]
* [[documentation/Setting up a X server for diskless clients]] (X -query)
diff --git a/audience/mac_user.markdown b/audience/mac_user.markdown
index b9a511bcc5ebb5d3eda9e997f751b0687a497f35..c0e61afc5a491e1a79fc75a70070d1a4898eaf7a 100644
--- a/audience/mac_user.markdown
+++ b/audience/mac_user.markdown
@@ -1,7 +1,7 @@
I'm a macOS User
================
-* [[How to add an ID printer (ETH PrintService)|printing/how_to_add_an_id_printer_on_osx]]
+* [[How to add an ID printer (ETH Print Service)|printing/how_to_add_an_id_printer_on_osx]]
* [[mail/How to Use Email with Apple Mail]]
* [[How to setup VPN on macOS|osx/vpn_mac]]
* [[How to encrypt your disk using FileVault|osx/filevault]]
@@ -10,5 +10,5 @@ I'm a macOS User
* [[Keychain Access password storage|osx/keychain]]
* [[Restore data from our backups|backups/restore]]
* [[How to use SOGo Calendar in Apple Calendar|calendar/apple_ical]]
-* [[How to install opensource software using MacPorts|osx/Macports]]
+* [[How to install open-source software using MacPorts|osx/Macports]]
* [[Some command line tools for macOS|osx/command_line_tools]]
diff --git a/audience/remote_work.markdown b/audience/remote_work.markdown
index f6e5637c542ef59f9927bf296ae9ee0022924274..88aa8c37457fb8d58f79bd8f137646c14792c760 100644
--- a/audience/remote_work.markdown
+++ b/audience/remote_work.markdown
@@ -1,7 +1,7 @@
Work from home or abroad
========================
-The following guides should help you to do home office or work remotely, while travelling abroad.
+The following guides should help you to do home office or work remotely, while traveling abroad.
### VPN
diff --git a/backups/backup_of_workstations.markdown b/backups/backup_of_workstations.markdown
index 1bbe26d36b9f81aa2c121fe147b41799328d20e1..dd0822d7954374bb7ed87fc7d3d31da8c9128aa5 100644
--- a/backups/backup_of_workstations.markdown
+++ b/backups/backup_of_workstations.markdown
@@ -1,10 +1,10 @@
Backup of Managed Workstations
==============================
-With some exceptions workstations are **not** backed up. The content of your local disks will be lost in case of a disk crash or a new installation. Upgrades or reinstallations are done by us with some care about your data but we cannot guarantee that everything will be back after reinstall. So be sure to put your valuable data on the [[fileserver|storage/]] and read your mail with [[IMAP|mail/]] or [webmail](http://webmail.phys.ethz.ch). File space on the local hard disk (mostly on `/scratch`) is only meant for temporary data that needs fast access.
+With some exceptions workstations are **not** backed up. The content of your local disks will be lost in case of a disk crash or a new installation. Upgrades or re-installations are done by us with some care about your data but we cannot guarantee that everything will be back after reinstall. So be sure to put your valuable data on the [[file server|storage/]] and read your mail with [[IMAP|mail/]] or [webmail](http://webmail.phys.ethz.ch). File space on the local hard disk (mostly on `/scratch`) is only meant for temporary data that needs fast access.
Now the exceptions of the above rule:
* The data disks of selected Linux workstations are backed up on our backup server. See [[backups/restore]] for some hints on how to restore data.
-* Some Windows workstations of the departement services and [Firstlab](http://www.first.ethz.ch) have a image copy of their local disks on one of our servers. Ask your local IT administrator in case of troubles.
+* Some Windows workstations of the department services and [Firstlab](http://www.first.ethz.ch) have a image copy of their local disks on one of our servers. Ask your local IT administrator in case of troubles.
* We also offer [[BackupBox]] for laptops and lab PCs.
diff --git a/backups/backup_overview.markdown b/backups/backup_overview.markdown
index b2a3cb0390ac5021f832b69c83394600e5507574..870fa9d9b481bf7533fafe5f7dbbd36999c3361d 100644
--- a/backups/backup_overview.markdown
+++ b/backups/backup_overview.markdown
@@ -3,7 +3,7 @@ Automatic Backup of Managed Workstations and Servers
Your data is backed up on a regular schedule. The last 30 days (or even more, on a best effort basis) are backed up on our backup server and are accessible by the user to restore files. This includes
-* Backup of Homedirectories
+* Backup of Home directories
* Backup of Groupdrives
* Backup of Webshares
* [[Backup of Managed Workstations|Backup of Workstations]]
@@ -17,7 +17,7 @@ Most of these backups can be restored by yourself. Connect the network share wit
* [[Restore]]
-Restoring Emails from the imap folder is a bit more tricky. Please get in touch with us to have emails restored from backup.
+Restoring Emails from the IMAP folder is a bit more tricky. Please get in touch with us to have emails restored from backup.
Backup Folder Structure
-----------------------
diff --git a/calendar/apple_ical.markdown b/calendar/apple_ical.markdown
index c087041da8781c4a771cdfccbac04a6433542d3d..7a32decc023ff64b18cb3096a334675ce4b96822 100644
--- a/calendar/apple_ical.markdown
+++ b/calendar/apple_ical.markdown
@@ -7,4 +7,4 @@ Go to `Calendar` -> `Preferences` -> `Accounts`, then click on the plus sign to
Select `Account Type` -> `Manual` and enter your D-PHYS username and password. For the `Server address` use https://sogo.phys.ethz.ch.
-Under `Calendar` -> `Preferences` -> `Accounts` -> `Delegation` you can toggle the view of other D-Phys calenders for which you have access rights. Alternatively you may add them as separate accounts by providing the full path as `Server address` https://sogo.phys.ethz.ch/SOGo/dav/D-PHYS-USERNAME.
+Under `Calendar` -> `Preferences` -> `Accounts` -> `Delegation` you can toggle the view of other D-Phys calendars for which you have access rights. Alternatively you may add them as separate accounts by providing the full path as `Server address` https://sogo.phys.ethz.ch/SOGo/dav/D-PHYS-USERNAME.
diff --git a/calendar/outlook_caldav_synchronizer.markdown b/calendar/outlook_caldav_synchronizer.markdown
index 3929949ab215654349899d89356b271b49cc1dd4..6dd08afaa8aedaba3f866205accf0cb30853da2a 100644
--- a/calendar/outlook_caldav_synchronizer.markdown
+++ b/calendar/outlook_caldav_synchronizer.markdown
@@ -4,7 +4,7 @@ Connect to the D-PHYS SOGo calendar using Outlook.
## Install required plugins
-Install [Outlook CalDav Synchronizer](https://caldavsynchronizer.org/download) ([github](https://github.com/aluxnimm/outlookcaldavsynchronizer/releases)).
+Install [Outlook CalDav Synchronizer](https://caldavsynchronizer.org/download) ([GitHub](https://github.com/aluxnimm/outlookcaldavsynchronizer/releases)).
## Configure Outlook CalDav Synchronizer
diff --git a/calendar/sogo.markdown b/calendar/sogo.markdown
index fe25feae5e7ea2283987ba6ca816e98a704851e3..6071e87cdfda1df2797c388663462376d3d4e4b4 100644
--- a/calendar/sogo.markdown
+++ b/calendar/sogo.markdown
@@ -3,7 +3,7 @@ D-PHYS Calendar (SOGo)
SOGo offers sync via both CalDAV and ActiveSync and supports LDAP groups.
-Some noteworthy featurs are:
+Some noteworthy features are:
- multiple calendars per account
- public calendars that can be freely shared or integrated into a web page
diff --git a/calendar/sogo_client_config.markdown b/calendar/sogo_client_config.markdown
index 26ced11f04c8d7ab57b154091cf3852d160d0ab8..072ec5fe720bae4e743ba39907f35ec46d2838f4 100644
--- a/calendar/sogo_client_config.markdown
+++ b/calendar/sogo_client_config.markdown
@@ -6,7 +6,7 @@ Synchronization with external clients
SOGo offers both CalDAV and ActiveSync. Use CalDAV for Apple devices and Thunderbird and ActiveSync for Android and Outlook.
-### SyncURLs
+### Sync URLs
| CalDav | ActiveSync |
| ----------------------------------- | -------------------------- |
@@ -42,7 +42,7 @@ Click `Add Account` -> `Other` -> `CalDAV Account` and enter the following infor
| Password | `yourDphysPassword` |
| Server Address | `https://sogo.phys.ethz.ch` |
-Once the account is added, you can use the `Delegation` tab to show additional calenders that you have access to.
+Once the account is added, you can use the `Delegation` tab to show additional calendars that you have access to.
### Add Sogo in Thunderbird
diff --git a/calendar/sogo_comon_tasks.markdown b/calendar/sogo_comon_tasks.markdown
index 23533e0428999f28e1067a1be1c47046907c8b2b..a87a0c91b3b778c28f6613caf33b651d49f48e99 100644
--- a/calendar/sogo_comon_tasks.markdown
+++ b/calendar/sogo_comon_tasks.markdown
@@ -7,7 +7,7 @@ You need to click-and-drag in the web interface, not just click.
## Inviting an LDAP group to an event
-This is only possible in the web frontend (synced clients don't know about groups - but you can always invite an email address).
+This is only possible in the web front-end (synced clients don't know about groups - but you can always invite an email address).
search for group:
[[!img /media/sogo/sogo-group-1.png size="450x"]]
@@ -34,7 +34,7 @@ You can identify users by their `@phys.ethz.ch` and groups by their `@localhost`
Note that you cannot directly search for `<groupname>@localhost`, so please only search for the groupname and scroll down in the filtered results to pick the `<groupname>@localhost` item.
-If you tick the 'Subscribe user' checkbox, the user(s) will be automagically subscribed, otherwise they'll have to do this manually. Be careful with this option when sharing to (large) groups...
+If you tick the 'Subscribe user' checkbox, the user(s) will be auto-magically subscribed, otherwise they'll have to do this manually. Be careful with this option when sharing to (large) groups...
Then set the visibility and edit options to your liking.
[[!img /media/sogo/sogo-share-group-3.png size="450x"]]
diff --git a/calendar/thunderbird_tbsync_activesync.markdown b/calendar/thunderbird_tbsync_activesync.markdown
index 8376797b62f3480b0e62155a3e7124832e6704c7..a153bd73a0d585be8c6218942cc26b2824873eba 100644
--- a/calendar/thunderbird_tbsync_activesync.markdown
+++ b/calendar/thunderbird_tbsync_activesync.markdown
@@ -2,7 +2,7 @@
Thunderbird also allows syncing calendars with the ActiveSync protocol, like for instance the ETH Exchange.
-## Install required addons
+## Install required add-ons
Install [TbSync](https://addons.thunderbird.net/en-US/thunderbird/addon/tbsync/):
diff --git a/calendar/usage_scenarios.markdown b/calendar/usage_scenarios.markdown
index 2a0f47aeaddee7711a6bd7feb0d4c78d1f4fba12..bbe2ddbe3a71bdc7b03a7e4c0e0b29571d1e3c8d 100644
--- a/calendar/usage_scenarios.markdown
+++ b/calendar/usage_scenarios.markdown
@@ -7,7 +7,7 @@ Basically there's two possible ways to share calendar information in a group.
Shared LDAP user
----------------
-Example: NCCR Gruppenkalender
+Example: NCCR group calendar
This is the preferred choice for most situations, eg group meetings, holiday absences. An impersonal LDAP user is created to host a calendar. One person in the group, for instance the secretary, receives the credentials and manages the calendar. Using the _Access_ settings in the groupware web interface, read and/or write access can be granted to other group members. (Note that users must log in once in groupware to be visible in the list of users.) When granted access, a group member can either consult the shared group calendar from the web interface or sync it to his personal computer or phone. For the sync to work, the group calendar must be checked in the _CalDAV_ or _eSync_ preferences as _calendar to sync in addition to personal calendar_.
@@ -17,4 +17,4 @@ User group in SOGo calendar
Example: ISG
-Use this if in general the members of the group use their individual calendars but once in a while would like to check availability of a colleague or invite her to a meeting. All group members can specify event visibility (private, public..) according to their needs (`Grant access` in the left pane) and choose which calendar to display (the pulldown with the two heads). Challenge: keeping the membership list up to date.
+Use this if in general the members of the group use their individual calendars but once in a while would like to check availability of a colleague or invite her to a meeting. All group members can specify event visibility (private, public..) according to their needs (`Grant access` in the left pane) and choose which calendar to display (the pull-down with the two heads). Challenge: keeping the membership list up to date.
diff --git a/chat/index.markdown b/chat/index.markdown
index d27977f87c88a824291e3c9ec497670edf248988..fd53b98601dc94f2b61f1b5ab48c1fed58a047b5 100644
--- a/chat/index.markdown
+++ b/chat/index.markdown
@@ -18,7 +18,7 @@ including any other [bridged networks](https://matrix.org/bridges/) like IRC, Sl
[[!img /media/chat/networks.png size="450x"]]
To access our homeserver you need [a Matrix client](https://matrix.org/clients/), similar as with email where you need a mail client like Thunderbird or Outlook.
-Our recommendation is to use [[Element|/chat/element]], which is a glossy and feature-rich javascript app running entirely in your browser.
+Our recommendation is to use [[Element|/chat/element]], which is a glossy and feature-rich JavaScript app running entirely in your browser.
Examples for more clients (beta) include
[fluffychat](https://fluffychat.im/) (maths support),
[weechat-matrix](https://matrix.org/docs/projects/client/weechat-matrix),
@@ -70,12 +70,12 @@ All rooms listed here will be grouped into those spaces once you join the space.
- [#matrix:phys.ethz.ch](https://m.ethz.ch/#/#matrix:phys.ethz.ch) - help & news for Matrix & Element
- [#influxdb:phys.ethz.ch](https://m.ethz.ch/#/#influxdb:phys.ethz.ch) - help & news for InfluxDB & Grafana
-- [#web:phys.ethz.ch](https://m.ethz.ch/#/#web:phys.ethz.ch) - help & news for webhosting
+- [#web:phys.ethz.ch](https://m.ethz.ch/#/#web:phys.ethz.ch) - help & news for web hosting
- [#linux:phys.ethz.ch](https://m.ethz.ch/#/#linux:phys.ethz.ch) - about Linux workstations & software
- [#gpu:phys.ethz.ch](https://m.ethz.ch/#/#gpu:phys.ethz.ch) - about GPU & CUDA usage
- [#helpdesk:phys.ethz.ch](https://m.ethz.ch/#/#helpdesk:phys.ethz.ch) - for all other IT requests & help
-Customise your [[notification|/chat/element#notifications]] levels across the app and per room.
+Customize your [[notification|/chat/element#notifications]] levels across the app and per room.
Reduce the notification level of chatty rooms like the Helpdesk to 'Mentions & Keywords'.
Keep the default for the News and Status room, where only moderators are allowed to send messages.