# HG changeset patch
# User Steve Kemp <steve@steve.org.uk>
# Date 1197480501 0
# Node ID 69570137cb667ab55afc4cb1a3116d57cde82fb8
# Parent  e168dcfc8a3d8341d45e8eecee041d1164c97c8f
  Updated.

diff -r e168dcfc8a3d -r 69570137cb66 Makefile
--- a/Makefile	Wed Dec 12 16:49:52 2007 +0000
+++ b/Makefile	Wed Dec 12 17:28:21 2007 +0000
@@ -43,8 +43,8 @@
 	@find . -name '*~' -exec rm \{\} \;
 	@find . -name '*.bak' -exec rm \{\} \;
 	@find . -name '*.tmp' -exec rm \{\} \;
+	@if [ -d comments ]; then rm -rf comments; fi
 	@if [ -d output   ]; then rm -rf output; fi
-	@if [ -d comments ]; then rm -rf comments; fi
 	@if [ -e build-stamp ]; then rm -f build-stamp; fi
 	@if [ -e chronicle.1 ]; then rm -f chronicle.1 ; fi
 
diff -r e168dcfc8a3d -r 69570137cb66 bin/chronicle
--- a/bin/chronicle	Wed Dec 12 16:49:52 2007 +0000
+++ b/bin/chronicle	Wed Dec 12 17:28:21 2007 +0000
@@ -1642,6 +1642,10 @@
             next if ( !defined( $line ) );
 
             chomp( $line );
+
+            next if ($line =~ /^IP-Address:/ );
+            next if ($line =~ /^User-Agent:/ );
+
             if ( !length( $name ) && $line =~ /^Name: (.*)/i )
             {
                 $name = $1;
diff -r e168dcfc8a3d -r 69570137cb66 themes/blocky/comment-form.inc
--- a/themes/blocky/comment-form.inc	Wed Dec 12 16:49:52 2007 +0000
+++ b/themes/blocky/comment-form.inc	Wed Dec 12 17:28:21 2007 +0000
@@ -6,8 +6,8 @@
 <table>
 <tr><td>Your Name</td>
     <td><input type="text" size="55" name="name"></td></tr>
-<tr><td>Your Name</td>
-    <td><input type="text" size="55" name="name"></td></tr>
+<tr><td>Your Email</td>
+    <td><input type="text" size="55" name="mail"></td></tr>
 <tr><td colspan="2">Your Comment<br />
 <textarea name="body" rows="10" cols="60">
 </textarea>
diff -r e168dcfc8a3d -r 69570137cb66 themes/blog.steve.org.uk/comment-form.inc
--- a/themes/blog.steve.org.uk/comment-form.inc	Wed Dec 12 16:49:52 2007 +0000
+++ b/themes/blog.steve.org.uk/comment-form.inc	Wed Dec 12 17:28:21 2007 +0000
@@ -6,8 +6,8 @@
 <table>
 <tr><td>Your Name</td>
     <td><input type="text" size="55" name="name"></td></tr>
-<tr><td>Your Name</td>
-    <td><input type="text" size="55" name="name"></td></tr>
+<tr><td>Your Email</td>
+    <td><input type="text" size="55" name="mail"></td></tr>
 <tr><td colspan="2">Your Comment<br />
 <textarea name="body" rows="10" cols="60">
 </textarea>
diff -r e168dcfc8a3d -r 69570137cb66 themes/copyrighteous/comment-form.inc
--- a/themes/copyrighteous/comment-form.inc	Wed Dec 12 16:49:52 2007 +0000
+++ b/themes/copyrighteous/comment-form.inc	Wed Dec 12 17:28:21 2007 +0000
@@ -6,8 +6,8 @@
 <table>
 <tr><td>Your Name</td>
     <td><input type="text" size="55" name="name"></td></tr>
-<tr><td>Your Name</td>
-    <td><input type="text" size="55" name="name"></td></tr>
+<tr><td>Your Email</td>
+    <td><input type="text" size="55" name="mail"></td></tr>
 <tr><td colspan="2">Your Comment<br />
 <textarea name="body" rows="10" cols="60">
 </textarea>
diff -r e168dcfc8a3d -r 69570137cb66 themes/default/comment-form.inc
--- a/themes/default/comment-form.inc	Wed Dec 12 16:49:52 2007 +0000
+++ b/themes/default/comment-form.inc	Wed Dec 12 17:28:21 2007 +0000
@@ -6,8 +6,8 @@
 <table>
 <tr><td>Your Name</td>
     <td><input type="text" size="55" name="name"></td></tr>
-<tr><td>Your Name</td>
-    <td><input type="text" size="55" name="name"></td></tr>
+<tr><td>Your EMail</td>
+    <td><input type="text" size="55" name="email"></td></tr>
 <tr><td colspan="2">Your Comment<br />
 <textarea name="body" rows="10" cols="60">
 </textarea>