Merge pull request #2769 from Zopokx/stable

Correction of few typo errors (conf/)

16 files changed, 36 insertions, 43 deletions

diff --git a/.mailmap b/.mailmap
index 111831380..7b038e1e3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -63,7 +63,7 @@ Kenpachi <Kenpachi.Developer@gmx.de> Kenpachi Developer <Kenpachi.Developer@gmx.
 <Asheraf@users.noreply.github.com> <acheraf1998@gmail.com>
 <sagunkho@hotmail.com> <sagunxp@gmail.com>
 <git@gumi.ca> <mekolat@users.noreply.github.com>
-
+Zopokx <zopokx@gmail.com>
 
 
 
diff --git a/AUTHORS b/AUTHORS
index f51704d4b..ce72fc223 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -187,7 +187,6 @@ Shido <the.keikun@gmail.com>
 Shizuke <matiasdvt@hotmail.com>
 sigtus <vantimothy@openmailbox.org>
 sirius <fw@f-ws.de>
-Sirius <zopokx@gmail.com>
 skyleo <leo-pflug@web.de>
 skyleo <skyleo@skyleo.de>
 smokexyz <sagunkho@hotmail.com>
@@ -215,6 +214,7 @@ Yommy <yomanda@gmail.com>
 Your Name <ibrahem.h.basyone@gmail.com>
 zackdreaver <zackdreaver@gmail.com>
 Zarbony <justonlinegames@web.de>
+Zopokx <zopokx@gmail.com>
 
 
 
diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf
index 2b4184e11..fd079c59d 100644
--- a/conf/battlegrounds.conf
+++ b/conf/battlegrounds.conf
@@ -14,8 +14,8 @@
 //= arenas: ({
 //=		//- allowedTypes defines what kind of applications the arena will accept, setting is not case-sensitive and is ok with whitespaces
 //= 		allowedTypes: "Solo | Party" //Arena Accepts solo and party-type joins
