]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
3 years agoMerge pull request #2135 from lonvia/python-frontend
Sarah Hoffmann [Fri, 15 Jan 2021 07:56:07 +0000 (08:56 +0100)]
Merge pull request #2135 from lonvia/python-frontend

Introduce new 'nominatim' all-in-one command-line tool

3 years agofix typo
Sarah Hoffmann [Thu, 14 Jan 2021 19:30:27 +0000 (20:30 +0100)]
fix typo

3 years agoreplace Symfony dotenv dependency with Python dotenv
Sarah Hoffmann [Thu, 14 Jan 2021 17:31:18 +0000 (18:31 +0100)]
replace Symfony dotenv dependency with Python dotenv

3 years agobdd: directly call utility scripts in lib
Sarah Hoffmann [Thu, 14 Jan 2021 17:19:22 +0000 (18:19 +0100)]
bdd: directly call utility scripts in lib

This removes the dependency on php-symfony-dotenv for the tests.

3 years agomove dotenv parsing to installed PHP scripts
Sarah Hoffmann [Thu, 14 Jan 2021 16:09:22 +0000 (17:09 +0100)]
move dotenv parsing to installed PHP scripts

This means that the php-symfony-dotenv library is now only needed
when using the legacy scripts. This includes the BDD tests which
currently still rely on the PHP utils.

3 years agouse cli tool for github CI
Sarah Hoffmann [Thu, 14 Jan 2021 13:37:52 +0000 (14:37 +0100)]
use cli tool for github CI

3 years agoforward cli tool return value as exit code
Sarah Hoffmann [Thu, 14 Jan 2021 13:36:41 +0000 (14:36 +0100)]
forward cli tool return value as exit code

3 years agoadapt documentation to new nominatim cli tool
Sarah Hoffmann [Thu, 14 Jan 2021 11:04:08 +0000 (12:04 +0100)]
adapt documentation to new nominatim cli tool

3 years agomaller command execution fixes
Sarah Hoffmann [Thu, 14 Jan 2021 11:03:49 +0000 (12:03 +0100)]
maller command execution fixes

3 years agomake sure that environment variables have highest prio
Sarah Hoffmann [Thu, 14 Jan 2021 10:12:45 +0000 (11:12 +0100)]
make sure that environment variables have highest prio

3 years agoliniting of new python code
Sarah Hoffmann [Thu, 14 Jan 2021 09:19:21 +0000 (10:19 +0100)]
liniting of new python code

3 years agoadd wrapper calls for all nominatim tool functions
Sarah Hoffmann [Thu, 14 Jan 2021 08:37:47 +0000 (09:37 +0100)]
add wrapper calls for all nominatim tool functions

3 years agoavoid accessing constants when getting data from env
Sarah Hoffmann [Thu, 14 Jan 2021 08:30:23 +0000 (09:30 +0100)]
avoid accessing constants when getting data from env

When a setting can be read from the environment variable, avoid
accessing the internal defaults. This way the scripts can be
accessed directly in \lib as long as the environment is set up
correctly with full defaults.

3 years agofix access to environment variable
Sarah Hoffmann [Thu, 14 Jan 2021 08:29:43 +0000 (09:29 +0100)]
fix access to environment variable

3 years agoimplement warming in new cli tool
Sarah Hoffmann [Wed, 13 Jan 2021 17:25:15 +0000 (18:25 +0100)]
implement warming in new cli tool

Adds infrastructure for calling the legacy PHP scripts. As the
CONST_* values cannot be set from the python script, hand the values
in via secret environment variables instead. These are all
temporary hacks for the transition phase to python code.

3 years agowarm.php needs constant setup for queries
Sarah Hoffmann [Wed, 13 Jan 2021 17:12:53 +0000 (18:12 +0100)]
warm.php needs constant setup for queries

Warming is done using the query classes and therefore the same
copy-over from dotenv settings to CONST_* parameters is needed
as for query.php.

3 years agoset CONST_LibDir directly from the source scripts
Sarah Hoffmann [Wed, 13 Jan 2021 16:00:38 +0000 (17:00 +0100)]
set CONST_LibDir directly from the source scripts

Now that the source scripts have been moved to \lib, they
can determine the position of the PHP library relative to
themselves.

