cleanup

diff --git a/CHANGELOG b/CHANGELOG
index fb0425b8c3e2ad6e5aa4dc44f1cc2ab557427033..14e039e03f56ee6ac20ac866bd7da4229710e8b4 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,9 @@
-1.1 - Vortex Rikers ()
+1.1 - Vortex Rikers
        * Cleanup and merge to one config file. Read upgrade
        * Missing changelog file
        * api has its own log file now.
 
-1.0 - Castle - (20210106)
+1.0 - Castle 20210106
        * First usable version
        * Using as a collection management software will work
        * Rights management needs tweeking, so use the admin account for a start

diff --git a/documentation/requirements.txt b/documentation/requirements.txt
index db2e14ff5f94d7195fc9141766a27530178bb4ef..033eb115bd6c1f773398520587e9f874dfbc3b41 100644 (file)
--- a/documentation/requirements.txt
+++ b/documentation/requirements.txt
@@ -1,4 +1,5 @@
 * A Webserver (tested on Apache 2.4)
 * PHP 7+ with mysqli, mbstring, curl
 * MySQL 8+ / MariaDB 10.2
-* At least 20MB storage WITHOUT images
+* At least 20MB webserver storage WITHOUT images
+* At least 100MB DB storage.

diff --git a/documentation/setup/install.txt b/documentation/setup/install.txt
index bd9e09a055680a4771c85bafc5a37fe0fce7db7b..7598f8dd19e41597719509d122eb10588cb3a372 100644 (file)
--- a/documentation/setup/install.txt
+++ b/documentation/setup/install.txt
@@ -8,20 +8,14 @@ Open the provided sql file. Search for #REPLACEME# and replace it with your tabl
 Save. Import this file into you newly created DB.
 
 3. Config
-Copy webclient/config/database.php.default to webclient/config/database.php
+Copy webclient/config/config.php.default to webclient/config/config.php
 Edit and fill in the DB details.
 
-Copy webclient/config/path.php.default to webclient/config/path.php
-Edit the file. Minimum is to change PATH_ABSOLUTE to you installation path and
-PATH_WEB_STORAGE relative to your webroot.
-If you change the other settings you need to change the folders too.
-
-Copy webclient/config/system.php.default to webclient/config/system.php
-No need to change anything unless you know what and why.
+Change PATH_ABSOLUTE to you installation path and PATH_WEB_STORAGE relative to your webroot.
 
 4. Move files
 Move the content of webclient folder to your webspace. Make sure the location matches
-the PATH_ABSOLUTE config in path.php file
+the PATH_ABSOLUTE config in config.php file
 
 5. File rights
 Make sure that systemout folder is read/write accessible with your webserver user. Recursive.

diff --git a/documentation/upgrade.txt b/documentation/upgrade.txt
index 23a04e7fcdc80aea8a6c7e4d0c00ebfd8e5738f8..ecf4489a8cb89047ed181ace09e788c1112163dd 100644 (file)
--- a/documentation/upgrade.txt
+++ b/documentation/upgrade.txt
@@ -1,4 +1,4 @@
-Each release has its own version file in the upgrade folder.
+Each release has its own file in the upgrade folder.
 In this file there are the steps needed to make an upgrade.
 
 If you upgrade multiple versions make sure to read all the files in the correct order.