aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/features.php2
-rwxr-xr-xinstall/htconfig.sample.php2
-rw-r--r--view/en/htconfig.tpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/features.php b/include/features.php
index 78e611afe..4d8d162fa 100644
--- a/include/features.php
+++ b/include/features.php
@@ -50,7 +50,7 @@ function get_features($filtered = true) {
array('profile_export', t('Profile Import/Export'), t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
array('hide_rating', t('Hide Rating'), t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),
- array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders'),false,get_config('feature_lock','private_notes')),
+ array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')),
array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
array('photo_location', t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 794afa93b..df39bc9ad 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -37,7 +37,7 @@ $db_type = 0; // use 1 for postgres, 0 for mysql
$default_timezone = 'America/Los_Angeles';
-// What is your site name?
+// What is your site name? DO NOT ADD A TRAILING SLASH!
$a->config['system']['baseurl'] = 'https://myredsite.example';
$a->config['system']['sitename'] = "Hubzilla";
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 17ee7bfeb..17f19702f 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
$default_timezone = '{{$timezone}}';
-// What is your site name?
+// What is your site name? DO NOT ADD A TRAILING SLASH!
$a->config['system']['baseurl'] = '{{$siteurl}}';
$a->config['system']['sitename'] = "Hubzilla";