3 years agomove PHP utilities into the lib directory
Sarah Hoffmann [Wed, 13 Jan 2021 09:51:44 +0000 (10:51 +0100)]
move PHP utilities into the lib directory

These are not called directly as programs but used in a library
fashion by the installed utilities. So the library directory
is a better place.

3 years agoconsolidate cli interface to single tool
Sarah Hoffmann [Wed, 13 Jan 2021 09:11:58 +0000 (10:11 +0100)]
consolidate cli interface to single tool

3 years agocreate skeleton for new CLI tools
Sarah Hoffmann [Tue, 12 Jan 2021 21:21:20 +0000 (22:21 +0100)]
create skeleton for new CLI tools

3 years agoadd skeleton for new Nominatim executables
Sarah Hoffmann [Tue, 12 Jan 2021 09:17:28 +0000 (10:17 +0100)]
add skeleton for new Nominatim executables

3 years agoMerge pull request #2132 from lonvia/reduce-api-testdb
Sarah Hoffmann [Mon, 11 Jan 2021 09:42:22 +0000 (10:42 +0100)]
Merge pull request #2132 from lonvia/reduce-api-testdb

Reduce BDD API test database to Liechtenstein

3 years agoalso run BDD API tests in CI
Sarah Hoffmann [Sat, 9 Jan 2021 16:58:06 +0000 (17:58 +0100)]
also run BDD API tests in CI

3 years agotest can be run all in one go with make
Sarah Hoffmann [Sat, 9 Jan 2021 16:57:30 +0000 (17:57 +0100)]
test can be run all in one go with make

3 years agoupdate documentation for new BDD API tests
Sarah Hoffmann [Sat, 9 Jan 2021 16:54:45 +0000 (17:54 +0100)]
update documentation for new BDD API tests

3 years agobdd: add new API test data
Sarah Hoffmann [Sat, 9 Jan 2021 16:01:33 +0000 (17:01 +0100)]
bdd: add new API test data

Make all data necessary for API tests directly available in the
repository.

3 years agobdd: convert API tests to smaller test db
Sarah Hoffmann [Sat, 9 Jan 2021 15:59:46 +0000 (16:59 +0100)]
bdd: convert API tests to smaller test db

Changes BDD API tests to restrict themselves to
Liechtenstein. One test moved to DB as no appropriate
data is available.

3 years agobdd: improve assert output for API query checks
Sarah Hoffmann [Sat, 9 Jan 2021 15:58:37 +0000 (16:58 +0100)]
bdd: improve assert output for API query checks

Adds wrapper function for checking address parts and
more explanation strings to asserts.

3 years agobdd: import API test DB as part of step setup
Sarah Hoffmann [Thu, 7 Jan 2021 10:51:38 +0000 (11:51 +0100)]
bdd: import API test DB as part of step setup

In the future, the BDD tests will simply set up the required
test database themselves. Like with the template database, it
is not reimported when it already exists unless that is explicitly
forced.

Makes most of the API tests currently fail because they still
point to old test data.

3 years agoMerge pull request #2129 from lonvia/cleanup-bdd-tests
Sarah Hoffmann [Thu, 7 Jan 2021 08:10:40 +0000 (09:10 +0100)]
Merge pull request #2129 from lonvia/cleanup-bdd-tests

Clean up Python support code for BDD tests

3 years agoadd symphony dotenv to prerequisites list
Sarah Hoffmann [Thu, 7 Jan 2021 07:56:52 +0000 (08:56 +0100)]
add symphony dotenv to prerequisites list

3 years agouse relative dir for sources for phpunit
Sarah Hoffmann [Thu, 7 Jan 2021 07:55:15 +0000 (08:55 +0100)]
use relative dir for sources for phpunit

3 years agobdd: clean up DB ops steps
Sarah Hoffmann [Wed, 6 Jan 2021 15:37:32 +0000 (16:37 +0100)]
bdd: clean up DB ops steps

Adds comments and modernizes code.

3 years agobdd: move column comparison in separate file
Sarah Hoffmann [Wed, 6 Jan 2021 11:28:09 +0000 (12:28 +0100)]
bdd: move column comparison in separate file

Introduces a new class DBRow that encapsulates the comparison
functions. This also is responsible for formatting more informative
assert messages. place and placex steps are unified.

3 years agobdd: move nominitim id reader to separate file
Sarah Hoffmann [Tue, 5 Jan 2021 15:00:48 +0000 (16:00 +0100)]
bdd: move nominitim id reader to separate file

