summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-11-02 23:57:11 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-11-03 00:08:29 +0000
commitb3a775f6a370b67e80b292212c765673a0177ffc (patch)
tree0151d47240e3742e0baaeee0eda065eff5b3f0d1 /README.md
parent00e28091d5dbdf816443155193c9fd33a0b3dd34 (diff)
downloadwebtrees-b3a775f6a370b67e80b292212c765673a0177ffc.tar.gz
webtrees-b3a775f6a370b67e80b292212c765673a0177ffc.tar.bz2
webtrees-b3a775f6a370b67e80b292212c765673a0177ffc.zip
Add privacy-policy/impressum - #2654
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 01d6778e69..4bdb52e1c0 100644
--- a/README.md
+++ b/README.md
@@ -187,7 +187,7 @@ then a manual upgrade should be performed.
[webtrees.net](https://webtrees.net/)
3. While you are in the middle of uploading the new files,
a visitor to your site would encounter a mixture of new and old files. This
- could cause unpredictable behaviour or errors. To prevent this, create the
+ could cause unpredictable behavior or errors. To prevent this, create the
file **data/offline.txt**. While this file exists, visitors will see a
“site unavailable - come back later” message.
4. Unzip the .ZIP file, and upload the files to your web server, overwriting the existing files.
@@ -197,7 +197,7 @@ then a manual upgrade should be performed.
### Note for Macintosh users
Step 4 assumes you are using a copy tool that **merges** directories rather than
-replaces them. (**Merge** is standard behaviour on Windows and Linux.) If you use
+replaces them. (**Merge** is standard behavior on Windows and Linux.) If you use
the Macintosh Finder or other similar tool to perform step 3, it will **replace**
your configuration, media and other directories with the empty/default ones from
the installation. This would be very bad (but you did take a backup in step 1,