summaryrefslogtreecommitdiffstats
path: root/README.txt
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-03-24 20:38:43 +0000
committerPhilip Sargent <philip.sargent@klebos.com>2021-03-24 20:38:43 +0000
commit2fe2c0515fa5ed4b39d90108087f5685ac077cd2 (patch)
tree5f10d0fbcd39a3c969de751980fb9e5ff7fe4b1f /README.txt
parentecbef84c37dcca5b879484e5a3c048197015f7d9 (diff)
downloadtroggle-2fe2c0515fa5ed4b39d90108087f5685ac077cd2.tar.gz
troggle-2fe2c0515fa5ed4b39d90108087f5685ac077cd2.tar.bz2
troggle-2fe2c0515fa5ed4b39d90108087f5685ac077cd2.zip
update push procedure and fix order in pathsreport
Diffstat (limited to 'README.txt')
-rw-r--r--README.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/README.txt b/README.txt
index d9f95ea..7582003 100644
--- a/README.txt
+++ b/README.txt
@@ -3,7 +3,7 @@ originally created for use on Cambridge University Caving Club (CUCC)expeditions
and licensed under the GNU Lesser General Public License.
Troggle has been forked into two projects. The original one is maintained by Aron Curtis
-and is used for Erebus caves. The CUCC variant uses files as the definitive data,
+and was used for Erebus caves. The CUCC variant uses files as the definitive data,
not the database and lives at http://expo.survex.com/repositories/troggle/.git/
See copyright notices in
@@ -57,7 +57,7 @@ Follow the instructions contained in the file to fill out your settings.
Python3, Django, and Database setup
-----------------------------------
-Troggle with python3 requires Django 1.8.19 (16 June 2019)
+First version of troggle using python3 required Django 1.8.19 (16 June 2019)
We are now using Django 1.11.29
Read this: https://docs.djangoproject.com/en/3.0/topics/install/
@@ -65,7 +65,7 @@ Read this: https://docs.djangoproject.com/en/3.0/topics/install/
We are installing with python3.7.5
Also : https://linuxize.com/post/how-to-install-pip-on-ubuntu-20.04/ ]
-Install Django using pip, not with apt.
+Install Django using pip, not with apt, on your test system.
Your Linux installation almost certainly already includes python3 and pip3 but
in case it doesn't install those like this:
@@ -282,7 +282,7 @@ ScriptAlias /repositories /home/expo/config/apache/services/hgweb/hgweb.cgi
(The last is just for mercurial which will be remoived during 2020).
These two are not necessary as Django will serve these (see urls.py), but
-it may be very slightly faster for apache to serve them first:
+it may be faster for apache to serve them first:
Alias /expofiles /home/expo/expofiles
Alias /static/ /home/expo/static/