3 years agobdd: factor out reindexing on updates
Sarah Hoffmann [Tue, 5 Jan 2021 14:17:46 +0000 (15:17 +0100)]
bdd: factor out reindexing on updates

3 years agobdd: move place table inserter into separate file
Sarah Hoffmann [Tue, 5 Jan 2021 11:12:59 +0000 (12:12 +0100)]
bdd: move place table inserter into separate file

Also simplifies usage by implementing a function that inserts
a complete table row.

3 years agobdd: move scene setup to OSM data steps
Sarah Hoffmann [Tue, 5 Jan 2021 10:26:39 +0000 (11:26 +0100)]
bdd: move scene setup to OSM data steps

The step has nothing to do with the database.

3 years agobdd: switch to auto commit mode
Sarah Hoffmann [Tue, 5 Jan 2021 10:22:43 +0000 (11:22 +0100)]
bdd: switch to auto commit mode

Put the connection to the test database into auto-commit mode
and get rid of the explicit commits. Also use cursors always in
context managers and unify the two implementations that copy
data from the place table.

3 years agobdd: remove class for lazy formatting
Sarah Hoffmann [Tue, 5 Jan 2021 09:39:44 +0000 (10:39 +0100)]
bdd: remove class for lazy formatting

assert in combination with format() does the right thing and calls
the __str__() method only when an assertion hits.

3 years agobdd: rename db_ops steps
Sarah Hoffmann [Tue, 5 Jan 2021 09:20:00 +0000 (10:20 +0100)]
bdd: rename db_ops steps

Now all files implementing steps are called steps_*.py.

3 years agobdd: move output format computation into response
Sarah Hoffmann [Tue, 5 Jan 2021 09:17:59 +0000 (10:17 +0100)]
bdd: move output format computation into response

3 years agobdd: move Response classes in own file and simplify
Sarah Hoffmann [Mon, 4 Jan 2021 21:18:01 +0000 (22:18 +0100)]
bdd: move Response classes in own file and simplify

Removes most of the duplicated parse functions, introduces
a common assert_field function with a more expressive error
message.

3 years agobdd: rename and clean up osm_data steps
Sarah Hoffmann [Mon, 4 Jan 2021 19:17:17 +0000 (20:17 +0100)]
bdd: rename and clean up osm_data steps

Move common OPL creation code into a function and remove
unused imports.

3 years agobdd: move external process execution in separate func
Sarah Hoffmann [Mon, 4 Jan 2021 18:58:59 +0000 (19:58 +0100)]
bdd: move external process execution in separate func

3 years agobdd: move NominatimEnvironment into separate file
Sarah Hoffmann [Mon, 4 Jan 2021 16:54:51 +0000 (17:54 +0100)]
bdd: move NominatimEnvironment into separate file

Also cleans up and modernizes the code and adds documentation.

3 years agobdd: move grid generation code into geometry factory
Sarah Hoffmann [Mon, 4 Jan 2021 16:04:47 +0000 (17:04 +0100)]
bdd: move grid generation code into geometry factory

3 years agobdd: move geoemtry creation into separate file
Sarah Hoffmann [Mon, 4 Jan 2021 15:29:15 +0000 (16:29 +0100)]
bdd: move geoemtry creation into separate file

Also renames the OsmDataFactory in the more appropriate
GeometryFactory and modernizes code for python3.

3 years agoremove stale code for python2
Sarah Hoffmann [Mon, 4 Jan 2021 13:14:34 +0000 (14:14 +0100)]
remove stale code for python2

3 years agoMerge pull request #2125 from lonvia/independent-project-directory
Sarah Hoffmann [Mon, 4 Jan 2021 13:10:24 +0000 (14:10 +0100)]
Merge pull request #2125 from lonvia/independent-project-directory

Allow for truely independent project directory

3 years agocreate a temporary project dir for tests
Sarah Hoffmann [Mon, 4 Jan 2021 10:39:45 +0000 (11:39 +0100)]
create a temporary project dir for tests

The project directory contains the website script as
configured through the test configuration. This means
that tests are now completely independet of any
configuration that may be contained in the build
directory.

Also removes the hack to inject additional settings via
a environment variable.

