diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-13 21:06:26 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-13 21:06:26 -0700 |
| commit | 40e03a05be8273a0c5fcebeeab127009976d6086 (patch) | |
| tree | 2f987765fa51f208fe69f5de988c98b5c1c10fa4 /include/config.php | |
| parent | bd70e6ae6d5baa5f75e3c704ae25ff41a6a90047 (diff) | |
| parent | b9eb74a705823ddc0fafe81e460442b525d0e7ed (diff) | |
| download | volse-hubzilla-40e03a05be8273a0c5fcebeeab127009976d6086.tar.gz volse-hubzilla-40e03a05be8273a0c5fcebeeab127009976d6086.tar.bz2 volse-hubzilla-40e03a05be8273a0c5fcebeeab127009976d6086.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/config.php')
| -rw-r--r-- | include/config.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/config.php b/include/config.php index 8c0469392..44ef29614 100644 --- a/include/config.php +++ b/include/config.php @@ -1,5 +1,4 @@ <?php - /** * @file include/config.php * @brief Arbitrary configuration storage. @@ -7,7 +6,6 @@ * Arrays get stored as serialized strings. * Booleans are stored as integer 0/1. * - * - <b>config</b> is used for hub specific configurations. It overrides the * configurations from .htconfig file. The storage is of size TEXT. * - <b>pconfig</b> is used for channel specific configurations and takes a @@ -26,7 +24,7 @@ * - get_config() and set_config() can also be done through the command line tool * @ref util/config.md "util/config" * - get_pconfig() and set_pconfig() can also be done through the command line tool - * @ref util/pconfig.md "util/pconfig" and takes a channel_id as first argument. + * @ref util/pconfig.md "util/pconfig" and takes a channel_id as first argument. * */ |