merge of '0981835be1c0f1111a3874f2165f3be7b205580e'

     and '97226d1ea7246782ec76a3b0c9e83b81124f682e'

i2p2www/pages/site/contact.html

@@ -18,10 +18,9 @@
 {% filter escape %}
 {{ _('Channel list:') }}
 
-#i2p       {{ _('General i2p discussion') }}
+#i2p       {{ _('General i2p discussion and help channel') }}
 #i2p-chat  {{ _('Offtopic') }}
 #i2p-dev   {{ _('Development talk') }}
-#i2p-help  {{ _('Help channel') }}
 {% endfilter %}
 </pre>
 

site-updater.sh

@@ -3,6 +3,8 @@ cd $(dirname $0)
 . ./etc/update.vars
 [ -f ./etc/update.vars.custom ] && . ./etc/update.vars.custom
 
+[ ! -f $TOUCHFILE ] && touch $TOUCHFILE
+
 TMP=$(mktemp XXXXXXXXXX)
 trap 'rm -f $TMP;exit' 0 1 2 15