3 years agoconfigure osm2pgsql and module location via cmake
Sarah Hoffmann [Mon, 4 Jan 2021 10:37:56 +0000 (11:37 +0100)]
configure osm2pgsql and module location via cmake

The default location of osm2pgsql and the postgresql module
is decided at compile/installation time and is not necessarily
in the project directory.

With this change it is now possible to have a project directory
that is completely separate from the build directory.

3 years agoMerge pull request #2124 from lonvia/remove-nose
Sarah Hoffmann [Sun, 3 Jan 2021 20:04:59 +0000 (21:04 +0100)]
Merge pull request #2124 from lonvia/remove-nose

Remove nose dependency for tests

3 years agoremove nose requirement from documentation
Sarah Hoffmann [Sun, 3 Jan 2021 16:23:44 +0000 (17:23 +0100)]
remove nose requirement from documentation

3 years agoreplace nose assertions with simple asserts
Sarah Hoffmann [Fri, 1 Jan 2021 14:54:52 +0000 (15:54 +0100)]
replace nose assertions with simple asserts

3 years agoMerge pull request #2119 from mtmail/check-import-finished-when-tables-droped
Sarah Hoffmann [Tue, 22 Dec 2020 14:57:48 +0000 (15:57 +0100)]
Merge pull request #2119 from mtmail/check-import-finished-when-tables-droped

utils/check_import_finished: skip some checks when setup ran with --drop

3 years agoMerge pull request #2118 from mtmail/vagrant-ubuntu-dotenv
Sarah Hoffmann [Tue, 22 Dec 2020 14:54:48 +0000 (15:54 +0100)]
Merge pull request #2118 from mtmail/vagrant-ubuntu-dotenv

Vagrant ubuntu: install dotenv package

3 years agoutils/check_import_finished: skip some checks when setup ran with --drop
marc tobias [Mon, 21 Dec 2020 19:12:31 +0000 (20:12 +0100)]
utils/check_import_finished: skip some checks when setup ran with --drop

3 years agoVagrant ubuntu: install dotenv package
marc tobias [Mon, 21 Dec 2020 19:10:13 +0000 (20:10 +0100)]
Vagrant ubuntu: install dotenv package

3 years agoMerge pull request #2115 from lonvia/use-dotenv
Sarah Hoffmann [Mon, 21 Dec 2020 10:33:38 +0000 (11:33 +0100)]
Merge pull request #2115 from lonvia/use-dotenv

Switch configuration to dotenv

3 years agoswitch documentation to describing dotenv
Sarah Hoffmann [Sun, 20 Dec 2020 11:09:27 +0000 (12:09 +0100)]
switch documentation to describing dotenv

3 years agoadapt instructions for creating the test db to dotenv
Sarah Hoffmann [Sun, 20 Dec 2020 10:53:19 +0000 (11:53 +0100)]
adapt instructions for creating the test db to dotenv

3 years agomark CentOS installation instructions as broken
Sarah Hoffmann [Sun, 20 Dec 2020 10:35:29 +0000 (11:35 +0100)]
mark CentOS installation instructions as broken

Getting symfony-dotenv installed on CentOS is a major pain,
so just mark it broken instead.

Still sSwitch the config format to dotenv already.

3 years agotests: always create the config file
Sarah Hoffmann [Sat, 19 Dec 2020 16:55:46 +0000 (17:55 +0100)]
tests: always create the config file

There is also one database test that uses the API functions.

3 years agoadapt php tests to new directory constants
Sarah Hoffmann [Thu, 17 Dec 2020 15:50:52 +0000 (16:50 +0100)]
adapt php tests to new directory constants

3 years agomake phpcs happy
Sarah Hoffmann [Thu, 17 Dec 2020 15:44:52 +0000 (16:44 +0100)]
make phpcs happy

3 years agogithub actions: need dotenv
Sarah Hoffmann [Thu, 17 Dec 2020 10:53:15 +0000 (11:53 +0100)]
github actions: need dotenv

3 years agomove creation of website scripts to setup script
Sarah Hoffmann [Thu, 17 Dec 2020 13:58:09 +0000 (14:58 +0100)]
move creation of website scripts to setup script

Instead of creating the website wrapper scripts with cmake,
they are now created when --setup-website is called. The
setup of the configuration constants is directly embedded
into the scripts. This means we can get rid of the separate
settings-frontend.php. More importantly however, it means
that it is now possible to set up multiple website directories
from the same build directory.

