Small string and copyright updates.

diff --git a/apps/irssi/src/core/core.c b/apps/irssi/src/core/core.c
index b9debbb5c566ecdd4ae842a449253578a72148c2..ad99c4f1da640ec2d07429074fd1959c669f49d1 100644 (file)
--- a/apps/irssi/src/core/core.c
+++ b/apps/irssi/src/core/core.c
@@ -167,8 +167,8 @@ static char *fix_path(const char *str)
 void core_register_options(void)
 {
        static GOptionEntry options[] = {
-               { "config", 0, 0, G_OPTION_ARG_STRING, &irssi_config_file, "Configuration file location (~/.irssi/config)", "PATH" },
-               { "home", 0, 0, G_OPTION_ARG_STRING, &irssi_dir, "Irssi home dir location (~/.irssi)", "PATH" },
+               { "config", 0, 0, G_OPTION_ARG_STRING, &irssi_config_file, "Configuration file location", "PATH" },
+               { "home", 0, 0, G_OPTION_ARG_STRING, &irssi_dir, "SILC Client home dir location", "PATH" },
                { NULL }
        };
 

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 2859b9341096ce319788cd0d9cd8b4147e07ed0b..7743cc20c17f6a4a861264b8477307e091faf09d 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -162,7 +162,7 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "pubkey_mitm_attack", "It is also possible that someone is performing a man-in-the-middle attack", 0 },
        { "pubkey_notkey", "Server did not return any public key", 0 },
        { "pubkey_verified", "Verified successfully server {hilight $0} cached public key", 1, { 0 } },
-       { "pubkey_verified_client", "Verified successfully user {hilight $0}'s ($1 $2) cached public key", 3, { 0, 0, 0 } },
+       { "pubkey_verified_client", "Verified successfully {hilight $0}'s ($1 $2) cached public key", 3, { 0, 0, 0 } },
        { "pubkey_notverified", "Could not verify $0 {hilight $1}'s public key", 2, { 0, 0 } },
 
        /* Misc messages */

diff --git a/scripts/silcdoc/gen_index.php b/scripts/silcdoc/gen_index.php
index f7c8535802ddddc913c5e64d2466cf95ea619094..6d90b963a6440086768bdba33bef9296f72bf090 100644 (file)
--- a/scripts/silcdoc/gen_index.php
+++ b/scripts/silcdoc/gen_index.php
@@ -43,7 +43,7 @@
 
 <table border="0" cellspacing="0" cellpadding="6" width="100%">
  <tr valign="top" bgcolor="#dddddd">
-  <td><small>Copyright &copy; 2001 - 2007 SILC Project<br />
+  <td><small>Copyright &copy; 2001 - 2014 SILC Project<br />
     <a href="http://silcnet.org">SILC Project Website</a></small></td>
   <td align="right"><small>
    <a href="index.html">SILC Toolkit Reference Manual</a><br />
@@ -121,7 +121,7 @@ if ($type == 0) {
 </table>
 <table border="0" cellspacing="0" cellpadding="6" width="100%">
  <tr valign="top" bgcolor="#dddddd">
-  <td><small>Copyright &copy; 2001 - 2007 SILC Project<br />
+  <td><small>Copyright &copy; 2001 - 2014 SILC Project<br />
     <a href="http://silcnet.org">SILC Project Website</a></small></td>
   <td align="right"><small>
    <a href="index.html">SILC Toolkit Reference Manual</a><br />