Merge branch 'master' into develop

This commit is contained in:
Olof hagsand 2018-02-13 09:42:06 +07:00
commit 67f4478f76
2 changed files with 14 additions and 8 deletions

View file

@ -24,7 +24,7 @@
* Default configure file handling generalized by Renato Botelho/Matt Smith. Config file FILE is selected in the following priority order:
* Provide -f FILE option when starting a program (eg clixon_backend -F FILE)
* Provide -f FILE option when starting a program (eg clixon_backend -f FILE)
* Provide --with-configfile=FILE when configuring
* Provide --with-sysconfig=<dir> when configuring, then FILE is <dir>/clixon.xml
* Provide --sysconfig=<dir> when configuring then FILE is <dir>/etc/clixon.xml