Merge branch 'master' into fticks_syslog2

diff --combined radsecproxy.conf.5.xml
index 4db6672,560cb2a..4fb9476
--- 1/radsecproxy.conf.5.xml
--- 2/radsecproxy.conf.5.xml
+++ b/radsecproxy.conf.5.xml
@@@ -2,14 -2,14 +2,14 @@@
  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
  <refentry>
    <refentryinfo>
-     <date>2011-10-08</date>
+     <date>2012-12-12</date>
    </refentryinfo>
    <refmeta>
      <refentrytitle>
        <application>radsecproxy.conf</application>
      </refentrytitle>
      <manvolnum>5</manvolnum>
-     <refmiscinfo>radsecproxy 1.5</refmiscinfo>
+     <refmiscinfo>radsecproxy 1.6-dev</refmiscinfo>
    </refmeta>
    <refnamediv>
      <refname>
@@@ -243,25 -243,6 +243,25 @@@ blocktype name 
        </varlistentry>
  
        <varlistentry>
 +        <term><literal>FTicksSyslogFacility</literal></term>
 +        <listitem>
 +        <para>
 +          The FTicksSyslogFacility option is used to specify a
 +          dedicated syslog facility for F-Ticks messages.  This
 +          allows for easier filtering of F-Ticks messages.  If no
 +          FTicksSyslogFacility option is given, F-Ticks messages are
 +          written to what the LogDestination option specifies.
 +        </para>
 +        <para>
 +          F-Ticks messages are always logged using the log level
 +          LOG_DEBUG.  Note that specifying a file in
 +          FTicksSyslogFacility (using the file:/// prefix) is
 +          not supported.
 +        </para>
 +      </listitem>
 +      </varlistentry>
 +
 +      <varlistentry>
          <term><literal>ListenUDP</literal></term>
          <listitem>
          <para>