* Make the ircII format use Maintainer instead of ircIInick.

* Documentation:
  + Add note that Maintainer is used by some log formats.

docs/Changelog

@@ -19,6 +19,9 @@ pisg (0.64) - ??
      nick while parsing. Saves memory and is probably saner anyway (thanks!).
    * Add version number to documentation title (and let the release Makefile
      update it).
+   * Make the ircII format use Maintainer instead of ircIINick.
+   * Documentation:
+     + Add note that Maintainer is used by some log formats.
 
 pisg (0.63) - Wed Jan, 12th 2005
    Morten:

docs/FORMATS

@@ -384,7 +384,7 @@ time"
     5 minutes), with the main effect being the topic change times will only
     accurate to how often the time is marked.
 
-  - The config option "ircIINick" needs to be set to the maintainer's nick
+  - The config option "Maintainer" needs to be set to the maintainer's nick
 
   Example:
     22:40

docs/pisg-doc.xml

@@ -105,10 +105,10 @@
    ]]>
    </programlisting>
 
-   The above will define a channel called <command>#channel</command>, the
+   The above will define a <xref linkend="Channel" /> called <command>#channel</command>, the
    logfile pisg will look for is called <command>channel.log</command> and
-   the format of the logfile will be <command>mIRC</command>. The
-   maintainer (which will be stated on the output page) is
+   the <xref linkend="Format" /> of the logfile will be <command>mIRC</command>. The
+   <xref linkend="Maintainer" /> (which will be stated on the output page) is
    <command>John</command>.
    </para>
 
@@ -435,6 +435,7 @@
     <command>Format</command> is used to define the format of the logfile,
     pisg supports a various number of different logfiles, see the FORMATS
     file included with the pisg distribution.
+    See also <xref linkend="Maintainer" />.
     </para>
     </refsect1>
     <refsect1>
@@ -706,6 +707,9 @@
     maintainer of the statistics page, this can be either the person
     generating the stats or the bot/client doing the logging.
     The maintainer is displayed in the outputted stats page.
+    This setting is also used by some log parsers where "You" is used
+    instead of the nick in the log (e.g. "You have been kicked").
+    See also <xref linkend="Format" />.
     </para>
     </refsect1>
     <refsect1>

modules/Pisg.pm

@@ -188,7 +188,6 @@ sub get_default_config_settings
         charset => 'iso-8859-1',
         logcharset => '',
         logcharsetfallback => '',
-        irciinick => 'maintainer',
 
         # sorting
         sortbywords => 0,

modules/Pisg/Parser/Format/ircII.pm

@@ -46,7 +46,7 @@ sub normalline
             $hash{nick}   = $1;
             $hash{saying} = $2;
         } elsif ($1 =~ /^> (.*)/) {
-            $hash{nick} = $self->{cfg}->{irciinick};
+            $hash{nick} = $self->{cfg}->{maintainer};
             $hash{saying} = $1;
         }