Merge https://github.com/friendica/red into pending_merge

2 files changed, 7 insertions, 2 deletions

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 41259d303..fe8b931f1 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -105,6 +105,11 @@ This document assumes you're an administrator.
         list of names (no spaces)
     [b]system > auto_follow[/b]
         Make the first channel of an account auto-follow channels listed here.
-	
+	[b]system > admin_email[/b]
+		Specifies the administrators email for this site.  This is initially set during install.
+	[b]system > cron_hour[/b]
+		Specify an hour in which to run cron_daily.  By default with no config, this will run at midnight.
+	[b]system > minimum_feedcheck_minutes[/b]
+		The minimum interval between polling RSS feeds.  If this is lower than the cron interval, feeds will be polled with each cronjob
 #include doc/macros/main_footer.bb;
 
diff --git a/mod/uexport.php b/mod/uexport.php
index 4c1f6bee2..250a001a2 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -34,7 +34,7 @@ function uexport_content(&$a) {
 		'$basictitle' => t('Export Channel'),
 		'$basic' => t('Export your basic channel information to a small file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but	does not contain your content.'),
 		'$fulltitle' => t('Export Content'),
-		'$full' => t('Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new site as this file may be VERY large.  Please be patient - it may take several minutes for this download to begin.')
+		'$full' => t('Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large.  Please be patient - it may take several minutes for this download to begin.')
 	));
 return $o;
 }