From 7d96774d4ddad684d684870b64340e27b6b02239 Mon Sep 17 00:00:00 2001
From: Claude Becker <becker@phys.ethz.ch>
Date: Fri, 7 Feb 2025 07:32:25 +0100
Subject: [PATCH] spellcheck

---
 audience/mac_user.markdown                       |  1 -
 ...er_of_managed_workstations_at_d-phys.markdown |  1 -
 documentation/ansible/ansible_basics.markdown    |  4 ++--
 .../ansible/ansible_task_snippets.markdown       |  2 +-
 documentation/debian_version_numbers.markdown    |  4 ++--
 documentation/elasticsearch.markdown             |  6 +++---
 documentation/enable_tpm.markdown                |  2 +-
 documentation/git_basics.markdown                | 12 ++++++------
 documentation/git_hints.markdown                 |  4 ++--
 documentation/grafana.markdown                   | 10 +++++-----
 .../how_to_add_tests_to_our_big_brother.markdown | 10 +++++-----
 documentation/how_to_handle_passwords.markdown   | 10 +++++-----
 osx/802_1x.markdown                              |  4 ++--
 osx/apple_tv.markdown                            |  2 +-
 ...your_interface_language_with_macos_x.markdown | 16 ----------------
 ..._to_improve_your_macos_x_workstation.markdown |  4 ++--
 osx/latex.markdown                               |  4 ++--
 osx/mac_samba.markdown                           | 10 +++++-----
 osx/magic_keys_used_by_mac_hardware.markdown     |  2 +-
 osx/skim.markdown                                |  2 +-
 osx/unicodeit.markdown                           |  6 +++---
 services/d-phys_domain_logon.markdown            |  2 +-
 services/group_report.markdown                   |  2 +-
 services/linuxws.markdown                        |  2 +-
 services/lvmchart.markdown                       |  8 ++++----
 services/nemo_user.markdown                      |  2 +-
 ...he_use_and_care_of_data_on_computers.markdown |  4 ++--
 services/tools_statistics.markdown               |  4 ++--
 services/using_remoteapp.markdown                |  2 +-
 services/windows_terminal_server.markdown        |  6 +++---
 windows/connect_to_terminalserver.markdown       |  2 +-
 31 files changed, 66 insertions(+), 84 deletions(-)
 delete mode 100644 osx/how_to_choose_your_interface_language_with_macos_x.markdown

diff --git a/audience/mac_user.markdown b/audience/mac_user.markdown
index 0e105c84..b9a511bc 100644
--- a/audience/mac_user.markdown
+++ b/audience/mac_user.markdown
@@ -5,7 +5,6 @@ I'm a macOS User
 * [[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]]
-* [[How to choose your interface language with macOS|osx/How to choose your interface language with macos x]]
 * [[How to improve your macOS workstation|osx/How to improve your macos x workstation]]
 * [[osx/Magic Keys used by Mac Hardware]]
 * [[Keychain Access password storage|osx/keychain]]
diff --git a/audience/user_of_managed_workstations_at_d-phys.markdown b/audience/user_of_managed_workstations_at_d-phys.markdown
index 13c3617c..e1ce7757 100644
--- a/audience/user_of_managed_workstations_at_d-phys.markdown
+++ b/audience/user_of_managed_workstations_at_d-phys.markdown
@@ -30,7 +30,6 @@ How to with D-PHYS Windows
 How to with D-PHYS Mac
 ----------------------
 
-* [[osx/How to choose your interface language with macos x]]
 * [[mail/How to use email with Apple Mail]]
 * [[How to use Calendar in iCal|calendar/apple_ical]]
 * [[Restore data from the backups|backups/restore]]
diff --git a/documentation/ansible/ansible_basics.markdown b/documentation/ansible/ansible_basics.markdown
index 7804e90d..723723d8 100644
--- a/documentation/ansible/ansible_basics.markdown
+++ b/documentation/ansible/ansible_basics.markdown
@@ -119,7 +119,7 @@ hash_behaviour = merge
 
 where the `hash_behaviour` setting enables merging of hash variables for instance from `host_vars` and `group_vars`.
 
-In some cases you may want to add `force_handlers = true` to trigger handlers even if a failure occured on that host.
+In some cases you may want to add `force_handlers = true` to trigger handlers even if a failure occurred on that host.
 
 ### inventory
 
@@ -225,7 +225,7 @@ ansible-playbook playbooks/play.yml --limit @playbooks/play.retry
 Force handlers
 --------------
 
