Merge branch 'master' of git://projects.ceondo.com/indefero

src/IDF/conf/idf.php-dist

@@ -260,4 +260,9 @@ $cfg['allowed_scm'] = array('git' => 'IDF_Scm_Git',
 # $cfg['hg_path'] = 'hg';
 # $cfg['git_path'] = 'git';
 
+# If you do not want to have calculations of the repositories, attachments
+# and downloads size, set it to true. You can set to false some
+# times to times to check the size.
+# $cfg['idf_no_size_check'] = false;
+
 return $cfg;

src/IDF/conf/urls.php

@@ -66,7 +66,8 @@ $ctl[] = array('regex' => '#^/logout/$#',
 $ctl[] = array('regex' => '#^/help/$#',
                'base' => $base,
                'model' => 'IDF_Views',
-               'method' => 'faq');
+               'method' => 'faq',
+               'name' => 'idf_faq');
 
 $ctl[] = array('regex' => '#^/p/([\-\w]+)/$#',
                'base' => $base,