From 82b0ff4852219e694853c21d3d0fb7f01ddc7bef Mon Sep 17 00:00:00 2001
From: Claude Becker <becker@phys.ethz.ch>
Date: Fri, 7 Feb 2025 11:17:14 +0100
Subject: [PATCH] spellcheck
---
network/how_to_get_network_access.markdown | 6 +++---
network/index.markdown | 4 ++--
network/secure_your_own_device.markdown | 4 ++--
printing/change_local_printing_credentials.markdown | 2 +-
printing/how_to_add_an_id_printer_on_osx.markdown | 2 +-
printing/how_to_add_an_id_printer_on_windows.markdown | 4 ++--
printing/how_to_print_pdf-files.markdown | 6 +++---
printing/how_to_use_the_scanners.markdown | 2 +-
printing/index.markdown | 2 +-
storage/access.markdown | 2 +-
storage/automounter.markdown | 2 +-
storage/data_transfer.markdown | 2 +-
storage/index.markdown | 2 +-
storage/sshfs.markdown | 2 +-
web/dokuwiki.markdown | 2 +-
web/how_to_get_a_personal_homepage.markdown | 4 ++--
..._to_restrict_access_to_a_personal_homepage.markdown | 4 ++--
web/index.markdown | 4 ++--
web/per_user_CGI_for_groupshares.markdown | 4 ++--
web/personal_homepage_configuration.markdown | 4 ++--
web/test_webshares.markdown | 2 +-
web/webshares.markdown | 4 ++--
web/wordpress.markdown | 6 +++---
web/wsgi.markdown | 4 ++--
windows/Windows_7_EOL.markdown | 6 ++----
windows/configure_pycharm_for_using_anaconda.markdown | 2 +-
windows/connect_to_terminalserver.markdown | 2 +-
windows/how_to_add_an_ms_excel_add-in.markdown | 2 +-
...play_language_in_adobe_reader_professional.markdown | 6 +++---
windows/how_to_remoteapp.markdown | 4 ++--
windows/self_managed_windows_machines.markdown | 2 +-
..._windows_workstation_to_d-phys_workstation.markdown | 4 ++--
..._windows_workstation_to_d-phys_workstation.markdown | 10 +++++-----
windows/where_should_i_save_my_files.markdown | 6 +++---
34 files changed, 61 insertions(+), 63 deletions(-)
diff --git a/network/how_to_get_network_access.markdown b/network/how_to_get_network_access.markdown
index 79e7db6a..687f4751 100644
--- a/network/how_to_get_network_access.markdown
+++ b/network/how_to_get_network_access.markdown
@@ -16,9 +16,9 @@ If you or your deputy do not see it in the list, please register your computer (
How do I register my computer?
------------------------------
-The following informations must be provided to register your computer for the D-PHYS network:
+The following information must be provided to register your computer for the D-PHYS network:
-* MAC address of your ethernet interface
+* MAC address of your Ethernet interface
* Operating system (Windows/Mac/Linux)
* Hardware type (Laptop/Desktop/Ethernet adapter)
* Two physics accounts to register the computer on: typically one being the user and administrator of the computer and the second a deputy we could contact if the user is unreachable and there's a problem with the machine. The latter is often chosen to be the IT responsible of your group.
@@ -71,7 +71,7 @@ The access to the ETH network is restricted to either known users (when authenti
By registering your MAC address you can avoid the 802.1X login with your ETH account. In addition your computer will get an IP address from our D-PHYS network. Given that we (ISG) are responsible for all devices in our network, we require at least two D-PHYS users as contact.
-Technically speaking, all ethernet sockets are configured to be "docking", meaning that there is no fixed VLAN associated. The UTP socket will be dynamically patched to the VLAN corresponding to the MAC address registration (or 802.1X authentication). As a side effect it may happen that some switches do not properly relay the MAC address information of the connected devices. These switches may need to be power-cycled for newly registered devices to be seen correctly.
+Technically speaking, all Ethernet sockets are configured to be "docking", meaning that there is no fixed VLAN associated. The UTP socket will be dynamically patched to the VLAN corresponding to the MAC address registration (or 802.1X authentication). As a side effect it may happen that some switches do not properly relay the MAC address information of the connected devices. These switches may need to be power-cycled for newly registered devices to be seen correctly.
Which requirements must be fulfilled?
diff --git a/network/index.markdown b/network/index.markdown
index 943eb453..dde8c927 100644
--- a/network/index.markdown
+++ b/network/index.markdown
@@ -14,13 +14,13 @@ Machines must be [[registered|How to get network access]] to access our D-PHYS n
#### D-PHYS NAT network with DynDNS
-By default, all registered computers will be connected to our NAT networks. These are ETH-internal subnets with full access to the internet, but with a firewall that forbids access from outside ETH.
+By default, all registered computers will be connected to our NAT networks. These are ETH-internal sub-nets with full access to the internet, but with a firewall that forbids access from outside ETH.
These computers are automatically listed in the dynamic DNS under the name _**sentname**.dhcp-int.phys.ethz.ch_. This allows you to connect to your computer using this name instead of its dynamic IP address. The https://registration.phys.ethz.ch/ page also shows the name sent by your machine, that is used for DynDNS.
#### Other networks
-We have a variety of other network types. If your computer hosts a service, that needs to be accessible from everwhere, we can move it to a public network and assign a static IP and hostname. Conversely there are even more restricted networks for special needs (IoT, eXile, etc). Please talk to us for more details.
+We have a variety of other network types. If your computer hosts a service, that needs to be accessible from everywhere, we can move it to a public network and assign a static IP and hostname. Conversely there are even more restricted networks for special needs (IoT, eXile, etc). Please talk to us for more details.
Wireless Network
diff --git a/network/secure_your_own_device.markdown b/network/secure_your_own_device.markdown
index d4fdd75f..df8aa7d8 100644
--- a/network/secure_your_own_device.markdown
+++ b/network/secure_your_own_device.markdown
@@ -40,7 +40,7 @@ It's recommendable to enable these two settings:
Check that your network settings are set to **Public**.
Go to **Settings** > **Network & Internet** > **Status** > **Network status**,
go to the network interface **Properties** and set it to **Public**.
-This will enable more restricive firewall settings.
+This will enable more restrictive firewall settings.
### Windows Security
@@ -127,7 +127,7 @@ ss -tulpn
All sockets listed in column `Local Address:Port` that are NOT listening on
`127.0.0.1` (IPv4 loopback address) or `[::1]` (IPv6 loopback address)
-may be exposted to the network. This includes any explicit IP adresses
+may be exposed to the network. This includes any explicit IP addresses
or all addresses/interfaces, noted as `0.0.0.0` (IPv4) and `[::]` (IPv6).
If some services are needed/exposed, secure them by configuration or firewall.
diff --git a/printing/change_local_printing_credentials.markdown b/printing/change_local_printing_credentials.markdown
index c108e9ae..056242be 100644
--- a/printing/change_local_printing_credentials.markdown
+++ b/printing/change_local_printing_credentials.markdown
@@ -13,7 +13,7 @@ See [[printing/authenticate_id_printer]]
### Windows
-* For opening the credential manager, open the start menu and enter `credential manager` (in english) or `anmeldeinformationsverwaltung` (in german), into the search box.
+* For opening the credential manager, open the start menu and enter `credential manager` (in English) or `anmeldeinformationsverwaltung` (in German), into the search box.
[[!img /media/change_local_printing_credentials/win_1.png size="450x"]]
* Choose `Windows credentials`, click on the `pia` entries and select `Edit`.
[[!img /media/change_local_printing_credentials/win_2.png size="450x"]]
diff --git a/printing/how_to_add_an_id_printer_on_osx.markdown b/printing/how_to_add_an_id_printer_on_osx.markdown
index 11983361..edbd5a3c 100644
--- a/printing/how_to_add_an_id_printer_on_osx.markdown
+++ b/printing/how_to_add_an_id_printer_on_osx.markdown
@@ -23,7 +23,7 @@ Download and install the required drivers, depending on the printer model, as ex
* Click **Use** -> **Select Software** and choose
* **HP Color MFP E87640-50-60** for card-hp
* the appropriate driver for any specific printer model
- * **Generic PostScript Printer** (universal) if the others are unavailable
+ * **Generic Postscript Printer** (universal) if the others are unavailable
[[!img media/osx/id_printer_add_queue.png size="450x"]]
diff --git a/printing/how_to_add_an_id_printer_on_windows.markdown b/printing/how_to_add_an_id_printer_on_windows.markdown
index 0e30fd6b..eb415a07 100644
--- a/printing/how_to_add_an_id_printer_on_windows.markdown
+++ b/printing/how_to_add_an_id_printer_on_windows.markdown
@@ -9,8 +9,8 @@ Login with your ETH account.
[[!img media/how_to_add_an_id_printer_on_windows/2_logon.png size="400x"]]
-Now the `card-hp on pia01.d.ethz.ch` is installed on your pc. With this printer you can print on every printer from the ETH print-service with your ETH Card.
+Now the `card-hp on pia01.d.ethz.ch` is installed on your PC. With this printer you can print on every printer from the ETH print-service with your ETH Card.
-After installation will open a new window, there you can chose your printers by double clicking on it. With this printer you dont need your ETH Card.
+After installation will open a new window, there you can chose your printers by double clicking on it. With this printer you don't need your ETH Card.
[[!img media/how_to_add_an_id_printer_on_windows/3_printer.png size="400x"]]
diff --git a/printing/how_to_print_pdf-files.markdown b/printing/how_to_print_pdf-files.markdown
index f56fafb3..f6c5ce79 100644
--- a/printing/how_to_print_pdf-files.markdown
+++ b/printing/how_to_print_pdf-files.markdown
@@ -1,7 +1,7 @@
How to print PDF-Files as Images
================================
-The following steps are required to avoid printing problems with pdf files.
+The following steps are required to avoid printing problems with PDF files.
* On the print-dialog window, select the **Advanced** button.
@@ -20,11 +20,11 @@ Settings of Adobe Acrobat Professional
--------------------------------------
* Deselect **Print as Image** (step 1), if already selected.
-* Select **PostScript Options**. (step 2)
+* Select **Postscript Options**. (step 2)
[[!img /media/how_to_print_pdf-files/print-pdf_1_s.png]]
* Select **_Send for Each Page_** on **Font and Resource Policy**. (step 3)
-* Press the **Ok** button (step 4) and print the document.
+* Press the **OK** button (step 4) and print the document.
[[!img /media/how_to_print_pdf-files/print-pdf_2_s.png]]
diff --git a/printing/how_to_use_the_scanners.markdown b/printing/how_to_use_the_scanners.markdown
index 8a8497ef..6106de11 100644
--- a/printing/how_to_use_the_scanners.markdown
+++ b/printing/how_to_use_the_scanners.markdown
@@ -8,4 +8,4 @@ The scanners on Linux workstations have been obsoleted and removed. Please use t
* [gocr](http://jocr.sourceforge.net/) OCR software
* [tesseract](https://github.com/tesseract-ocr) other OCR software
* [autotrace](http://autotrace.sourceforge.net/) vectorize graphics
- * [convert](http://www.imagemagick.org/) to convert/process images into different formats, for instance to create a multipage PDF of some scanned pages run: `convert page001.jpg page002.jpg page003.jpg the.pdf`.
+ * [convert](http://www.imagemagick.org/) to convert/process images into different formats, for instance to create a multi-page PDF of some scanned pages run: `convert page001.jpg page002.jpg page003.jpg the.pdf`.
diff --git a/printing/index.markdown b/printing/index.markdown
index 27e10715..f29a4def 100644
--- a/printing/index.markdown
+++ b/printing/index.markdown
@@ -10,7 +10,7 @@ Please follow the [official instructions from ID](https://unlimited.ethz.ch/disp
* Self managed devices: [Windows](https://unlimited.ethz.ch/display/itkb/Add+a+printer+with+Windows), [[macOS|how_to_add_an_id_printer_on_osx]] and [Linux](https://unlimited.ethz.ch/display/itkb/Add+a+printer+with+Linux)
* [[ISG-Managed Windows Workstation|how_to_add_an_id_printer_on_windows]]
-* ISG-Managed Linux Workstation: we preinstall selected printers on all machines. [[Authenticate|authenticate_id_printer]] when printing for the first time. Note that some Linux programs show a password dialog when printing. Just hit _OK_ without entering anything.
+* ISG-Managed Linux Workstation: we pre-install selected printers on all machines. [[Authenticate|authenticate_id_printer]] when printing for the first time. Note that some Linux programs show a password dialog when printing. Just hit _OK_ without entering anything.
### Advantages
diff --git a/storage/access.markdown b/storage/access.markdown
index 487e8045..0da9e879 100644
--- a/storage/access.markdown
+++ b/storage/access.markdown
@@ -216,7 +216,7 @@ All variants work by connecting to **login.phys.ethz.ch** or one of our student
### SCP or SFTP
-You can access your files also using SCP (Secure Copy) or SFTP (Secure File Transfer Protocol) clients, e.g. [WinSCP](http://winscp.net/) or [Putty](http://www.chiark.greenend.org.uk/~sgtatham/putty/) under Windows or [CyberDuck](http://cyberduck.io/) under macOS. See our Readme [[windows/SFTP Samples Windows Workstation to D-PHYS Workstation]] for how to use SFTP with WinSCP.
+You can access your files also using SCP (Secure Copy) or SFTP (Secure File Transfer Protocol) clients, e.g. [WinSCP](http://winscp.net/) or [Putty](http://www.chiark.greenend.org.uk/~sgtatham/putty/) under Windows or [Cyberduck](http://cyberduck.io/) under macOS. See our Readme [[windows/SFTP Samples Windows Workstation to D-PHYS Workstation]] for how to use SFTP with WinSCP.
### SSHFS
diff --git a/storage/automounter.markdown b/storage/automounter.markdown
index 8aafaea5..07051901 100644
--- a/storage/automounter.markdown
+++ b/storage/automounter.markdown
@@ -13,7 +13,7 @@ Explanation of the automountable directories
The directory `/scratch` is always local on the disk of the computer you're logged into (either graphically or via SSH). There is no
backup of data there.
-If you want to access these directories from some other managed Linux workstation, you can access them via `/net/<hostname>/<directory-path>`, e.g. to access `/scratch` from `workstation-a` while being logged in on `workstation-b` go to `/net/workstation-a/scratch/`, e.g. by typing on the commandline:
+If you want to access these directories from some other managed Linux workstation, you can access them via `/net/<hostname>/<directory-path>`, e.g. to access `/scratch` from `workstation-a` while being logged in on `workstation-b` go to `/net/workstation-a/scratch/`, e.g. by typing on the command-line:
```
cd /net/workstation-a/scratch
diff --git a/storage/data_transfer.markdown b/storage/data_transfer.markdown
index 8465ef33..54b15871 100644
--- a/storage/data_transfer.markdown
+++ b/storage/data_transfer.markdown
@@ -7,7 +7,7 @@ We describe some typical tools to transfer small to large amounts of data from o
Small transfers
---------------
-### SMB / sFTP / FileZilla / CyberDuck
+### SMB / sFTP / FileZilla / Cyberduck
* User-friendly graphical interface instead of command line
* Cross-platform
diff --git a/storage/index.markdown b/storage/index.markdown
index 91a9d00a..badd1bb1 100644
--- a/storage/index.markdown
+++ b/storage/index.markdown
@@ -18,7 +18,7 @@ Group drives
Research groups of the Department of Physics can get shared file space or group drives. Feel free to [[contact us|services/contact]]!
Think of a good name for the group drive, up to 8 characters. If
-it's to be served by https, prepend www ahead of the name.
+it's to be served by HTTPS, prepend www ahead of the name.
Quota
-----
diff --git a/storage/sshfs.markdown b/storage/sshfs.markdown
index 4c46fb70..b42b1f73 100644
--- a/storage/sshfs.markdown
+++ b/storage/sshfs.markdown
@@ -26,7 +26,7 @@ sshfs <username>@login.phys.ethz.ch:/home/<groupshare> /local/path
Windows
-------
-Installation ([github](https://github.com/winfsp/sshfs-win)) or:
+Installation ([GitHub](https://github.com/winfsp/sshfs-win)) or:
```bash
winget install WinFsp.WinFsp
diff --git a/web/dokuwiki.markdown b/web/dokuwiki.markdown
index 174f41e1..4138b30f 100644
--- a/web/dokuwiki.markdown
+++ b/web/dokuwiki.markdown
@@ -10,7 +10,7 @@ Information for Wiki Admins
---------------------------
Admins can configure most settings in the **Configuration Manager**.
-Some options are greyed out or red.
+Some options are grayed out or red.
Those are forced by our main configuration and cannot be changed.
Plugins can only be (de)activated by [[ISG|/services/contact]].
diff --git a/web/how_to_get_a_personal_homepage.markdown b/web/how_to_get_a_personal_homepage.markdown
index 8cfe6062..621297a2 100644
--- a/web/how_to_get_a_personal_homepage.markdown
+++ b/web/how_to_get_a_personal_homepage.markdown
@@ -10,7 +10,7 @@ The homepages are available under the following URLs:
- `https://share.phys.ethz.ch/~groupname/` (Groupshare)
Note: This guide uses the shell variable `${HOME}`, which will be evaluated by your shell
-and replaced with your home direcory (example: `/home/username`).
+and replaced with your home directory (example: `/home/username`).
This is automatically available on the managed workstations (either `${HOME}` on Linux and macOS,
or the `H:` drive on Windows).
For self managed workstations read how to [[access|storage/access]] the fileservers.
@@ -39,7 +39,7 @@ $BROWSER https://people.phys.ethz.ch/~username/
* Create a directory `public_html` in your home directory (this is the directory `/home/username/` with _username_ replaced by your user name. It is not your desktop neither the directory `/home/`)
* Make it at least world accessible. You home directory does not need to be world accessible or readable though.
* Create a file called `index.html` in that newly created directory and put some HTML in it. See http://de.selfhtml.org/ for a good, easy to understand and though comprehensive HTML documentation in German.
-* Point your favourite web browser to `https://people.phys.ethz.ch/~username/`. (Please note that you will get a "Permission denied" error if you didn't create an `index.html` file beforehand.)
+* Point your favorite web browser to `https://people.phys.ethz.ch/~username/`. (Please note that you will get a "Permission denied" error if you didn't create an `index.html` file beforehand.)
* You may optionally register your personal homepage to show up in the ETH phone book. Go to https://passwort.ethz.ch, log in with your ETH account, then navigate to `my services` and `Homepage`.
## Subdirectory password protection
diff --git a/web/how_to_restrict_access_to_a_personal_homepage.markdown b/web/how_to_restrict_access_to_a_personal_homepage.markdown
index 2e702249..216c7fb2 100644
--- a/web/how_to_restrict_access_to_a_personal_homepage.markdown
+++ b/web/how_to_restrict_access_to_a_personal_homepage.markdown
@@ -80,7 +80,7 @@ Make sure, the `.htpasswd` and `.htaccess` files are world-readable, e.g. with:
chmod 644 ${HOME}/public_html/foo/.ht*
```
-otherwise the webserver won't have access to those files. Again, if you have your home directory unaccessable for others, they won't get access, even if they know the location of those files. The webserver won't give them out either, even not with password.
+otherwise the web server won't have access to those files. Again, if you have your home directory inaccessible for others, they won't get access, even if they know the location of those files. The web server won't give them out either, even not with password.
If you want to add additional users, additionally execute the following command on one of our managed Linux workstations:
@@ -90,7 +90,7 @@ htpasswd -B -b ${HOME}/public_html/foo/.htpasswd fnord gna
(You may also omit the `-b` parameter and the password. Then you have to type it twice and blindly afterwards.)
-See [Authentication and Authorization HowTo by Apache](https://httpd.apache.org/docs/2.4/howto/auth.html) for the gory details and further documentation.
+See [Authentication and Authorization How-To by Apache](https://httpd.apache.org/docs/2.4/howto/auth.html) for the gory details and further documentation.
## Combined LDAP and self-managed authentication
diff --git a/web/index.markdown b/web/index.markdown
index b5005c54..fbf9297f 100644
--- a/web/index.markdown
+++ b/web/index.markdown
@@ -47,7 +47,7 @@ Our web servers at the D-PHYS use [Apache](https://httpd.apache.org/) + [MariaDB
## Support and announcement room
If you are a website owner, please join our Matrix room [#web:phys.ethz.ch](https://m.ethz.ch/#/#web:phys.ethz.ch)
-to get help and stay informed about upcoming changes on the webserver.
+to get help and stay informed about upcoming changes on the web server.
## Web hosting overview
@@ -80,7 +80,7 @@ You may freely choose to install any other software or even write a dynamic webs
For any other services listed or not listed above, please [[contact us|services/contact]].
-## More information on webhosting
+## More information on web hosting
[[!map pages="./web/*"]]
diff --git a/web/per_user_CGI_for_groupshares.markdown b/web/per_user_CGI_for_groupshares.markdown
index 5d5a0ae8..1092cb43 100644
--- a/web/per_user_CGI_for_groupshares.markdown
+++ b/web/per_user_CGI_for_groupshares.markdown
@@ -13,7 +13,7 @@ The basic idea is the following:
Going into more detail, we will show the relevant config, but don't expect them to work without modifications, they're heavily dependent on our infrastructure.
* install apache and enable the following modules: userdir, headers, cgid, suexec, php-cgi.
-* create your `/mnt/export/<SERVER>` dirs, `chmod o-rx /mnt/export/` and mount your NFS shares statically. Note that you can't use the automounter here, we'll explain why in a minute.
+* create your `/mnt/export/<SERVER>` directories, `chmod o-rx /mnt/export/` and mount your NFS shares statically. Note that you can't use the automounter here, we'll explain why in a minute.
* next we need the autofs trigger for bindfs: create `/etc/auto.master.d/bindfs.autofs` to read
```
@@ -103,7 +103,7 @@ By default we disable all dynamic content and specifically enable it per user or
echo ':PHP:E::php::/usr/bin/php-cgi:' > /proc/sys/fs/binfmt_misc/register
```
-* last task: since we're somewhat misusing the auto mounter, our bindfs mounts will not be automagically umounted. We work around this issue by a nightly call of `service autofs restart`. No big deal.
+* last task: since we're somewhat misusing the auto mounter, our bindfs mounts will not be auto-magically umounted. We work around this issue by a nightly call of `service autofs restart`. No big deal.
Now you should be able to serve both static and dynamic content from user home directories and group shares with complete privilege separation, which is achieved by the combination of the mechanisms detailed above (keep in mind that we have two conflicting sets of permission requirements: static content is served by `www-data` and therefore needs to be readable by apache while CGIs run under the owner's uid and suEXEC has a rather long [list](https://httpd.apache.org/docs/2.4/suexec.html#model) of strict requirements):
diff --git a/web/personal_homepage_configuration.markdown b/web/personal_homepage_configuration.markdown
index 80aeae51..27341c9b 100644
--- a/web/personal_homepage_configuration.markdown
+++ b/web/personal_homepage_configuration.markdown
@@ -2,13 +2,13 @@
## Default configuration
-By default every personal homepage is configured with the following [apache webserver options](https://httpd.apache.org/docs/2.4/mod/core.html#options)
+By default every personal homepage is configured with the following [apache web server options](https://httpd.apache.org/docs/2.4/mod/core.html#options)
```apache
Options Multiviews Indexes SymLinksIfOwnerMatch
```
-which enables [multiviews](https://httpd.apache.org/docs/current/content-negotiation.html), [automatic directory indexing](https://httpd.apache.org/docs/current/mod/mod_autoindex.html) in the absence of an `index.html` file and following of symlinks in your `~/public_html/` directory and all subfolders.
+which enables [multi-views](https://httpd.apache.org/docs/current/content-negotiation.html), [automatic directory indexing](https://httpd.apache.org/docs/current/mod/mod_autoindex.html) in the absence of an `index.html` file and following of symlinks in your `~/public_html/` directory and all subfolders.
Please note that only relative symbolic links within `public_html` are supported.
diff --git a/web/test_webshares.markdown b/web/test_webshares.markdown
index d3a92304..de5221f0 100644
--- a/web/test_webshares.markdown
+++ b/web/test_webshares.markdown
@@ -46,7 +46,7 @@ ssh www<name>@test-<your_production_domain>
## Access the database
-Use the same [[webinterface|/web/webshares/#access-the-database]] but select the server `test-sqlweb`
+Use the same [[web interface|/web/webshares/#access-the-database]] but select the server `test-sqlweb`
and connect using the credentials in `private/database.yml` on the test webshare.
We recommend directly including the credentials from the file mentioned above in your code,
diff --git a/web/webshares.markdown b/web/webshares.markdown
index 1cfe468e..e2cf79bd 100644
--- a/web/webshares.markdown
+++ b/web/webshares.markdown
@@ -87,7 +87,7 @@ create them in `~/private/.ssh/`, since the webshare user does not have write ac
ssh-keygen -t ed25519 -C "name" -f ~/private/.ssh/id_ed25519
```
-For outgoing ssh connections the key location for ed25519 and rsa keys is preconfigured in `~/.ssh/config`.
+For outgoing ssh connections the key location for ed25519 and RSA keys is preconfigured in `~/.ssh/config`.
Please only use ssh access for the intended purpose, which is website related configuration and tasks.
**No computation** 🙅â€â™€ï¸.
@@ -124,7 +124,7 @@ Select the Server `sqlweb` and connect using the credentials in `private/databas
For connections from your dynamic website code, use `sqlweb.phys.ethz.ch` as the database hostname.
With [[SSH access|/web/webshares/#ssh-access]] enabled you can connect using the cli `mysql`
-after connecting via ssh to the webserver:
+after connecting via ssh to the web server:
```sh
wwwuser@server:~$ mysql
diff --git a/web/wordpress.markdown b/web/wordpress.markdown
index 6b15c069..b9f45a1c 100644
--- a/web/wordpress.markdown
+++ b/web/wordpress.markdown
@@ -1,7 +1,7 @@
Wordpress
=========
-Requesting a wordpress site
+Requesting a WordPress site
---------------------------
Please see [[general web share instructions|web/webshares]].
@@ -16,10 +16,10 @@ Open `https://yourdomain.phys.ethz.ch/wp-admin/` in your browser and use the cre
Go to **Settings** > **General** and change **Administration Email Address** to your address.
-All wordpress instances may now be fully customized using the webinterface.
+All WordPress instances may now be fully customized using the web interface.
This includes installing plugins and themes.
Updates
-------
-All wordpress instances inlcuding installed plugins and themes will be automatically updated.
+All WordPress instances including installed plugins and themes will be automatically updated.
diff --git a/web/wsgi.markdown b/web/wsgi.markdown
index 9862252a..71b8b998 100644
--- a/web/wsgi.markdown
+++ b/web/wsgi.markdown
@@ -28,7 +28,7 @@ from your_custom_app_code import app
application = app
```
-If you make changes to the source code, you have to tell the webserver to
+If you make changes to the source code, you have to tell the web server to
restart the WSGI app by modifying the file time stamp on the WSGI entry point:
```bash
@@ -45,7 +45,7 @@ to the location(s) in `/home/wwwshare/public`, that contains static content.
## Virtual environment
Our WSGI uses a [virtual environment](https://compenv.phys.ethz.ch/python/ecosystem_1/30_virtual_environments/) (venv),
-which contains any custom python packages and is activated by our webserver configuration.
+which contains any custom python packages and is activated by our web server configuration.
- Location: `/home/wwwshare/private/venv`
- Requirements: `/home/wwwshare/private/requirements.txt`
diff --git a/windows/Windows_7_EOL.markdown b/windows/Windows_7_EOL.markdown
index 3ea95913..a3e7323e 100644
--- a/windows/Windows_7_EOL.markdown
+++ b/windows/Windows_7_EOL.markdown
@@ -4,14 +4,12 @@ Windows 7 end of life
The time has come to upgrade your Windows 7 computer to Windows 10
since extended support for Windows 7 ends on January 14, 2020.
-- [Windows lifecycle](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet)
+- [Windows life-cycle](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet)
### Why can I no longer use Windows 7 on the ETH network after the end of 2019?
Only operating systems with security support by the vendor are allowed to connect to the ETH network.
-- [ETH Rechtssammlung, Standards für Verantwortlichkeiten und Systempflege](https://rechtssammlung.sp.ethz.ch/Dokumente/203.23.pdf)
-
Unsupported operating systems that no longer receive security updates render the computer vulnerable to threats like viruses, malware or hacker attacks and also pose a threat to other computers on the network.
Check out our FAQ section below:
@@ -45,7 +43,7 @@ Recommended for laboratory computers and critical systems
- The sending of telemetry data can be [minimized](https://readme.phys.ethz.ch/windows/windows10/disable_telemetry/).
- my software or device driver is not Windows 10 compatible or
- my Windows 7 computer is embedded in a lab instrument and I can’t upgrade it:
- - If you don’t need network access, remove the network cable and everything is ok.
+ - If you don’t need network access, remove the network cable and everything is OK.
- If you need network access only to communicate with sensors or something else in the same room, create your own isolated network with a network switch.
- If you need network access to transfer your data to the server, then please contact us about the [eXile network](https://exile.phys.ethz.ch).
diff --git a/windows/configure_pycharm_for_using_anaconda.markdown b/windows/configure_pycharm_for_using_anaconda.markdown
index 60511290..3f911501 100644
--- a/windows/configure_pycharm_for_using_anaconda.markdown
+++ b/windows/configure_pycharm_for_using_anaconda.markdown
@@ -6,7 +6,7 @@ For using "Anaconda Python 3 distribution" in PyCharm just follow this readme.
Prerequisite
------------
-- install PyCharm [Pro](https://www.jetbrains.com/pycharm/download/#section=windows) or [Edu](https://www.jetbrains.com/edu-products/download/#section=pycharm-edu) version or for managed Windows workstations, order it by [chic tool](https://chic.phys.ethz.ch/public/windows/packages)
+- install PyCharm [Pro](https://www.jetbrains.com/pycharm/download/#section=windows) or [EDU](https://www.jetbrains.com/edu-products/download/#section=pycharm-edu) version or for managed Windows workstations, order it by [chic tool](https://chic.phys.ethz.ch/public/windows/packages)
Note for **PyCharm Pro** you can get a **free** Jetbrains account. For more information see [[here|documentation/jetbrains_edu_account]]
diff --git a/windows/connect_to_terminalserver.markdown b/windows/connect_to_terminalserver.markdown
index d478708c..c6e1db4d 100644
--- a/windows/connect_to_terminalserver.markdown
+++ b/windows/connect_to_terminalserver.markdown
@@ -16,6 +16,6 @@ For more information see [[here|services/windows_terminal_server]]
[[!img /media/windows/connect_to_terminalserver/03.png size="300x"]]
-* Finaly enter your D-PHYS password
+* Finally enter your D-PHYS password
[[!img /media/windows/connect_to_terminalserver/04.png size="300x"]]
diff --git a/windows/how_to_add_an_ms_excel_add-in.markdown b/windows/how_to_add_an_ms_excel_add-in.markdown
index ef6fd57f..0d8f264e 100644
--- a/windows/how_to_add_an_ms_excel_add-in.markdown
+++ b/windows/how_to_add_an_ms_excel_add-in.markdown
@@ -3,7 +3,7 @@ How to add a Microsoft Excel add-in
If you want to add an additional Excel add-in, you have to copy the file to the AddIns folder on your computer.
-Write **%appdata%** into the Windows searchbox on your startmenu and press "ENTER".
+Write **%appdata%** into the Windows search box on your start menu and press "ENTER".
[[!img /media/how_to_add_an_ms_excel_add-in/excel_add-in1.png size="300x"]]
diff --git a/windows/how_to_change_the_display_language_in_adobe_reader_professional.markdown b/windows/how_to_change_the_display_language_in_adobe_reader_professional.markdown
index 13af5773..745f9ea6 100644
--- a/windows/how_to_change_the_display_language_in_adobe_reader_professional.markdown
+++ b/windows/how_to_change_the_display_language_in_adobe_reader_professional.markdown
@@ -1,11 +1,11 @@
How to change the display language in Adobe Reader/Acrobat Professional
=======================================================================
-Adobe Reader and Acrobat Professional has a multilanguage userinterface. On D-PHYS managed computers you can choose between english and german language.
+Adobe Reader and Acrobat Professional has a multi-language user interface. On D-PHYS managed computers you can choose between English and German language.
To change the language, follow these steps:
-* Goto "**Bearbeiten**" -> "**Voreinstellungen..**" or press "**Ctrl+K**"
+* Go to "**Bearbeiten**" -> "**Voreinstellungen..**" or press "**Ctrl+K**"
[[!img /media/how_to_change_the_display_language_in_adobe_reader_professional/adobe_languageselect_1.png size="300x"]]
@@ -13,6 +13,6 @@ To change the language, follow these steps:
[[!img /media/how_to_change_the_display_language_in_adobe_reader_professional/adobe_languageselect_2.png size="400x"]]
-* **Start** Adobe Reader or Acobat Professional again and you will see a language selector box, which you can select the desired language.
+* **Start** Adobe Reader or Acrobat Professional again and you will see a language selector box, which you can select the desired language.
[[!img /media/how_to_change_the_display_language_in_adobe_reader_professional/adobe_languageselect_3.png size="300x"]]
diff --git a/windows/how_to_remoteapp.markdown b/windows/how_to_remoteapp.markdown
index 863ec41f..a34bfa3c 100644
--- a/windows/how_to_remoteapp.markdown
+++ b/windows/how_to_remoteapp.markdown
@@ -21,10 +21,10 @@ If you only want to use the RemoteApp one-time/temporary access, use this steps
[[!img /media/windows/remoteapp/06.png size="300x"]]
-* Now you will find in your startmenu the folder `Work Resources (RADC)` which contains all RemoteApps that are available.
+* Now you will find in your start menu the folder `Work Resources (RADC)` which contains all RemoteApps that are available.
[[!img /media/windows/remoteapp/07.png size="300x"]]
-* When you start a RemoteApp, you will get messagebox. Select the checkbox `Dont't ask me again for remote connections from this publisher` and choose `Connect`
+* When you start a RemoteApp, you will get message box. Select the checkbox `Dont't ask me again for remote connections from this publisher` and choose `Connect`
[[!img /media/windows/remoteapp/02.png size="300x"]]
diff --git a/windows/self_managed_windows_machines.markdown b/windows/self_managed_windows_machines.markdown
index f6db2259..17125615 100644
--- a/windows/self_managed_windows_machines.markdown
+++ b/windows/self_managed_windows_machines.markdown
@@ -48,7 +48,7 @@ To correct this behavior of your self-manged Windows computer you should follow
[[!img /media/self_managed_windows_machines/win_dns_settings_7.png]]
-* Finally the list should look as follows. Confirm every open dialog box with _Ok_. Done.
+* Finally the list should look as follows. Confirm every open dialog box with _OK_. Done.
[[!img /media/self_managed_windows_machines/win_dns_settings_8.png]]
diff --git a/windows/sftp_samples_windows_workstation_to_d-phys_workstation.markdown b/windows/sftp_samples_windows_workstation_to_d-phys_workstation.markdown
index d26877aa..a0d5ef60 100644
--- a/windows/sftp_samples_windows_workstation_to_d-phys_workstation.markdown
+++ b/windows/sftp_samples_windows_workstation_to_d-phys_workstation.markdown
@@ -14,13 +14,13 @@ The first time you connect to a server, this dialog appears:
[[!img /media/sftp_samples_windows_workstation_to_d-phys_workstation/dialog2.png alt="dialog2.png" size="450x"]]
-The servers hostkey will be added to your registry and you wont be prompted again. This secures that you are connecting every time to the same machine and protects you from a man in the middle attack.
+The servers host key will be added to your registry and you wont be prompted again. This secures that you are connecting every time to the same machine and protects you from a man in the middle attack.
Now the file transfer window appears and you could drag & drop your files from local to remote and back:
[[!img /media/sftp_samples_windows_workstation_to_d-phys_workstation/dialog3.png alt="dialog3.png" size="450x"]]
-The second interface (choosable in the preferencies pane while starting WinSCP) looks more like explorer:
+The second interface (choosable in the preferences pane while starting WinSCP) looks more like explorer:
[[!img /media/sftp_samples_windows_workstation_to_d-phys_workstation/dialog4.png alt="dialog4.png" size="450x"]]
diff --git a/windows/ssh_samples_windows_workstation_to_d-phys_workstation.markdown b/windows/ssh_samples_windows_workstation_to_d-phys_workstation.markdown
index 5b9fd5c6..3c9d96a6 100644
--- a/windows/ssh_samples_windows_workstation_to_d-phys_workstation.markdown
+++ b/windows/ssh_samples_windows_workstation_to_d-phys_workstation.markdown
@@ -14,13 +14,13 @@ The first time you connect to a server, this dialog appears:
[[!img /media/ssh_samples_windows_workstation_to_d-phys_workstation/dialog2.png alt="dialog2.png"]]
-The servers hostkey will be added to your registry and you wont be prompted again. This secures that you are connecting every time to the same machine and protects you from a man in the middle attack.
+The servers host key will be added to your registry and you wont be prompted again. This secures that you are connecting every time to the same machine and protects you from a man in the middle attack.
Now, the terminal window appears and PuTTY asks you about the username:
[[!img /media/ssh_samples_windows_workstation_to_d-phys_workstation/dialog3.png alt="dialog3.png" size="450x"]]
-and the passoword:
+and the password:
[[!img /media/ssh_samples_windows_workstation_to_d-phys_workstation/dialog4.png alt="dialog4.png" size="450x"]]
@@ -32,12 +32,12 @@ If everything went OK, you'll get the shell:
In PuTTY's menu you'll find an entry PSFTP. It's the same program as _sftp_ documented [[here|documentation/ssh_samples_d-phys_workstation_to_d-phys_workstation]]. `C:\Program Files\PuTTY\pscp.exe` is the same program as _scp_. Adjust your path from Windows to include PuTTY's directory if you use pscp often.
**X11 forwarding**
-To use X11 forwarding, you need to install an X11 server. The best X server for Windows is XMing, which you can download from http://www.straightrunning.com/XmingNotes/. There is at least one OpenSource alternative - you may get Cygwin on http://www.cygwin.com/ and install XFree86. You may also install Cygwin's OpenSSH and use ssh like on [[Linux|documentation/ssh_samples_d-phys_workstation_to_d-phys_workstation]]. Cygwin's X11 server is not as good integrated in the Windows desktop as the commercial X11 servers and should only be installed by people who knows how to use a typical Linux, BSD or UNIX workstation.
+To use X11 forwarding, you need to install an X11 server. The best X server for Windows is XMing, which you can download from http://www.straightrunning.com/XmingNotes/. There is at least one Open-Source alternative - you may get Cygwin on http://www.cygwin.com/ and install XFree86. You may also install Cygwin's OpenSSH and use ssh like on [[Linux|documentation/ssh_samples_d-phys_workstation_to_d-phys_workstation]]. Cygwin's X11 server is not as good integrated in the Windows desktop as the commercial X11 servers and should only be installed by people who knows how to use a typical Linux, BSD or UNIX workstation.
After starting your local X11 server, activate X11 forwarding in PuTTY:
[[!img /media/ssh_samples_windows_workstation_to_d-phys_workstation/dialog6.png alt="dialog6.png"]]
-After logging in on the server, you could start any X11 application and the ouput window should appear on your desktop. As on a real ssh, the traffic is tunneled and encrypted by PuTTY.
+After logging in on the server, you could start any X11 application and the output window should appear on your desktop. As on a real ssh, the traffic is tunneled and encrypted by PuTTY.
**Key generation**
To get a password free access to the server, you need to create ssh-keys. PuTTY delivers a nice application called PuTTYgen with do that:
@@ -57,7 +57,7 @@ Load your generated keys to the agent by double-clicking on the files with the h
[[!img /media/ssh_samples_windows_workstation_to_d-phys_workstation/dialog10.png alt="dialog10.png"]]
-When using PuTTY often, it would be the best to put a shortcut to this keyfiles in your Autorun-Group of the Startmenue.
+When using PuTTY often, it would be the best to put a shortcut to this key files in your Autorun-Group of the start menu.
Now activate Allow agent forwarding in PuTTY's configuration:
diff --git a/windows/where_should_i_save_my_files.markdown b/windows/where_should_i_save_my_files.markdown
index 6b859ad3..d5aec395 100644
--- a/windows/where_should_i_save_my_files.markdown
+++ b/windows/where_should_i_save_my_files.markdown
@@ -17,9 +17,9 @@ There are different possibilities to save files (e.g. research data) on the D-PH
- The **space is limited** (quota) for the home directory, so you should use it mainly for **personal files** and not for research or project data. It will also be backed up every night and you are able to [[access|storage/access]] it from outside ETH.
-- You can save files on your **desktop** which is part of the **user profile** or in the profile itself. It is located in `C:\Users\%Username` (english installation) or `C:\Benutzer\%Username` (german installation).
+- You can save files on your **desktop** which is part of the **user profile** or in the profile itself. It is located in `C:\Users\%Username` (English installation) or `C:\Benutzer\%Username` (German installation).
- - But the profile **space is limited** (currently 500MB), to avoid long wait times during synchronisation. The roaming part of the user profile (e.g. the desktop folder) will be copied during every login and logout process, this is called [roaming user profiles](http://msdn.microsoft.com/en-us/library/bb776897.aspx). Therefore **don't save a lot of data on the desktop** or in `C:\Users\%Username` (a few megabytes are still ok).
+ - But the profile **space is limited** (currently 500MB), to avoid long wait times during synchronization. The roaming part of the user profile (e.g. the desktop folder) will be copied during every login and logout process, this is called [roaming user profiles](http://msdn.microsoft.com/en-us/library/bb776897.aspx). Therefore **don't save a lot of data on the desktop** or in `C:\Users\%Username` (a few megabytes are still ok).
- A good idea is to **put shortcuts on your desktop** to quickly access files or folders you often need, instead of placing the files themselves on the desktop.
- The local user profile folder will be **deleted automatically** if there was no logon for 270 days. The roaming part of the profile will still be available, saved on the server for 400 days, but the local part of it is lost.
@@ -33,6 +33,6 @@ There are different possibilities to save files (e.g. research data) on the D-PH
- If you are aware of these risks and still want to save them locally, there are different possible locations:
- - Probably the best folder is `C:\Scratch`. You have write permissions and there is no space limit, but please **do not fill the harddrive completely**! There should always be at least **10-15% of free space** to install software updates and ensure the stability of the operating system.
+ - Probably the best folder is `C:\Scratch`. You have write permissions and there is no space limit, but please **do not fill the hard-drive completely**! There should always be at least **10-15% of free space** to install software updates and ensure the stability of the operating system.
- On some computers there is a second hard-drive installed, which is visible in the Windows Explorer as drive `D:`. You may use it too and there are no restrictions on free space because it will not be used by the operating system itself.
--
GitLab