-By default, if a task fails, ansible stops the further execution and skips running all handlers, even if they were notified earlier in the playbook by succeeding tasks. As explained under [handlers and failure](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_error_handling.html#handlers-and-failure) use the `--force-handlers` command-line option or `force_handlers: True` to change this behaviour.
+By default, if a task fails, ansible stops the further execution and skips running all handlers, even if they were notified earlier in the playbook by succeeding tasks. As explained under [handlers and failure](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_error_handling.html#handlers-and-failure) use the `--force-handlers` command-line option or `force_handlers: True` to change this behavior.
 
 Illustrating playbook:
 
diff --git a/documentation/ansible/ansible_task_snippets.markdown b/documentation/ansible/ansible_task_snippets.markdown
index 5c21660c..c99625d0 100644
--- a/documentation/ansible/ansible_task_snippets.markdown
+++ b/documentation/ansible/ansible_task_snippets.markdown
@@ -291,7 +291,7 @@ This can also be set for a whole playbook to continue executing tasks after the
 ```
 
 
-### Yaml multiline values
+### Yaml multi-line values
 
 Use `|` to preserve newlines:
 
diff --git a/documentation/debian_version_numbers.markdown b/documentation/debian_version_numbers.markdown
index 827ef17a..7a1fd782 100644
--- a/documentation/debian_version_numbers.markdown
+++ b/documentation/debian_version_numbers.markdown
@@ -54,7 +54,7 @@ Suffixes on package versions can contain further information about a package. Al
     * 121-3+deb70u2 = dito (less common variant)
 * `ubuntu<n>`: Package changed by Ubuntu compared to the package in Debian
     * 123-3ubuntu4 = Fourth Ubuntu revision of Debian's 123-3 package
-    * 124-0ubuntu1 = Ubuntu packaged a newer upstream release before Debian, but based on the according Debian package in a way that Debian's first package may still superseed Ubuntu's package, i.e. 124-1 > 124-0ubuntu1
+    * 124-0ubuntu1 = Ubuntu packaged a newer upstream release before Debian, but based on the according Debian package in a way that Debian's first package may still supersede Ubuntu's package, i.e. 124-1 > 124-0ubuntu1
 
 Full example
 ------------
@@ -65,6 +65,6 @@ Full example
 * 3.6.19 = Upstream software version (often major.minor.micro version number)
 * 1~bpo70+1+b1 = Full debian revision
     * 1 = Original debian revision to allow multiple packages of the same upstream version, increments if only the packaging has changed between two package releases.
-    * ~bpo70 = bpo = backported, 70 = to Debian 7 aka Wheezy
+    * ~bpo70 = bpo = backport, 70 = to Debian 7 aka Wheezy
     * +1 = Backport revision, increments if only the backport packaging has changed between two backport package  releases.
     * +b1 = First binary rebuild without source changes
diff --git a/documentation/elasticsearch.markdown b/documentation/elasticsearch.markdown
index 2c1478b1..7bd49104 100644
--- a/documentation/elasticsearch.markdown
+++ b/documentation/elasticsearch.markdown
@@ -28,7 +28,7 @@ Concepts
     - by default, an index contains 5 primary shards, each having 1 replica shard
 * segments = Lucene splits its own index inside the shards into segments
     - an index can be optimized by merging all data into a single segment
-    - the size of a segment shoult not exceed `max_merged_segment` (default 5GB)
+    - the size of a segment should not exceed `max_merged_segment` (default 5GB)
 * document = stored object, serialized into JSON
     - required metadata = `_index`, `_type`, `_id`, the combination of the three uniquely defines any document
     - documents (like indices) are immutable; they cannot be changed, only replaced
@@ -216,7 +216,7 @@ The order of filters in a `bool` clause is important for performance. More speci
 }
 ```
 
-#### infex, from, size
+#### index, from, size
 
 ```ruby
 index: 'logstash-2015.01.18',   # restrict to given index
@@ -369,7 +369,7 @@ aggs: {
 Third-party tools
 -----------------
 
-### Elasticsearch-kopf: web frontend for mainenance tasks
+### Elasticsearch-kopf: web front-end for maintenance tasks
 
 [GitHub](https://github.com/lmenezes/elasticsearch-kopf)
 
diff --git a/documentation/enable_tpm.markdown b/documentation/enable_tpm.markdown
index 2fea8392..b6524468 100644
--- a/documentation/enable_tpm.markdown
+++ b/documentation/enable_tpm.markdown
@@ -5,7 +5,7 @@ Some features in modern Operating Systems need a security chip.
 
 One of this security chip is called [Trusted Platform Module (TPM)](https://en.wikipedia.org/wiki/Trusted_Platform_Module).
 
-There are two types of TPM's. An additional Chip on your board (TPM) or one in your CPU (fTPM).
+There are two types of TPMs. An additional Chip on your board (TPM) or one in your CPU (fTPM).
 
 ## Check if your TPM is already enabled
 
diff --git a/documentation/git_basics.markdown b/documentation/git_basics.markdown
index 72a97ac7..016172bd 100644
--- a/documentation/git_basics.markdown
+++ b/documentation/git_basics.markdown
@@ -10,7 +10,7 @@ Consider the following scenario: you have a collection of files and directories
 
 [[!img /media/git/big-picture.png alt="GIT: the big picture"]]
 
-The colored files indicate changes and additions.  The collections labled `A`, `B`, `C`, and `D` are snapshots of the project which in a traditional, manual setup you would keep in tar-files like `my-project-A.tar.gz`, etc. (and in GIT parlance you could use tags instead).
+The colored files indicate changes and additions.  The collections labeled `A`, `B`, `C`, and `D` are snapshots of the project which in a traditional, manual setup you would keep in tar-files like `my-project-A.tar.gz`, etc. (and in GIT parlance you could use tags instead).
 
 In this scenario GIT will help you keep track of the snapshots (called commits by GIT) automatically.  It will do this in an efficient way to save space and time and it will keep track of the history including which snapshot branched off from which parent snapshot.  GIT uses its own internal labeling with SHA1 hashes (40-digit hex numbers, indicated as the small text in the above picture).  This makes all GIT objects (files, commits, etc.) globally unique.  At the same time an object is stored only once if it is the same (i.e., a file that does not change over time).
 
@@ -49,7 +49,7 @@ git add directory2
 
 Instead of `.git-keep` you can take any other convenient file name.
 
-These `add` and `rm` will not immediately be recorded in a new commit but they are collected in a sort of cache called the index.  While you may (and should) record small change sets in a commit you should also make sure that each commit represents a meaningful state of your collection of files.  In other words, if at some time you like to check out a particular commit (or analyse the difference between two commits) each commit should represent the collection of files of the project at the given stage.
+These `add` and `rm` will not immediately be recorded in a new commit but they are collected in a sort of cache called the index.  While you may (and should) record small change sets in a commit you should also make sure that each commit represents a meaningful state of your collection of files.  In other words, if at some time you like to check out a particular commit (or analyze the difference between two commits) each commit should represent the collection of files of the project at the given stage.
 
 After you have recorded all the changes you can create the new commit.
 
@@ -65,7 +65,7 @@ At any time the command
 git status
 ```
 
-will indicate files that are ready to be commited and others which have changed but have not been added to the commit cache (or index).  You need not include all changed files in a commit.
+will indicate files that are ready to be committed and others which have changed but have not been added to the commit cache (or index).  You need not include all changed files in a commit.
 
 The command
 
@@ -118,7 +118,7 @@ cd /etc/xymon
 git remote add hansel hansel@login.phys.ethz.ch:/home/hansel/git/xymon
 ```
 
-You can then work inside `/home/hansel/git/xymon` (editing, adding, commiting).  To keep your developer copy current do
+You can then work inside `/home/hansel/git/xymon` (editing, adding, committing).  To keep your developer copy current do
 
 ```
 git pull
@@ -161,7 +161,7 @@ git commit -m 'initial commit'
 git push origin master
 ```
 
-The `git clone` command in this will display a waring that the repository is still empty.  Typically, this will be on a computer different from the one holding the bare repository so `$BARE_REPO_DIRECTORY/my-project.git` will be an ssh URL of the form `user@login.phys.ethz.ch:/path/to/repo/my-project.git`
+The `git clone` command in this will display a warning that the repository is still empty.  Typically, this will be on a computer different from the one holding the bare repository so `$BARE_REPO_DIRECTORY/my-project.git` will be an ssh URL of the form `user@login.phys.ethz.ch:/path/to/repo/my-project.git`
 
 All other repositories are then created by cloning from the bare repository now holding the initial commit created above.  This may be on a third computer.
 
@@ -198,7 +198,7 @@ cd ~hansel/path/to/git/project
 git remote add gretel $GRETEL_URL
 ```
 
-where $GRETEL_URL is some way to access the other developers repository read-only.  This can typically be direct file system access or via the http or git protocols.
+where $GRETEL_URL is some way to access the other developers repository read-only.  This can typically be direct file system access or via the HTTP or git protocols.
 
 Branching and Merging
 ---------------------
diff --git a/documentation/git_hints.markdown b/documentation/git_hints.markdown
index 98c3a028..a680c7ed 100644
--- a/documentation/git_hints.markdown
+++ b/documentation/git_hints.markdown
@@ -17,7 +17,7 @@ We think that color coded diffs and status reports help greatly, therefore we co
 git config --global color.ui "auto"
 ```
 
-If you prefer svn-like shortcuts, also configure the following aliases:
+If you prefer SVN-like shortcuts, also configure the following aliases:
 
 ```sh
 git config --global alias.st status
@@ -51,7 +51,7 @@ git clone <your D-PHYS user name>@login.phys.ethz.ch:/home/<group name>/[<some o
 Git on Windows
 --------------
 
-Git on Windows is often used via [Cygwin](http://www.cygwin.com/). Nevertheless the most popular SSH client for Windows is Putty. Putty provides a program called `plink.exe` which can be used as commandline SSH client. Unfortunately this program does not seem to work properly together with `git`.
+Git on Windows is often used via [Cygwin](http://www.cygwin.com/). Nevertheless the most popular SSH client for Windows is Putty. Putty provides a program called `plink.exe` which can be used as command-line SSH client. Unfortunately this program does not seem to work properly together with `git`.
 
 In case you get error messages like
 
diff --git a/documentation/grafana.markdown b/documentation/grafana.markdown
index b7230766..753c921f 100644
--- a/documentation/grafana.markdown
+++ b/documentation/grafana.markdown
@@ -2,9 +2,9 @@
 
 See also [[InfluxDB]] and join the [#grafana:phys.ethz.ch](https://m.ethz.ch/#/#grafana:phys.ethz.ch) chat room.
 
-We provide a `Grafana` service at [grafana.phys.ethz.ch](https://grafana.phys.ethz.ch/) using [[InfluxDB]] as backend for time series data. To request a group-site (grafana organization) or access to an existing group, please [[services/contact]] us, providing the desired organization name and ldap group-mappings (see below).
+We provide a `Grafana` service at [grafana.phys.ethz.ch](https://grafana.phys.ethz.ch/) using [[InfluxDB]] as back-end for time series data. To request a group-site (grafana organization) or access to an existing group, please [[services/contact]] us, providing the desired organization name and ldap group-mappings (see below).
 
-[Grafana](https://grafana.com/) is an open-source, general purpose dashboard and graph composer, which runs as a web application. It supports graphite, [[InfluxDB]] or opentsdb as backends.
+[Grafana](https://grafana.com/) is an open-source, general purpose dashboard and graph composer, which runs as a web application. It supports graphite, [[InfluxDB]] or opentsdb as back-ends.
 
 [[!img /media/grafana_example.png size="450x"]]
 
@@ -20,7 +20,7 @@ Login using your [[D-PHYS Account|account/#d-phys-account]].
 
 ### LDAP Group mappings
 
-The organization membership is mapped via [[account/ldap]] groups. To view current members of ldap groups, visit our [account page](https://account.phys.ethz.ch/group/info). The following grafana org. roles can be assigned to ldap groups, which will be assigned to all members of the group as soon as they log in at the [grafana webinterface](https://grafana.phys.ethz.ch/):
+The organization membership is mapped via [[account/ldap]] groups. To view current members of ldap groups, visit our [account page](https://account.phys.ethz.ch/group/info). The following grafana org. roles can be assigned to ldap groups, which will be assigned to all members of the group as soon as they log in at the [grafana web interface](https://grafana.phys.ethz.ch/):
 
 - `Admin`: Allowed to add datasources, has all permissions
 - `Editor`: Allowed to add/edit dashboards
@@ -107,7 +107,7 @@ Follow the instructions to use the [[Webhook API|https://readme.phys.ethz.ch/cha
 - Optional: add `?template=<template>` to specify how notifications get displayed.
   See [docs](https://gitlab.ethz.ch/isgphys/webhook-to-matrix-hookshot#configuration).
 
-### 3. Define notifcation policy
+### 3. Define notification policy
 
 [/alerting/routes](https://grafana.phys.ethz.ch/alerting/routes)
 
@@ -132,7 +132,7 @@ Follow the instructions to use the [[Webhook API|https://readme.phys.ethz.ch/cha
 
 ## Server metrics
 
-Realtime server metrics of the system hosting both InfluxDB and Grafana services.
+Real-time server metrics of the system hosting both InfluxDB and Grafana services.
 
 ### Total CPU utilization (all cores)
 
diff --git a/documentation/how_to_add_tests_to_our_big_brother.markdown b/documentation/how_to_add_tests_to_our_big_brother.markdown
index 0ab3ab65..d682cedb 100644
--- a/documentation/how_to_add_tests_to_our_big_brother.markdown
+++ b/documentation/how_to_add_tests_to_our_big_brother.markdown
@@ -3,7 +3,7 @@ How to add tests to our monitoring
 
 ### Standalone Tests reporting to Big Brother/Hobbit/Xymon via TCP
 
-Check what ever you want, and after checking it simply connect to your favourite BigBrother server, usually at TCP port 1984 and send you test results in the following form:
+Check what ever you want, and after checking it simply connect to your favorite BigBrother server, usually at TCP port 1984 and send you test results in the following form:
 
 ```
 status[+<minutes>] <host>.<service> <color> <date> - <state>
@@ -17,8 +17,8 @@ where:
 * `<service>`: The (short) name of the service being tested with this test.
 * `<color>`: The color the test resulted in. Unless writing software for managing BigBrother servers this should only be one of either red, yellow or green.
 * `<date>`: Usually the (chomped) output of `date`.
-* `<state>`: A word, usally in CAPSLOCK, concisely describing the situation, e.g. for a temperature test the states could be OK or NORMAL (for green), WARM (for yellow), BOILING (for red), but can also state additional situations as ERROR (e.g. in connection with red, yellow or perhaps even purple) or NOTHING TO REPORT (e.g. in connection with green)
-* `<message>`: An arbitrary, maybe multiline message which can include HTML code and therefore images (like RRD stats, BigBrother/Hobbit/Xymon icons for single components of the test), external links, log file contents, etc. Only HTML entities do not work well. Use ISO-Latin-1 8-bit characters instead. (Will be truncated by default a 4kB (BB), in our environment at 1MB.)
+* `<state>`: A word, usually in CAPSLOCK, concisely describing the situation, e.g. for a temperature test the states could be OK or NORMAL (for green), WARM (for yellow), BOILING (for red), but can also state additional situations as ERROR (e.g. in connection with red, yellow or perhaps even purple) or NOTHING TO REPORT (e.g. in connection with green)
+* `<message>`: An arbitrary, maybe multi-line message which can include HTML code and therefore images (like RRD stats, BigBrother/Hobbit/Xymon icons for single components of the test), external links, log file contents, etc. Only HTML entities do not work well. Use ISO-Latin-1 8-bit characters instead. (Will be truncated by default a 4kB (BB), in our environment at 1MB.)
 
 Does not have to a local test, e.g. one host can test several other hosts and then report to the BigBrother/Hobbit/Xymon server.
 
@@ -26,12 +26,12 @@ Does not have to a local test, e.g. one host can test several other hosts and th
 
 Work similar, but will be called every five minutes from the local BigBrother client and has to be configured per host in `$BBHOME/etc/bb-bbexttab`. Will get some configuration data from environment variables such as:
 
-* `$BBHOME`: Home of the user bb and the base directory of the BigBrother client installation
+* `$BBHOME`: Home of the user `bb` and the base directory of the BigBrother client installation
 * `$BBTMP`: Directory for temporary files.
 * `$BB`: Location of the BigBrother client binary.
 * `$BBDISP`: List of possibly several BigBrother servers to report to.
 
-Shell scripts usually source `$BBHOME/etc/bbdef.sh` to get all configuration informations.
+Shell scripts usually source `$BBHOME/etc/bbdef.sh` to get all configurations.
 
 At the end, the script or program should call
 
diff --git a/documentation/how_to_handle_passwords.markdown b/documentation/how_to_handle_passwords.markdown
index 5997deeb..b2cf0631 100644
--- a/documentation/how_to_handle_passwords.markdown
+++ b/documentation/how_to_handle_passwords.markdown
@@ -19,7 +19,7 @@ Good passwords are important – but they are only truly secure if they are hand
     * upper-case letters `A-Z`
     * numbers `0-9`
     * punctuation characters <code>\\`_~!@#$%^&*()+={}[]\|;:"\<\>,.?/</code>
-    * all other characters (whitespace/unprintable)
+    * all other characters (white-space/unprintable)
 
 ## Do not use weak passwords
 
@@ -29,7 +29,7 @@ Good passwords are important – but they are only truly secure if they are hand
 
 ## Real life tips to manage your passwords
 
-Use a password manager with a very secure master password. See below how to build such a password, which is easily rememberable. This will be the only single password you have to remember - ever. Therefore it is crucial to use a secure password as explained under "Use good passwords". I recommend to use even more characters as the minimal password length mentioned in this howto. The longer the more secure it is.
+Use a password manager with a very secure master password. See below how to build such a password, which is easily rememberable. This will be the only single password you have to remember - ever. Therefore it is crucial to use a secure password as explained under "Use good passwords". I recommend to use even more characters as the minimal password length mentioned in this how-to. The longer the more secure it is.
 
 Generate unique passwords for all your accounts and store them securely in the password manager.
 
@@ -58,11 +58,11 @@ With an encrypted password safe, your passwords are stored in an encrypted datab
 
 ## Vaultwarden (ISG-hosted password manager)
 
-We host [Vaultwarden](https://github.com/dani-garcia/vaultwarden), a [Bitwarden](https://bitwarden.com/) compatible password manager featuring a web frontend, device sync and the possibility to share passwords within a group. Please read [our documentation](https://readme.phys.ethz.ch/documentation/vaultwarden/) on how to get started with Vaultwarden.
+We host [Vaultwarden](https://github.com/dani-garcia/vaultwarden), a [Bitwarden](https://bitwarden.com/) compatible password manager featuring a web front-end, device sync and the possibility to share passwords within a group. Please read [our documentation](https://readme.phys.ethz.ch/documentation/vaultwarden/) on how to get started with Vaultwarden.
 
 ## KeePassXC (standalone password manager)
 
-**KeePassXC** is a community fork of KeePassX, a native cross-platform port of the KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. In a typical scenario, you'd use [Polybox](https://polybox.ethz.ch/) as the sync backend in KeePassXC.
+**KeePassXC** is a community fork of KeePassX, a native cross-platform port of the KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. In a typical scenario, you'd use [Polybox](https://polybox.ethz.ch/) as the sync back-end in KeePassXC.
 
 - [Features](https://github.com/keepassxreboot/keepassxc/wiki/KeePassXC-Changelog)
 - [Screenshots](https://keepassxc.org/screenshots)
@@ -90,4 +90,4 @@ Use the binaries/installers or distribution-specific packages from [keepassxc.or
 
 ## Additional information about password security
 
-- [ETHz Information Security Awareness Campain](https://monster.phys.ethz.ch)
+- [ETHZ Information Security Awareness Campaign](https://monster.phys.ethz.ch)
diff --git a/osx/802_1x.markdown b/osx/802_1x.markdown
index 5024549f..cd95d41a 100644
--- a/osx/802_1x.markdown
+++ b/osx/802_1x.markdown
@@ -1,7 +1,7 @@
 macOS 802.1X
 ============
 
-Many network cables are connected to the so-called _docking_ network of ETH, which can dynamically assign the correct VLAN to computers. By default a computer can only access a very limited number of internet ressources. Unlimited access is provided if you either authenticate with your ETH account or let ISG D-PHYS register the MAC address of your computer.
+Many network cables are connected to the so-called _docking_ network of ETH, which can dynamically assign the correct VLAN to computers. By default a computer can only access a very limited number of internet resources. Unlimited access is provided if you either authenticate with your ETH account or let ISG D-PHYS register the MAC address of your computer.
 
 
 Disable automatic connection
@@ -13,7 +13,7 @@ Although registered computers should automatically be connected to the D-PHYS ne
 
 Follow these steps to get rid of this dialog
 
-* Open the _Network_ tab in _System Prefences_
+* Open the _Network_ tab in _System Preferences_
 * Select your wired network interface in the list on the left
 * Click the _Details_ button
 * Select the 802.1X Tab
diff --git a/osx/apple_tv.markdown b/osx/apple_tv.markdown
index 7dd3a6d3..07cec751 100644
--- a/osx/apple_tv.markdown
+++ b/osx/apple_tv.markdown
@@ -24,7 +24,7 @@ Create Profile
 
     [[!img /media/osx/appletv-wifi-2.png]]
 
-* Save the profile. Note that this file contains the Wi-Fi username and password in plaintext.
+* Save the profile. Note that this file contains the Wi-Fi username and password in plain-text.
 
 Configure Apple TV
 ------------------
diff --git a/osx/how_to_choose_your_interface_language_with_macos_x.markdown b/osx/how_to_choose_your_interface_language_with_macos_x.markdown
deleted file mode 100644
index 140391d3..00000000
--- a/osx/how_to_choose_your_interface_language_with_macos_x.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
-How to choose your interface language with macOS
-==================================================
-
-The macOS operating system, and most applications are available in multiple languages. Within a few steps you can change the interface language on your computer.
-
-##### From German to English
-
-* from the Apple menu (the leftmost menu) choose `Systemeinstellungen...`
-* choose `Sprachen & Text`
-* in the `Sprachen` tab rearrange the list so that English is at the top (using the mouse and dragging the line up)
-
-##### Von Englisch nach Deutsch
-
-* im Apfel Menu (ganz links im Menubalken) wähle `System Preferences...`
-* wähle `Language & Text`
-* unter `Language` verschiebe Deutsch nach oben (mit der Maus die Zeile nach oben ziehen)
diff --git a/osx/how_to_improve_your_macos_x_workstation.markdown b/osx/how_to_improve_your_macos_x_workstation.markdown
index f064ba7d..84d07cb2 100644
--- a/osx/how_to_improve_your_macos_x_workstation.markdown
+++ b/osx/how_to_improve_your_macos_x_workstation.markdown
@@ -1,7 +1,7 @@
 How to improve your macOS workstation
 ========================================
 
-There are quite a few tools available to help you to get most out of your macOS workstation. Darwin, the macOS base system, is a BSD on Mach Microkernel and this gives you the possibility to use nearly all of the typical _OpenSource_ applications written for Linux or BSD. Furthermore, a lot of _Freeware_ for macOS is provided by various people. Lastly, you may also opt for commercial applications like MS Office or the Adobe products.
+There are quite a few tools available to help you to get most out of your macOS workstation. Darwin, the macOS base system, is a BSD on Mach Micro-kernel and this gives you the possibility to use nearly all of the typical _Open-Source_ applications written for Linux or BSD. Furthermore, a lot of _Freeware_ for macOS is provided by various people. Lastly, you may also opt for commercial applications like MS Office or the Adobe products.
 
 ### User Applications
 
@@ -15,7 +15,7 @@ The [[documentation/Microsoft365]] subscription offers access to all Microsoft O
 
 ##### PDF Reader and Writer
 
-Apple's Preview is the standard MacOS application to view and annotate pdf files. If you want to create a PDF file you can do that without additional software using the standard print dialog. If you want you can additionally install Adobe's [Acrobat Reader](http://get.adobe.com/reader/) (proprietary, free software) or the complete [Acrobat Pro](http://www.adobe.com/products/acrobat/) application via the [[documentation/Adobe Creative Cloud]] subscription. [[Skim]] is a very powerful alternative to view and especially to annotate pdfs.
+Apple's Preview is the standard MacOS application to view and annotate PDF files. If you want to create a PDF file you can do that without additional software using the standard print dialog. If you want you can additionally install Adobe's [Acrobat Reader](http://get.adobe.com/reader/) (proprietary, free software) or the complete [Acrobat Pro](http://www.adobe.com/products/acrobat/) application via the [[documentation/Adobe Creative Cloud]] subscription. [[Skim]] is a very powerful alternative to view and especially to annotate PDFs.
 
 ##### Web Browser
 
diff --git a/osx/latex.markdown b/osx/latex.markdown
index b327f472..ec84d1c6 100644
--- a/osx/latex.markdown
+++ b/osx/latex.markdown
@@ -32,7 +32,7 @@ You can adapt the LaTeX preamble to include your favorite packages either in the
 UnicodeIt
 ---------
 
-[[UnicodeIt]] allows to convert LaTeX expressions to the corresponding unicode characters.
+[[UnicodeIt]] allows to convert LaTeX expressions to the corresponding Unicode characters.
 
 
 latexmk
@@ -40,7 +40,7 @@ latexmk
 
 [Latexmk](http://users.phys.psu.edu/~collins/software/latexmk-jcc/) (included in MacTeX) is a command-line tool automating the generation of documents from LaTeX source. It runs all the required commands in the correct order and updates the PDF each time the TeX file is saved.
 
-The following command compiles the TeX file with `pdflatex`, opens the resulting PDF and continually recompiles everything if the source files change.
+The following command compiles the TeX file with `pdflatex`, opens the resulting PDF and continually re-compiles everything if the source files change.
 
 ```sh
 latexmk -pdf -pvc document.tex
diff --git a/osx/mac_samba.markdown b/osx/mac_samba.markdown
index 85fa990d..a92aaef9 100644
--- a/osx/mac_samba.markdown
+++ b/osx/mac_samba.markdown
@@ -5,7 +5,7 @@ We have the common situation where our file servers are running Linux and the cl
 
 #### unix extensions off -> macOS can't see or change file permissions
 
-The [common lore](http://www.google.com/search?q=mac%20os%20smb%20unix%20extensions) is that unix extensions should be turned off for macOS clients. As a downside, the Mac user cannot correctly see or change the file permissions on the smb share. To illustrate this we consider a folder with three empty files having different permissions and run `ls -l` on the Linux file server and in the smb mount on a Mac client.
+The [common lore](http://www.google.com/search?q=mac%20os%20smb%20unix%20extensions) is that unix extensions should be turned off for macOS clients. As a downside, the Mac user cannot correctly see or change the file permissions on the SMB share. To illustrate this we consider a folder with three empty files having different permissions and run `ls -l` on the Linux file server and in the SMB mount on a Mac client.
 
 ##### Linux
 
@@ -29,7 +29,7 @@ The Linux displays the correct file permissions, whereas the Mac shows identical
 
 #### unix extensions on -> cannot copy symlinks
 
-When unix extensions are switched on on the smb server, the Mac can correctly display and change file permissions on the command line. Unfortunately this comes at the price of no longer being able to copy certain symbolic links to the smb share. The following scenario illustrates the problem.
+When unix extensions are switched on on the SMB server, the Mac can correctly display and change file permissions on the command line. Unfortunately this comes at the price of no longer being able to copy certain symbolic links to the SMB share. The following scenario illustrates the problem.
 
 Let's create, locally on the Mac, a folder containing a file `b.txt` and a symlink `a.txt` to that file.
 
@@ -43,17 +43,17 @@ ls -l
    -rw-r--r-- 1 user staff 0 Oct 26 10:33 b.txt
 ```
 
-Then, within the Finder, drag'n'drop that folder to the mounted smb share with enabled unix extensions. The copying fails with the error message
+Then, within the Finder, drag'n'drop that folder to the mounted SMB share with enabled unix extensions. The copying fails with the error message
 
 ```
      The operation can't be completed because one or more required items can't be found. (Error code -43)
 ```
 
-A similar error message is produced when copying the folder with `rsync -av`. After some more digging we realized that the alphabetical order matters. If the symlink is called `c.txt` instead of `a.txt`, Finder is able to copy the folder. This indicates that the Finder copies in alphabetical order. When the symlink precedes the actual file it points to, the smb server seems to complain, that it cannot link to a non-existing file, yielding the above error message in macOS.
+A similar error message is produced when copying the folder with `rsync -av`. After some more digging we realized that the alphabetical order matters. If the symlink is called `c.txt` instead of `a.txt`, Finder is able to copy the folder. This indicates that the Finder copies in alphabetical order. When the symlink precedes the actual file it points to, the SMB server seems to complain, that it cannot link to a non-existing file, yielding the above error message in macOS.
 
 #### Conclusion
 
-From the above we must conclude that there is no possible choice for the unix extensions setting in samba that does not lead to issues with smb shares on macOS.
+From the above we must conclude that there is no possible choice for the unix extensions setting in samba that does not lead to issues with SMB shares on macOS.
 
 ##### Further reading
 
diff --git a/osx/magic_keys_used_by_mac_hardware.markdown b/osx/magic_keys_used_by_mac_hardware.markdown
index 7398ad41..f0068621 100644
--- a/osx/magic_keys_used_by_mac_hardware.markdown
+++ b/osx/magic_keys_used_by_mac_hardware.markdown
@@ -5,7 +5,7 @@ Magic Keys used by Mac Hardware
 
 * **Cmd-V** Verbose startup (text console)
 * **Cmd-S** Single user mode
-* **T** Export internal Disk as firewire device (target mode)
+* **T** Export internal disk for target mode
 * **C** Boot from CD-ROM
 * **N** Boot from Network
 * **D** Download and run diagnosing software over the network (even wireless can be used)
diff --git a/osx/skim.markdown b/osx/skim.markdown
index d7f70126..8c580260 100644
--- a/osx/skim.markdown
+++ b/osx/skim.markdown
@@ -20,7 +20,7 @@ Besides the presentation mode, Skim offers a full screen mode for comfortable re
 
 Skim can recognize when a PDF file is updated on the disk and reload it. For this to work, make sure `Check for file changes` is checked in the `Sync` tab of Skim's preferences.
 
-If you don't want to be prompted for every file, you can enter the following command to activate autoreload globally.
+If you don't want to be prompted for every file, you can enter the following command to activate auto-reload globally.
 
 ```sh
 defaults write -app Skim SKAutoReloadFileUpdate -boolean true
diff --git a/osx/unicodeit.markdown b/osx/unicodeit.markdown
index f5323f81..050b6849 100644
--- a/osx/unicodeit.markdown
+++ b/osx/unicodeit.markdown
@@ -1,14 +1,14 @@
 UnicodeIt
 =========
 
-[UnicodeIt](http://www.unicodeit.net/) allows to convert LaTeX expressions to the corresponding [Unicode](http://en.wikipedia.org/wiki/Unicode) characters. This provides an easy way to typeset simple mathematical expressions, greek letters or other symbols, and insert them inline into your text in any application, for instance Keynote or PowerPoint.
+[UnicodeIt](http://www.unicodeit.net/) allows to convert LaTeX expressions to the corresponding [Unicode](http://en.wikipedia.org/wiki/Unicode) characters. This provides an easy way to typeset simple mathematical expressions, Greek letters or other symbols, and insert them inline into your text in any application, for instance Keynote or PowerPoint.
 
 Note that not all LaTeX expressions are supported. Consider using [LaTeXiT](http://www.chachatelier.fr/latexit/) for more complicated formulas.
 
 Installation on macOS
 --------------------
 
-* Download the macOS app from their [webpage](http://www.unicodeit.net/)
+* Download the macOS app from their [web page](http://www.unicodeit.net/)
 * Double-click the `UnicodeIt` item and choose to install it as a service
 
     [[!img /media/osx/unicodeit1.png size="450x"]]
@@ -24,4 +24,4 @@ Usage on macOS
 * In most applications, type your LaTeX formula, e.g. `e^+ e^- \to 2\gamma`
 * Select the text
 * In the application menu, go to `Services` and click `UnicodeIt`, or press your custom keyboard shortcut
-* The selected LaTeX expression should have been replaced by the unicode symbols.
+* The selected LaTeX expression should have been replaced by the Unicode symbols.
diff --git a/services/d-phys_domain_logon.markdown b/services/d-phys_domain_logon.markdown
index 1e753bb9..ce916535 100644
--- a/services/d-phys_domain_logon.markdown
+++ b/services/d-phys_domain_logon.markdown
@@ -6,5 +6,5 @@ In our environment the D-PHYS Domain Logon is done against a Microsoft Active Di
 D-PHYS Domain Logon has some advantages like:
 
 * **Roaming Profile**, which saves the personal settings of the user environment on the profile and can be used on every Windows workstation which is also in the D-PHYS Domain.
-* **No local user accounts**, it is not anymore necessary to create local user accounts on the workstations and keep them in synchronisation.
+* **No local user accounts**, it is not anymore necessary to create local user accounts on the workstations and keep them in synchronization.
 * **automatic share connection**, the home drive and any group drives you have access to will be connected automatically and always have the same drive letter for every user in the group.
diff --git a/services/group_report.markdown b/services/group_report.markdown
index c744f899..64da12f8 100644
--- a/services/group_report.markdown
+++ b/services/group_report.markdown
@@ -79,4 +79,4 @@ List of current group members, ordered by username. Contact ISG if you want any
 
 ### Online graph
 
-The report includes a link to a webpage with an interactive sunburst visualization of the groupshare disk usage. The access is restricted to the current members of the group which can use their physics account to log in. Each graph represents a single groupshare, with all its subfolders, including those belonging to a different group. The angular width represents the relative size of the folder. The different rings are the subfolder levels. The sole purpose of the colors is to differentiate the elements. The user can click on each folder to enter it, and click on the central region to navigate back to the parent folder. You can play with a [working example](https://duc.zevv.nl/demo.cgi?cmd=index&path=/usr/share) on the [DUC homepage](https://duc.zevv.nl/).
+The report includes a link to a web page with an interactive sunburst visualization of the groupshare disk usage. The access is restricted to the current members of the group which can use their physics account to log in. Each graph represents a single groupshare, with all its subfolders, including those belonging to a different group. The angular width represents the relative size of the folder. The different rings are the subfolder levels. The sole purpose of the colors is to differentiate the elements. The user can click on each folder to enter it, and click on the central region to navigate back to the parent folder. You can play with a [working example](https://duc.zevv.nl/demo.cgi?cmd=index&path=/usr/share) on the [DUC homepage](https://duc.zevv.nl/).
diff --git a/services/linuxws.markdown b/services/linuxws.markdown
index f9d48bc5..09457543 100644
--- a/services/linuxws.markdown
+++ b/services/linuxws.markdown
@@ -7,7 +7,7 @@ Our Managed Linux Workstations are now based on [Debian/GNU Linux](http://www.de
 You can find an [[overview of the most important changes|/linux/workstation/debian#changes]]
 since our previous release with Ubuntu.
 
-Several Readmes offer more information:
+Several Readme offer more information:
 
 [[!map pages="linux/workstation/*"]]
 * [[linux/recurring_jobs]]
diff --git a/services/lvmchart.markdown b/services/lvmchart.markdown
index 922cd887..0be32659 100644
--- a/services/lvmchart.markdown
+++ b/services/lvmchart.markdown
@@ -1,13 +1,13 @@
 VMchart
 =======
 
-_**Update IV**: multithreaded server queries speed things up even more_
+_**Update IV**: multi-threaded server queries speed things up even more_
 
 _**Update III**: BTRFS support and navigation menu_
 
-_**Update II**: show backend history to detect failing LUNs_
+_**Update II**: show back-end history to detect failing LUNs_
 
-_**Update**: now displays backend information tooltips in SAN setups! (see below for screenshot)_
+_**Update**: now displays back-end information tooltips in SAN setups! (see below for screenshot)_
 
 We manage quite a number of file servers and while volume management is a wonderful technology offering a lot of flexibility, its many layers (PV, VG, LV, file system..) sometimes make you wonder where all those terabytes went. We were looking for a quick and direct way to visualize the available file space. Since we couldn't find one, we wrote our own: [VMchart](http://admin.phys.ethz.ch/lvm2FS/). It generates a nice website with lots of graphs using [Google Chart Tools](http://code.google.com/apis/chart/).
 
@@ -22,7 +22,7 @@ VG2
 VGn
 ```
 
-where `UNIT` is either `t` or `g` for terabytes or gigabytes and `VGx` specify volume groups that will be skipped (usually the system vg). REGEXP is meant for SAN frontend servers that use a lot of remote LUNs, e.g. via iSCSI. In our case it looks like this: `/dev/iscsi/\d?([\d\w]+)-(.+)` in order to match LUNs like `/dev/iscsi/1bkp12-2T-j1` for host name (bkp12) and LUN (2T-j1). If you omit this line, no backend information will be gathered.
+where `UNIT` is either `t` or `g` for terabytes or gigabytes and `VGx` specify volume groups that will be skipped (usually the system VG). REGEXP is meant for SAN front-end servers that use a lot of remote LUNs, e.g. via iSCSI. In our case it looks like this: `/dev/iscsi/\d?([\d\w]+)-(.+)` in order to match LUNs like `/dev/iscsi/1bkp12-2T-j1` for host name (bkp12) and LUN (2T-j1). If you omit this line, no back-end information will be gathered.
 
 All files for the project can be found on [GitHub](https://github.com/daduke/vmchart).
 
diff --git a/services/nemo_user.markdown b/services/nemo_user.markdown
index ec6946d2..a46366ea 100644
--- a/services/nemo_user.markdown
+++ b/services/nemo_user.markdown
@@ -1,7 +1,7 @@
 D-PHYS Lab Reservation System
 =============================
 
-In order to assist with the logistical challenges of post-lockdown lab revival, we have installed a lab reservation system that allows to avoid contacts by making sure labs and offices are only staffed within accetable limits. The web-based interface is called [Nemo](https://github.com/usnistgov/NEMO), developed by [NIST](https://www.nist.gov/) and already in use in [FIRST](https://first.ethz.ch/).
+In order to assist with the logistical challenges of post-lockdown lab revival, we have installed a lab reservation system that allows to avoid contacts by making sure labs and offices are only staffed within acceptable limits. The web-based interface is called [Nemo](https://github.com/usnistgov/NEMO), developed by [NIST](https://www.nist.gov/) and already in use in [FIRST](https://first.ethz.ch/).
 
 Our Nemo instance can be found at [reservation.phys.ethz.ch](https://reservation.phys.ethz.ch).
 
diff --git a/services/recommendation_for_the_use_and_care_of_data_on_computers.markdown b/services/recommendation_for_the_use_and_care_of_data_on_computers.markdown
index 3562e83c..61f819b8 100644
--- a/services/recommendation_for_the_use_and_care_of_data_on_computers.markdown
+++ b/services/recommendation_for_the_use_and_care_of_data_on_computers.markdown
@@ -3,7 +3,7 @@ Recommendation for the Use and Care of Data on Computers
 
 #### Background
 
-Increasingly, a large amount of research data is stored solely on computers.  This data represents a considerable value mostly in the form of time and other resources used to aquire it.  It is therefore important that proper care is taken to ensure the integrity, availablility, and safeguard against loss of the data.
+Increasingly, a large amount of research data is stored solely on computers.  This data represents a considerable value mostly in the form of time and other resources used to acquire it.  It is therefore important that proper care is taken to ensure the integrity, availability, and safeguard against loss of the data.
 
 Most research at ETH is financed entirely or partially by taxpayers money.  The result of this research belongs to ETH.  Commercial use of research results outside of ETH requires a contract according to the rules and regulations of ETH.  Collaboration with industry partners is a typical case.  In that case the contract will regulate the handling of data.  The recommendations below apply to the case where the research is done within ETH.
 
@@ -27,7 +27,7 @@ In any case make sure that access to the data does not depend on a single person
 
 #### Private Data
 
-ETH allows the use of its IT infrastructure for private use as long as regular ETH work is not adversly affected.  Be aware that an administrator may gain access to your private data in the course of regular maintenance.  If you want to prevent that, we recommend that you buy some storage device (e.g., an USB memory stick) to keep your private data separate.  If you choose to encrypt your private data the same risks apply as mentioned above.
+ETH allows the use of its IT infrastructure for private use as long as regular ETH work is not adversely affected.  Be aware that an administrator may gain access to your private data in the course of regular maintenance.  If you want to prevent that, we recommend that you buy some storage device (e.g., an USB memory stick) to keep your private data separate.  If you choose to encrypt your private data the same risks apply as mentioned above.
 
 #### Mobile Computers
 
diff --git a/services/tools_statistics.markdown b/services/tools_statistics.markdown
index 7b6aeaa6..ea65d54c 100644
--- a/services/tools_statistics.markdown
+++ b/services/tools_statistics.markdown
@@ -6,7 +6,7 @@ Tools
 
 We use many different tools to manage our infrastructure. Some of them are publicly available and may give you some information about the state of our services:
 
-* [BaNG - Backup Web Frontend](https://backup.phys.ethz.ch) (Code on [GitHub](https://github.com/isgphys/BaNG))
+* [BaNG - Backup Web Front-end](https://backup.phys.ethz.ch) (Code on [GitHub](https://github.com/isgphys/BaNG))
 * [Mailman](https://lists.phys.ethz.ch) Mailing list management
 * [ISG Ticket System](https://rt.phys.ethz.ch/rt/)
 * [Show Members of Group](https://account.phys.ethz.ch/group/info) or use `members group`
@@ -14,7 +14,7 @@ We use many different tools to manage our infrastructure. Some of them are publi
 
 Some tools outside of our control:
 
-* [Netcenter](https://www.netcenter.ethz.ch/)
+* [NetCenter](https://www.netcenter.ethz.ch/)
 * [IDES Shop](https://itshop.ethz.ch/)
 * [OnTheHub](https://onthehub.com/)
 * [Doodle@ETHZ](https://ethz.doodle.com)
diff --git a/services/using_remoteapp.markdown b/services/using_remoteapp.markdown
index 6ea14aa2..18f7fe55 100644
--- a/services/using_remoteapp.markdown
+++ b/services/using_remoteapp.markdown
@@ -23,7 +23,7 @@ This will open RemoteApp temporary on your computer.
 How to use for regular/permanent access
 ---------------------------
 
-You can add the RemoteApps permanently to your startmenu with these steps.
+You can add the RemoteApps permanently to your start menu with these steps.
 
 #### Windows
 
diff --git a/services/windows_terminal_server.markdown b/services/windows_terminal_server.markdown
index 9e08e259..37cbcd18 100644
--- a/services/windows_terminal_server.markdown
+++ b/services/windows_terminal_server.markdown
@@ -50,7 +50,7 @@ RDS login from Windows
 To connect to the Remote Desktop Server, just follow these simple steps:
 
 * Run `mstsc.exe`
-* Enter Computername: `winlogin.phys.ethz.ch`
+* Enter computer name: `winlogin.phys.ethz.ch`
 * Enter the D-PHYS username `ad\your_dphys_username`
 
 If needed, you will find [here](/windows/connect_to_terminalserver) more details.
@@ -70,9 +70,9 @@ xfreerdp /d:ad /v:winlogin.phys.ethz.ch /u:${USER} \
     /sec:tls /cert-ignore /rfx /compression /f /bpp:24 +fonts
 ```
 
-* Exit fullscreen: Ctrl-Alt-Enter
+* Exit full-screen: Ctrl-Alt-Enter
 
-Consult the manpage of xfreerdp (`man xfreerdp`) for different commandline options.
+Consult the manpage of xfreerdp (`man xfreerdp`) for different command-line options.
 
 Login from outside of the D-PHYS network
 ----------------------------------------
diff --git a/windows/connect_to_terminalserver.markdown b/windows/connect_to_terminalserver.markdown
index 05c059bd..d478708c 100644
--- a/windows/connect_to_terminalserver.markdown
+++ b/windows/connect_to_terminalserver.markdown
@@ -11,7 +11,7 @@ For more information see [[here|services/windows_terminal_server]]
 
     [[!img /media/windows/connect_to_terminalserver/02.png size="300x"]]
 
-* Enter the Computername `winlogin.phys.ethz.ch`
+* Enter the computer name `winlogin.phys.ethz.ch`
 * Enter the Username in this format `ad\your_dphys_username`
 
     [[!img /media/windows/connect_to_terminalserver/03.png size="300x"]]
-- 
GitLab