3 years agoadapt tests to new dotenv environment
Sarah Hoffmann [Thu, 17 Dec 2020 10:46:01 +0000 (11:46 +0100)]
adapt tests to new dotenv environment

DB tests now can simply set the environment to change configuration
variables. API tests still rely on a configuration file.

Also, query.php needs to set up the CONST_* variables to work with
the query scripts. That is a tiny bit messy and duplicates code
but this part will need to be reworked later.

3 years agofix various typos
Sarah Hoffmann [Wed, 16 Dec 2020 19:41:35 +0000 (20:41 +0100)]
fix various typos

3 years agoremove old default settings
Sarah Hoffmann [Wed, 16 Dec 2020 16:21:46 +0000 (17:21 +0100)]
remove old default settings

3 years agoswitch all utils to initialising dotenv
Sarah Hoffmann [Wed, 16 Dec 2020 16:20:58 +0000 (17:20 +0100)]
switch all utils to initialising dotenv

3 years agoswitch remaining settings to dotenv format
Sarah Hoffmann [Tue, 15 Dec 2020 14:37:31 +0000 (15:37 +0100)]
switch remaining settings to dotenv format

CONST_Search_AreaPolygons and CONST_Search_ReversePlanForAll have
been removed completely.

3 years agouse explicit DSN for website scripts
Sarah Hoffmann [Tue, 15 Dec 2020 14:36:13 +0000 (15:36 +0100)]
use explicit DSN for website scripts

Website scripts have no access to the dotenv variables, so use
the DSN constant instead when connecting to the database.

3 years agoreplace database settings with dotenv variant
Sarah Hoffmann [Tue, 15 Dec 2020 14:12:28 +0000 (15:12 +0100)]
replace database settings with dotenv variant

As we can't refer to the project root dir in the module path, the
module path may now also be a relative directory which is then
taken as being relative to the project root path.

Moves the checkModulePresence() function into the Setup class, so
that it can work on the computed absolute module path.

3 years agointroduce dotenv parsing for setup.php
Sarah Hoffmann [Tue, 15 Dec 2020 12:57:34 +0000 (13:57 +0100)]
introduce dotenv parsing for setup.php

This adds the notion of a project directory. This is the directory
that holds all necessary files for one specific installation of
Nominatim. Dotenv looks for an .env file in this directory and
adds it to the global environment together with the defaults from
Nominatim's data directory.

Add's symfony's dotenv library as a new dependency.

3 years agomake HTTP proxy setup explicit
Sarah Hoffmann [Tue, 15 Dec 2020 10:04:19 +0000 (11:04 +0100)]
make HTTP proxy setup explicit

The setup relies on the project configuration which we want to
explicitly set up in later steps. Therefore proxy setup needs to
be done explicitly as well. There is the added bonus that the
setup is done only for the utils which try to call outside.

3 years agoreorganise path settings in config
Sarah Hoffmann [Tue, 15 Dec 2020 09:09:55 +0000 (10:09 +0100)]
reorganise path settings in config

CONST_BasePath is split into separate configuration variables
for binaries, libraries and data. These variables as well as
the installation path are now set in the executable directly and
no longer configurable via project settings.

This is the first step towards an installable software. The
executables should know per installation where to find their
necessary data to execute. Project configuration needs to be
restricted to settings that really concern the specific Nominatim
installation.

3 years agouse /usr/bin/env for python script
Sarah Hoffmann [Mon, 14 Dec 2020 10:26:43 +0000 (11:26 +0100)]
use /usr/bin/env for python script

Makes it easier to use the script with a virtualenv setup.

3 years agoMerge pull request #2112 from lonvia/fix-tests-for-php-8
Sarah Hoffmann [Fri, 18 Dec 2020 13:25:50 +0000 (14:25 +0100)]
Merge pull request #2112 from lonvia/fix-tests-for-php-8

work around failing CI tests

3 years agowork around failing CI tests
Sarah Hoffmann [Thu, 17 Dec 2020 17:51:18 +0000 (18:51 +0100)]
work around failing CI tests

Force use of phpunit7 to avoid an issue with different sort order.

3 years agoIssue templates: require postgres config modifications
Sarah Hoffmann [Fri, 18 Dec 2020 09:37:01 +0000 (10:37 +0100)]
Issue templates: require postgres config modifications

