From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 12 Mar 2013 18:05:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.54~6^2
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=6e9a17fa34cc226ffcb870b37229af25beefbc35;hp=-c;p=metaproxy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
---

6e9a17fa34cc226ffcb870b37229af25beefbc35
diff --combined doc/log.xml
index 9d18763,7c1f191..80708cd
--- a/doc/log.xml
+++ b/doc/log.xml
@@@ -36,24 -36,10 +36,24 @@@
        </para>
       </listitem>
      </varlistentry>
 +    <varlistentry><term>time-format</term>
 +     <listitem>
 +      <para>
 +       Date+time format if log is written to a custom file (see filename configuration, below), using the format of
 +       <ulink
 +	   url="http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">
 +	strftime(3)</ulink>.
 +      </para>
 +      <para>
 +       Use option -m in invocation of Metaproxy command to set format if yaz_log is used (no filename given).
 +      </para>
 +     </listitem>
 +    </varlistentry>
      <varlistentry><term>filename</term>
       <listitem>
        <para>
 -       Specifies a name of log file.
 +       Specifies a name of log file. If this is omitted, logging is performed
 +       using the log system of YAZ (yaz_log).
        </para>
       </listitem>
      </varlistentry>
@@@ -134,6 -120,15 +134,15 @@@
  	  </para>
  	 </listitem>
  	</varlistentry>
+ 	<varlistentry><term>line</term>
+ 	 <listitem>
+ 	  <para>
+ 	   Simple one-line log message indicating the most important
+ 	   things from a request and response.
+ 	   Available from version 1.3.38 and later.
+ 	  </para>
+ 	 </listitem>
+ 	</varlistentry>
         </variablelist>
  
        </para>