summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example.conf4
-rw-r--r--src/config.cpp4
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},