3 years agoIssue templates: more commenting of instructions
Sarah Hoffmann [Wed, 16 Dec 2020 07:41:20 +0000 (08:41 +0100)]
Issue templates: more commenting of instructions

3 years agoIssue templates: put instructions into comments
Sarah Hoffmann [Wed, 16 Dec 2020 07:38:04 +0000 (08:38 +0100)]
Issue templates: put instructions into comments

3 years agoprepare 3.6.0 release v3.6.0
Sarah Hoffmann [Sun, 13 Dec 2020 10:59:16 +0000 (11:59 +0100)]
prepare 3.6.0 release

3 years agoMerge pull request #2105 from lonvia/fix-use-of-records
Sarah Hoffmann [Sun, 13 Dec 2020 08:48:21 +0000 (09:48 +0100)]
Merge pull request #2105 from lonvia/fix-use-of-records

Use a typed record for place info in get_addressdata

3 years agoactions: run tests also on postgresql 9.5
Sarah Hoffmann [Sat, 12 Dec 2020 13:50:07 +0000 (14:50 +0100)]
actions: run tests also on postgresql 9.5

This is the oldest version for which a postgis is available.

3 years agouse a typed record for place info in get_addressdata
Sarah Hoffmann [Sat, 12 Dec 2020 13:46:34 +0000 (14:46 +0100)]
use a typed record for place info in get_addressdata

Older versions of Postgresql cannot handle an untyped record
for INTO.

Fixes #2100.

3 years agoMerge pull request #2102 from mtmail/typo-in-reverse-md
Sarah Hoffmann [Sat, 12 Dec 2020 09:16:23 +0000 (10:16 +0100)]
Merge pull request #2102 from mtmail/typo-in-reverse-md

Reverse.md: fix two typos

3 years agoReverse.md: fix two typos
marc tobias [Fri, 11 Dec 2020 23:30:26 +0000 (00:30 +0100)]
Reverse.md: fix two typos

3 years agoMerge pull request #2101 from lonvia/update-documentation
Sarah Hoffmann [Fri, 11 Dec 2020 17:02:44 +0000 (18:02 +0100)]
Merge pull request #2101 from lonvia/update-documentation

Update documentation

3 years agofix typos
Sarah Hoffmann [Fri, 11 Dec 2020 16:08:13 +0000 (17:08 +0100)]
fix typos

3 years agoupdate import times
Sarah Hoffmann [Tue, 8 Dec 2020 07:57:46 +0000 (08:57 +0100)]
update import times

3 years agoMerge pull request #2099 from lonvia/update-country-names
Sarah Hoffmann [Thu, 10 Dec 2020 16:56:32 +0000 (17:56 +0100)]
Merge pull request #2099 from lonvia/update-country-names

Dynamically update country names from OSM data

3 years agoupdate country names
Sarah Hoffmann [Wed, 9 Dec 2020 16:52:25 +0000 (17:52 +0100)]
update country names

Copies all name:xx country names that are in OSM as of today
into the country name fallback table.

3 years agoupdate country_names from OSM data
Sarah Hoffmann [Wed, 9 Dec 2020 10:38:19 +0000 (11:38 +0100)]
update country_names from OSM data

Update names in the coutry_names table on the fly from incomming
OSM country data. Adding a small sanity check that the country
must be an OSM relation and within the area where we expect the
country to be.

3 years agoMerge pull request #2096 from otbutz/patch-1
Sarah Hoffmann [Wed, 9 Dec 2020 08:55:59 +0000 (09:55 +0100)]
Merge pull request #2096 from otbutz/patch-1

Add link to discussions when creating new issue

3 years agoAdd link to discussions when creating new issue
otbutz [Wed, 9 Dec 2020 08:33:42 +0000 (09:33 +0100)]
Add link to discussions when creating new issue

3 years agoremove bug reporting hints in favour of issue templates
Sarah Hoffmann [Sun, 6 Dec 2020 21:36:04 +0000 (22:36 +0100)]
remove bug reporting hints in favour of issue templates

3 years agoupdates to admin and develop documentation
Sarah Hoffmann [Sun, 6 Dec 2020 16:28:33 +0000 (17:28 +0100)]
updates to admin and develop documentation

Mostly minor updates in wording and resource consumption.