Merge pull request #2769 from Zopokx/stable

Correction of few typo errors (conf/)

9 files changed, 23 insertions, 22 deletions

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