Merge branch 'ac'

[friendica.git] / view / en / htconfig.tpl

diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 0ce28b4a06693d19795e3a29f8c4c8b59f157722..9e39eeb59cc88fe0c94e78495ed60dcebc709475 100644 (file)
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
@@ -66,9 +66,6 @@ $a->config['system']['rino_encrypt'] = true;
 
 $a->config['system']['theme'] = 'duepuntozero';
 
-// Addons or plugins are configured here.
-// This is a comma seperated list of addons to enable. Example:
-// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
-
-$a->config['system']['addon'] = 'js_upload';
+// By default allow pseudonyms
 
+$a->config['system']['no_regfullname'] = true;