From 91905e9defa685f0c38914372a188721c38d0942 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 13 Dec 2004 20:17:41 +0000
Subject: [PATCH] Change wording WRT ylog.h/log.h

---
 NEWS                |    7 +++----
 doc/tools.xml       |    8 ++++----
 doc/yaz-log-man.xml |    4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 5b19175..db1767f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,9 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
 Modified the YAZ logging system. The LOG level defines use YLOG_ prefix
-instead of LOG_, due to name clash with syslog(3). The new header for
-YAZ log is <yaz/ylog.h>. The old definitions are kept in <yaz/log.h>
-with all old definitions with values kept - so all applications should
-compile as usual. See "Log" chapter in YAZ manual.
+instead of LOG_, due to name clash with syslog(3). LOG_ are still
+present. New applications should define YAZ_USE_NEW_LOG=1 - this
+will effectively disable old definitions.
 
 --- 2.0.28 2004/11/09 
 
diff --git a/doc/tools.xml b/doc/tools.xml
index ea838c7..e67661c 100644
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -1,4 +1,4 @@
-<!-- $Id: tools.xml,v 1.42 2004-11-23 14:11:03 heikki Exp $ -->
+<!-- $Id: tools.xml,v 1.43 2004-12-13 20:17:41 adam Exp $ -->
  <chapter id="tools"><title>Supporting Tools</title>
   
   <para>
@@ -1803,12 +1803,12 @@ typedef struct oident
    production use of those applications.  
   </para>
   <para>
-   The log functions are declared in header <filename>yaz/ylog.h</filename>
+   The log functions are declared in header <filename>yaz/log.h</filename>
     and implemented in <filename>src/log.c</filename>.
     Due to name clash with syslog and some math utilities the logging
     interface has been modified as of YAZ 2.0.29. The obsolete interface
-    is still available if the application includes
-    <filename>yaz/log.h</filename>. The key points of the interface are:
+    is still available if in header file <filename>yaz/log.h</filename>.
+    The key points of the interface are:
   </para>
   <screen>
    void yaz_log(int level, const char *fmt, ...)
diff --git a/doc/yaz-log-man.xml b/doc/yaz-log-man.xml
index c2126bb..cabd73d 100644
--- a/doc/yaz-log-man.xml
+++ b/doc/yaz-log-man.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<!-- $Id: yaz-log-man.xml,v 1.1 2004-11-23 14:11:03 heikki Exp $ -->
+<!-- $Id: yaz-log-man.xml,v 1.2 2004-12-13 20:17:41 adam Exp $ -->
 <refentry id="yaz-log">
  <refmeta>
   <refentrytitle>yaz-log</refentrytitle>
@@ -211,7 +211,7 @@
 
  <refsect1><title>FILES</title>
   <para>
-   <filename><replaceable>prefix</replaceable>/include/yaz/ylog.h</filename>
+   <filename><replaceable>prefix</replaceable>/include/yaz/log.h</filename>
    <filename><replaceable>prefix</replaceable>/src/log.c</filename>
   </para>
  </refsect1>
-- 
1.7.10.4