From e7be81dd66bc4d19ff8552b81aa38821eeb9f457 Mon Sep 17 00:00:00 2001
From: yaworsky <yaworsky>
Date: Mon, 28 Nov 2005 14:03:41 +0000
Subject: Implemented charset conversion in each log path. Fixed bugs in
 configuration reader.

---
 doc/src/configuration.xml | 48 ++++++++++++++++++++++++-----------------------
 doc/src/internals.xml     | 21 +++++++++++----------
 doc/src/intro.xml         |  5 +++++
 3 files changed, 41 insertions(+), 33 deletions(-)

(limited to 'doc')

diff --git a/doc/src/configuration.xml b/doc/src/configuration.xml
index a29a210..dc99510 100644
--- a/doc/src/configuration.xml
+++ b/doc/src/configuration.xml
@@ -73,6 +73,18 @@ and <emphasis>udp</emphasis> defines a listening UDP socket.
 				</varlistentry>
 				<varlistentry>
 					<term>
+encoding
+					</term>
+					<listitem>
+						<para>
+Optional.
+Expect incoming messages in this encoding.
+Default is UTF-8.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>
 interface
 					</term>
 					<listitem>
@@ -125,6 +137,19 @@ or <quote>collector</quote> respectively.
 				</varlistentry>
 				<varlistentry>
 					<term>
+encoding
+					</term>
+					<listitem>
+						<para>
+Optional.
+Messages must be converted to this encoding.
+Conversion is not performed if both source and destination encodings are identical or not specified.
+Default is UTF-8.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>
 file
 					</term>
 					<listitem>
@@ -526,29 +551,6 @@ Default is <emphasis>yes</emphasis>.
 				</varlistentry>
 				<varlistentry>
 					<term>
-source_encoding
-					</term>
-					<listitem>
-						<para>
-Optional.
-Convert incoming messages from specified encoding to
-<emphasis>destination_encoding</emphasis>.
-Default is do not convert.
-						</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>
-destination_encoding
-					</term>
-					<listitem>
-						<para>
-Required, if <emphasis>source_encoding</emphasis> is given.
-						</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>
 mark_interval
 					</term>
 					<listitem>
diff --git a/doc/src/internals.xml b/doc/src/internals.xml
index dafa160..88da43a 100644
--- a/doc/src/internals.xml
+++ b/doc/src/internals.xml
@@ -68,16 +68,17 @@ or by the writing thread after file is closed.
 +------------+             +-----+         | +------+     |
                                            +--------------+
 
-    +-----------------+    +------+    +-----------+    +-----------+
---->|charset converter|--->|filter|--->|multiplexer|-+->|destination|+
-    +-----------------+    +------+    +-----------+ +->+-----------+|+
-                                             ^       +-> +-----------+|
-                                             |            +-----------+
-                                         +-------+
-                                         |logpath|+
-                                         +-------+|+
-                                          +-------+|
-                                           +-------+
+    +------+    +-----------------+    +-----------+
+--->|filter|--->|   multiplexer   |-+->|destination|+
+    |      |    |charset converter| |  |           ||
+    +------+    +-----------------+ +->+-----------+|+
+                         ^          +-> +-----------+|
+                         |               +-----------+
+                     +-------+
+                     |logpath|+
+                     +-------+|+
+                      +-------+|
+                       +-------+
 
 
    file         +-----------+    +-----+        +--------------+
diff --git a/doc/src/intro.xml b/doc/src/intro.xml
index 7c3d104..077b606 100644
--- a/doc/src/intro.xml
+++ b/doc/src/intro.xml
@@ -26,6 +26,11 @@ log rotation;
 			</listitem>
 			<listitem>
 				<para>
+charset conversion between message sources and destinations;
+				</para>
+			</listitem>
+			<listitem>
+				<para>
 completely open-source.
 				</para>
 			</listitem>
-- 
cgit v1.2.3