Update copyright notice

[empserver] / info / mksubj.pl

diff --git a/info/mksubj.pl b/info/mksubj.pl
index 567013cf1c0a82547415008f320d0e61d86635f6..614b035b9a958b06ddfbb5e4524aebba764e9d8e 100644 (file)
--- a/info/mksubj.pl
+++ b/info/mksubj.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                 Ken Stevens, Steve McClure, Markus Armbruster
 #
 #   Empire is free software: you can redistribute it and/or modify
@@ -135,16 +135,16 @@ sub parse_file {
        if (/^\.SA "([^\"]*)"/) {
            parse_see_also($topic, $1);
        } else {
-           error("Incorrect .SA Syntax.  Syntax should be '.SA \"item1, item2\"'");
-       }
-
-       while (<F>) {
-           error("Multiple .SA requests.  Each file may contain at most one.") if /^\.SA/;
+           error("Incorrect .SA argument, expecting '.SA \"item1, item2\"'");
        }
     } else {
        error(".SA request is missing");
     }
 
+    if (<F>) {
+       error(".SA request must be the last line");
+    }
+
     $lines{$topic} = $.;
     close F;
 }
@@ -220,13 +220,13 @@ sub update_subj {
     }
     $out .= ".s1\n"
        . ".in 0\n"
-       . "For info on a particular subject, type \"info <subject>\" where <subject> is\n"
-       . "one of the subjects listed above.\n";
-    $out .= "Subjects marked by * are the most important and should be read by new players.\n"
+       . "For info on a particular topic, type \"info <topic>\" where <topic> is\n"
+       . "one of the topics listed above.\n";
+    $out .= "Topics marked by * are the most important and should be read by new players.\n"
        if $any_basic;
-    $out .= "Subjects marked by + are obsolete.\n"
+    $out .= "Topics marked by + are obsolete.\n"
        if $any_obsolete;
-    $out .= "Unusually long subjects are marked with a !.\n"
+    $out .= "Topics with unusually long info are marked with a !.\n"
        if $any_long;
 
     return if (same_contents($fname, $out));