diff options
| author | Adam <Adam@anope.org> | 2010-10-02 16:11:58 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-10-02 16:11:58 -0400 |
| commit | 3499edc4271d3241eda5ee0a7d55254efa6f2663 (patch) | |
| tree | 13deab4305267c97466d8fa5e2a9de00c7171335 | |
| parent | 8a0cf62d703a7e4b15c2d04d9d38e1b58165ef4d (diff) | |
Replaced globalnick and globaldescription with just nick and description, since it's in its own block now
| -rw-r--r-- | data/example.conf | 4 | ||||
| -rw-r--r-- | src/config.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/example.conf b/data/example.conf index 00e0d38ad..8f86e44a3 100644 --- a/data/example.conf +++ b/data/example.conf @@ -1504,13 +1504,13 @@ global /* * The nickname of the Global client. */ - globalnick = "Global" + nick = "Global" /* * The description of the Global client, which will be used as the GECOS (real * name) of the client. */ - globaldescription = "Global Noticer" + description = "Global Noticer" } /* diff --git a/src/config.cpp b/src/config.cpp index 293a7f910..7aa90947a 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1177,8 +1177,8 @@ void ServerConfig::Read() {"operserv", "sessionautokillexpiry", "0", new ValueContainerTime(&this->SessionAutoKillExpiry), DT_TIME, NoValidation}, {"operserv", "addakiller", "no", new ValueContainerBool(&this->AddAkiller), DT_BOOLEAN, NoValidation}, {"operserv", "opersonly", "no", new ValueContainerBool(&this->OSOpersOnly), DT_BOOLEAN, NoValidation}, - {"global", "globalnick", "", new ValueContainerString(&this->s_GlobalNoticer), DT_STRING | DT_NORELOAD, NoValidation}, - {"global", "globaldescription", "Global Noticer", new ValueContainerString(&this->desc_GlobalNoticer), DT_STRING | DT_NORELOAD, ValidateGlobal}, + {"global", "nick", "", new ValueContainerString(&this->s_GlobalNoticer), DT_STRING | DT_NORELOAD, NoValidation}, + {"global", "description", "Global Noticer", new ValueContainerString(&this->desc_GlobalNoticer), DT_STRING | DT_NORELOAD, ValidateGlobal}, {"defcon", "defaultlevel", "0", new ValueContainerInt(&DefConLevel), DT_INTEGER, ValidateDefCon}, {"defcon", "level4", "", new ValueContainerString(&DefCon4), DT_STRING, ValidateDefCon}, {"defcon", "level3", "", new ValueContainerString(&DefCon3), DT_STRING, ValidateDefCon}, |