summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-03-12 21:24:24 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-03-12 21:24:24 +0100
commitebfb170b140bd3ce9c25bd1206fe58ae40aa1587 (patch)
tree7f641338067b6e80926b070dc36886f17d4497f0
parentdeb9cf1695351d84798879c9a0e5250b24668b6a (diff)
Minor docs
-rw-r--r--cli/README.md1
-rw-r--r--config.default.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/cli/README.md b/cli/README.md
index d531b8c3d..0d1c0a7d4 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -38,6 +38,7 @@ cd /usr/share/FreshRSS
./cli/do-install.php --default_user admin ( --auth_type form --environment production --base_url https://rss.example.net/ --language en --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
# --auth_type can be: 'form' (default), 'http_auth' (using the Web server access control), 'none' (dangerous)
# --db-type can be: 'sqlite' (default), 'mysql' (MySQL or MariaDB), 'pgsql' (PostgreSQL)
+# --base_url should be a public (routable) URL if possible, and is used for push (PubSubHubbub), for some API functions (e.g. favicons), and external URLs in FreshRSS.
# --environment can be: 'production' (default), 'development' (for additional log messages)
# --language can be: 'en' (default), 'fr', or one of the [supported languages](../app/i18n/)
# --db-prefix is an optional prefix in front of the names of the tables. We suggest using 'freshrss_'
diff --git a/config.default.php b/config.default.php
index 4e4c97e67..e6297a160 100644
--- a/config.default.php
+++ b/config.default.php
@@ -1,7 +1,7 @@
<?php
# Do not modify this file, which defines default values,
-# but edit `config.php` instead, after the install process is completed.
+# but edit `./data/config.php` instead, after the install process is completed.
return array(
# Set to `development` to get additional error messages,