-//=     	allowedTypes: "guild|party" //Arena Accepts solo and guild-type joins
-//=			allowedTypes: "All" //Arena Accepts solo, party and guild-type joins
+//= 		allowedTypes: "guild | party" //Arena Accepts solo and guild-type joins
+//= 		allowedTypes: "All" //Arena Accepts solo, party and guild-type joins
 //=		//- fillAnnounce (optional arena param)
 //= })
 battlegrounds: (
@@ -46,7 +46,7 @@ battlegrounds: (
 		delay_var: "Tierra_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
 		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
-		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
+		pGameDuration: 20 /* time to wait for players to confirm their attendance after queueing process has finished */
 	},{
 		name: "Flavius" //must match the name in client files
 		event: "start#bat_b01::OnPlayerListReady"
@@ -64,7 +64,7 @@ battlegrounds: (
 		delay_var: "Flavius_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
 		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
-		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
+		pGameDuration: 20 /* time to wait for players to confirm their attendance after queueing process has finished */
 	},{
 		name: "KVM (Level 80 and up)" //must match the name in client files
 		event: "KvM03_BG::OnPlayerListReady"
@@ -82,7 +82,7 @@ battlegrounds: (
 		delay_var: "KVM_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
 		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
-		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
+		pGameDuration: 20 /* time to wait for players to confirm their attendance after queueing process has finished */
 	},{
 		name: "KVM (Level 60~79)" //must match the name in client files
 		event: "KvM03_BG::OnPlayerListReady"
@@ -100,7 +100,7 @@ battlegrounds: (
 		delay_var: "KVM_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
 		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
-		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
+		pGameDuration: 20 /* time to wait for players to confirm their attendance after queueing process has finished */
 	},{
 		name: "KVM (Level 59 and below)" //must match the name in client files
 		event: "KvM03_BG::OnPlayerListReady"
@@ -118,7 +118,7 @@ battlegrounds: (
 		delay_var: "KVM_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
 		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
-		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
+		pGameDuration: 20 /* time to wait for players to confirm their attendance after queueing process has finished */
 	}
 	)
 })
diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index a8918e705..8632aa3ad 100644
--- a/conf/char/char-server.conf
+++ b/conf/char/char-server.conf
@@ -152,7 +152,7 @@ char_configuration: {
 			// example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
 			name_ignoring_case: false
 
-			// Manage possible letters/symbol in the name of charater. Control character (0x00-0x1f) are never accepted. Possible values are:
+			// Manage possible letters/symbol in the name of character. Control character (0x00-0x1f) are never accepted. Possible values are:
 			// NOTE: Applies to character, party and guild names.
 			// 0: no restriction (default)
 			// 1: only letters/symbols in 'name_letters' option.
diff --git a/conf/common/socket.conf b/conf/common/socket.conf
index fe171336a..9367b181a 100644
--- a/conf/common/socket.conf
+++ b/conf/common/socket.conf
@@ -34,13 +34,13 @@ socket_configuration: {
 	// Display debug reports (When something goes wrong during the report, the report is saved.)
 	debug: false
 
-	// Linux/Epoll: Maxmimum Events per cycle
+	// Linux/Epoll: Maximum Events per cycle
 	// Default Value:
-	//	(Maxmimum Supported Connections)/2
+	//	(Maximum Supported Connections)/2
 	// NOTE: this controls the maximum collected socket-events per-cycle (call to epoll_wait())
-	//       for example settings this to 32 will allow up to 32 events (incomming data/new connections
+	//       for example settings this to 32 will allow up to 32 events (incoming data/new connections
 	//       per server-cycle.
-	// NOTE: Recommended Settings is at least half the maxmimum supported connections
+	// NOTE: Recommended Settings is at least half the maximum supported connections
 	//       Settings this to a lower value, may cause lags/delays
 	//       Depending on available CPU Time
 	// NOTE: This Setting is only available on Linux when build using EPoll as event dispatcher!
diff --git a/conf/global/console.conf b/conf/global/console.conf
index 4865fd9b7..56213cbea 100644
--- a/conf/global/console.conf
+++ b/conf/global/console.conf
@@ -26,7 +26,7 @@
 //=========================================================================
 //= Server Console configuration file.
 //=========================================================================
-// This file affects how ALL server consoles work, unless explictly defined
+// This file affects how ALL server consoles work, unless explicitly defined
 // so in the server configuration file (See doc/global_configuration.txt
 // for more information).
 //=========================================================================
diff --git a/conf/global/sql_connection.conf b/conf/global/sql_connection.conf
index 7a8932f33..2441c4cee 100644
--- a/conf/global/sql_connection.conf
+++ b/conf/global/sql_connection.conf
@@ -26,7 +26,7 @@
 //=========================================================================
 //= SQL connection configuration file.
 //=========================================================================
-// This file affects how ALL server sql connections work, unless explictly
+// This file affects how ALL server sql connections work, unless explicitly
 // defined so in the server configuration file (See
 // doc/global_configuration.txt for more information).
 //=========================================================================
diff --git a/conf/login/login-server.conf b/conf/login/login-server.conf
index a7a30c83d..1d2792268 100644
--- a/conf/login/login-server.conf
+++ b/conf/login/login-server.conf
@@ -56,13 +56,13 @@ login_configuration: {
 
 	// for packet version >= 20170726
 	users_count: {
-		// if false, dont show any colored strings.
+		// if false, don't show any colored strings.
 		// if true, show special users count numbers for coloring char servers.
 		send_user_count_description: true
 
 		// users counts for use different colors.
 		// below 'low' show green text
-		// below 'medium' show oragne text
+		// below 'medium' show orange text
 		// below 'high' show red text
 		// higher 'high' show purple text
 		low: 200
@@ -85,7 +85,7 @@ login_configuration: {
 		time_allowed: 10
 
 		// Starting additional sec from now for the limited time at creation of account
-		// -1: new account are created with UNlimited time (default value)
+		// -1: new account are created with unlimited time (default value)
 		// 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)
 		start_limited_time: -1
 
diff --git a/conf/map/battle/gm.conf b/conf/map/battle/gm.conf
index bd5cfbef7..f0e9083d7 100644
--- a/conf/map/battle/gm.conf
+++ b/conf/map/battle/gm.conf
@@ -50,10 +50,11 @@ atcommand_max_stat_bypass: false
 // Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
 ban_hack_trade: 5
 
-// requires RENEWAL_DROP to be enabled (src/map/config/renewal.h)
-// modifies @mobinfo to display the users' real drop rate as per renewal_drop formula
+// modifies @mobinfo to display the users' real drop rate as per renewal_drop formula (Note 1)
 // modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level)
-atcommand_mobinfo_type: 0
+// NOTE: requires RENEWAL_DROP to be enabled (src/map/config/renewal.h)
+// Default: false
+atcommand_mobinfo_type: false
 
 // Ignore warpable area configuration.
 // Set the minimum group id to ignore invalid cells when warping.
diff --git a/conf/messages.conf b/conf/messages.conf
index c30af621e..3c381142d 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -915,7 +915,7 @@
 1044: Autotrade Disabled
 1045: Battlegrounds ON
 1046: PvP Flags: 
-1047: Pvp ON | 
+1047: PvP ON | 
 1048: NoGuild | 
 1049: NoParty | 
 1050: NightmareDrop | 
diff --git a/conf/network.conf b/conf/network.conf
index b355acb25..b6f1aa978 100644
--- a/conf/network.conf
+++ b/conf/network.conf
@@ -26,7 +26,7 @@ allowed: (
 
 /*
  * List here any IP ranges a char- or map-server can connect from. These ranges
- * will also be excluded from the automatic ipban in casee of password failure.
+ * will also be excluded from the automatic ipban in case of password failure.
  * Any entry present in this list is also automatically included in the
  * allowed IP list.
  * Note: This may be a security threat. Only edit this list if you know what
diff --git a/db/constants.conf b/db/constants.conf
index 700207c80..60528f598 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3757,7 +3757,7 @@ constants_db: {
 	MER_SWORDMAN09:    6045
 	MER_SWORDMAN10:    6046
 
-	comment__: "checkquest"
+	comment__: "questprogress"
 	HAVEQUEST: 0
 	PLAYTIME:  1
 	HUNTING:   2
diff --git a/doc/constants.md b/doc/constants.md
index 18b7e9185..d1c926c29 100644
--- a/doc/constants.md
+++ b/doc/constants.md
@@ -3658,7 +3658,7 @@
 - `MER_SWORDMAN09`: 6045
 - `MER_SWORDMAN10`: 6046
 
-### checkquest
+### questprogress
 
 - `HAVEQUEST`: 0
 - `PLAYTIME`: 1
diff --git a/doc/option_drop_group.md b/doc/option_drop_group.md
index 325cf9fe2..730db53e6 100644
--- a/doc/option_drop_group.md
+++ b/doc/option_drop_group.md
@@ -1,6 +1,6 @@
 # Option Drop Group Database
 
-## Description 
+## Description
 Explanation of the `db/option_drop_groups.conf` file and structure.
 
 This database file allows the creation of groups of random options
@@ -23,7 +23,7 @@ options for each of these slots.
 
 		// Possible options for slot 1
 		// min/max value : int, defaults to 0
-		// chance : int, 100 = 1% if not set, will be 100%/number of possibiltiies
+		// chance : int, 100 = 1% if not set, will be 100%/number of possibilities
 		OptionName: value
 		// or
 		OptionName: [min value, max value]
@@ -70,7 +70,7 @@ When chance is not specified in an option, it will be auto calculated by
 the server as being `100%/num`, when `num` is the number of possibilities
 in this option slot.
 
-For example, if you specify 3 possible options, all of them without 
+For example, if you specify 3 possible options, all of them without
 a `chance` defined, all of them will have 33.33% chance of being
 picked (100%/3). If you set the chance of one of them to 50%, you
 will have one option with 50% chance, and each of the others with
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 9bbb65c1c..ee56087b2 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4551,7 +4551,7 @@ Name is optional, and defaults to the attached player if omitted.
 *agitcheck()
 *agitcheck2()
 
-These function will let you check whether the server is currently in WoE
+These functions will let you check whether the server is currently in WoE
 mode (or WoE SE mode if the second function is called) and will return true
 if War of Emperium is on and false if it isn't.
 
@@ -9641,26 +9641,18 @@ This will open a book item at the specified page.
 ---------------------------------------
 
 *rodex_sendmail(<char id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>{, <item2>, <amount2>{, <item3>, <amount3>{, <item4>, <amount4>{, <item5>, <amount5>}}}}}})
+*rodex_sendmail2(<char id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}})
+
 *rodex_sendmail_acc(<account id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>{, <item2>, <amount2>{, <item3>, <amount3>{, <item4>, <amount4>{, <item5>, <amount5>}}}}}})
+*rodex_sendmail_acc2(<account id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}})
 
 This will send a mail using the RoDEX mail system, in newer clients the message will be marked as a NPC mail (that you can't reply).
 If items and zeny are specified, they will be added as attachments to the message.
-
 For examples of usage, see /doc/sample/npc_rodex.txt
 
----------------------------------------
-
-*rodex_sendmail2(<char id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}})
-*rodex_sendmail_acc2(<account id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}})
-
-These are more flexible versions of rodex_sendmail and rodex_sendmail_acc.
-
-This will send a mail using the RoDEX mail system, in newer clients the message will be marked as a NPC mail (that you can't reply).
-If items and zeny are specified, they will be added as attachments to the message.
+rodex_sendmail2 and rodex_sendmail_acc2 are more flexible versions.
 Check getitem2 command for more information of the extra parameters.
 
-For examples of usage, see /doc/sample/npc_rodex.txt
-
 ---------------------------------------
 //=====================================
 7 - Instance-Related Commands
diff --git a/src/config/secure.h b/src/config/secure.h
index fd05b4a49..bcd4e022b 100644
--- a/src/config/secure.h
+++ b/src/config/secure.h
@@ -60,7 +60,7 @@
  * (Secure) Optional NPC Dialog Timer
  * @requirement : SECURE_NPCTIMEOUT must be enabled
  * Minimum Interval Between timeout checks in seconds
- * Default: 1s
+ * Default: 1
  **/
 #define SECURE_NPCTIMEOUT_INTERVAL 1