Merge branch 'master' into develop

doc/ChangeLog

@@ -1,4 +1,4 @@
-Version 3.1.2, released September 5th, 2015
+Version 3.1.2, released September 5th, 2016
 ===========================================
 
 - Fixed two vulnerabilities

doc/index.html

@@ -209,10 +209,6 @@
                                           If your are reading this documentation from your local <b>ELOG</b> server,
                                           check for updates on the <a href="http://midas.psi.ch/elog/">ELOG Home Page</a>
                                        .
-                                       <p>
-                                          See also the <b>ELOG</b> project pages on <a href="http://sourceforge.net/projects/elog">
-                                             <img align="middle" src="http://sourceforge.net/sflogo.php?group_id=40505&amp;type=1"
-                                                width="88" height="31" border="0" alt="SourceForge"></a>
                                        <p>
                                           <HR>
                                           <div class="footer">&nbsp; Content by <a class="nav" href="mailto:Stefan.Ritt&#64;psi.ch">

elogd.init

@@ -6,9 +6,6 @@
 # config: /usr/local/elog/elogd.cfg
 # pidfile: /var/run/elogd.pid
 
-# Source function library.
-# . /etc/rc.d/init.d/functions
-
 # Check for the config file
 if [ ! -f /usr/local/elog/elogd.cfg ]; then
     exit 0
@@ -33,9 +30,12 @@ case "$1" in
 	echo -n "Starting elogd: "
 	/usr/local/sbin/elogd -D -c /usr/local/elog/elogd.cfg  > /dev/null 2>&1 
 	RETVAL=$?
-        if [ $RETVAL -eq 0  ] ; then 
+	if [ $RETVAL -eq 0  ] ; then 
-          touch /var/lock/subsys/elogd
+	  touch /var/lock/subsys/elogd
-        fi
+	  echo_success
+	else
+	  echo_failure
+	fi
 	echo
 	;;
   stop)

elogd.init_template

@@ -6,9 +6,6 @@
 # config: @PREFIX@/elog/elogd.cfg
 # pidfile: /var/run/elogd.pid
 
-# Source function library.
-# . /etc/rc.d/init.d/functions
-
 # Check for the config file
 if [ ! -f @PREFIX@/elog/elogd.cfg ]; then
     exit 0
@@ -35,6 +32,9 @@ case "$1" in
 	RETVAL=$?
         if [ $RETVAL -eq 0  ] ; then 
           touch /var/lock/subsys/elogd
+	  echo_success
+	else
+	  echo_failure
         fi
 	echo
 	;;