Merge pull request #1103 from rburchell/master-fix-info

Some updates to INFO.

diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index 0d8c1a45a9a7d382e9d41a322f72f9ca34a78df7..8dad99453581684e212f2e9e17cef64aedbe4a30 100644 (file)
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2011 Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2015 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -35,9 +35,10 @@ static const char* const lines[] = {
        "                 November 2002 - Present",
        " ",
        "\2Core Developers\2:",
-       "    Craig Edwards,          Brain,      <brain@inspircd.org>",
-       "    Craig McLure,           Craig,      <craig@inspircd.org>",
-       "    Robin Burchell,         w00t,       <w00t@inspircd.org>",
+       "    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
+       "    Peter Powell,           SaberUK,    <petpow@saberuk.com>",
+       " ",
+       "\2Former Developers\2:",
        "    Oliver Lupton,          Om,         <om@inspircd.org>",
        "    John Brooks,            Special,    <special@inspircd.org>",
        "    Dennis Friis,           peavey,     <peavey@inspircd.org>",
@@ -45,14 +46,14 @@ static const char* const lines[] = {
        "    Uli Schlachter,         psychon,    <psychon@inspircd.org>",
        "    Matt Smith,             dz,         <dz@inspircd.org>",
        "    Daniel De Graaf,        danieldg,   <danieldg@inspircd.org>",
-       "                            jackmcbarn, <jackmcbarn@inspircd.org>",
-       "    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
        " ",
-       "\2Regular Contributors\2:",
-       "    Adam           SaberUK",
+       "\2Founding Developers\2:",
+       "    Craig Edwards,          Brain,      <brain@inspircd.org>",
+       "    Craig McLure,           Craig,      <craig@inspircd.org>",
+       "    Robin Burchell,         w00t,       <w00t@inspircd.org>",
        " ",
-       "\2Other Contributors\2:",
-       "    ChrisTX        Shawn           Shutter",
+       "\2Active Contributors\2:",
+       "    Adam           Shutter",
        " ",
        "\2Former Contributors\2:",
        "   dmb             Zaba            skenmy         GreenReaper",
@@ -64,9 +65,10 @@ static const char* const lines[] = {
        "   Stskeeps        ThaPrince       BuildSmart     Thunderhacker",
        "   Skip            LeaChim         Majic          MacGyver",
        "   Namegduf        Ankit           Phoenix        Taros",
+       "   jackmcbarn      ChrisTX         Shawn",
        " ",
        "\2Thanks To\2:",
-       "   searchirc.com   irc-junkie.org  Brik           fraggeln",
+       "   Asmo            Brik            fraggeln",
        " ",
        " Best experienced with: \2An IRC client\2",
        NULL

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 145d4582a14c71b2e3bf22ee05a9188f4e6e2b38..69aa2619ccc6f9a00c600dde581b5f3718fd2807 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -367,12 +367,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        }
 
        std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
-       std::cout << con_green << "(C) InspIRCd Development Team." << con_reset << std::endl << std::endl;
-       std::cout << "Developers:" << std::endl;
-       std::cout << con_green << "\tBrain, FrostyCoolSlug, w00t, Om, Special, peavey" << std::endl;
-       std::cout << "\taquanight, psychon, dz, danieldg, jackmcbarn" << std::endl;
-       std::cout << "\tAttila" << con_reset << std::endl << std::endl;
-       std::cout << "Others:\t\t\t" << con_green << "See /INFO Output" << con_reset << std::endl;
+       std::cout << "For contributors & authors: " << con_green << "See /INFO Output" << con_reset << std::endl;
 
 #ifndef _WIN32
        if (!do_root)