Merge branch 'master' into cell_noskill

2 files changed, 23 insertions, 23 deletions

diff --git a/conf/global/console.conf b/conf/global/console.conf
index 84a16a7c8..4865fd9b7 100644
--- a/conf/global/console.conf
+++ b/conf/global/console.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -32,36 +32,36 @@
 //=========================================================================
 
 console: {
-	//Time-stamp format which will be printed before all messages.
-	//Can at most be 20 characters long.
-	//Common formats:
-	// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
-	// %H:%M:%S (hour:minute:second, 24 hour format)
-	// %d/%b/%Y (day/Month/year)
-	//For full format information, consult the strftime() manual.
+	// Time-stamp format which will be printed before all messages.
+	// Can at most be 20 characters long.
+	// Common formats:
+	//  %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
+	//  %H:%M:%S (hour:minute:second, 24 hour format)
+	//  %d/%b/%Y (day/Month/year)
+	// For full format information, consult the strftime() manual.
 	//timestamp_format: "[%d/%b %H:%M]"
 
-	//If redirected output contains escape sequences (color codes)
+	// If redirected output contains escape sequences (color codes)
 	stdout_with_ansisequence: false
 
-	//Makes server output more silent by omitting certain types of messages:
-	//1: Hide Information messages
-	//2: Hide Status messages
-	//4: Hide Notice Messages
-	//8: Hide Warning Messages
-	//16: Hide Error and SQL Error messages.
-	//32: Hide Debug Messages
-	//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
+	// Makes server output more silent by omitting certain types of messages:
+	// 1: Hide Information messages
+	// 2: Hide Status messages
+	// 4: Hide Notice Messages
+	// 8: Hide Warning Messages
+	// 16: Hide Error and SQL Error messages.
+	// 32: Hide Debug Messages
+	// Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
 	console_silent: 0
 
 	// [CHAR] Display information on the console whenever characters/guilds/parties/pets are loaded/saved?
 	save_log: true
 
 	// [MAP] Makes server log selected message types to a file in the /log/ folder
-	//1: Log Warning Messages
-	//2: Log Error and SQL Error messages.
-	//4: Log Debug Messages
-	//Example: "console_msg_log: 7" logs all 3 kinds
-	//Messages logged by this overrides console_silent setting
+	// 1: Log Warning Messages
+	// 2: Log Error and SQL Error messages.
+	// 4: Log Debug Messages
+	// Example: "console_msg_log: 7" logs all 3 kinds
+	// Messages logged by this overrides console_silent setting
 	console_msg_log: 0
 }
diff --git a/conf/global/sql_connection.conf b/conf/global/sql_connection.conf
index 3a465afea..7a8932f33 100644
--- a/conf/global/sql_connection.conf
+++ b/conf/global/sql_connection.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by