some little fixes around;

fixed docs;
bumped version to 3.4.0


git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1183 17fca916-40b9-46aa-a4ea-0a15b648b75c

51 files changed, 1086 insertions, 1052 deletions

diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp
index 9afd6b8ed..7a076edf5 100644
--- a/src/modules/about/libkviabout.cpp
+++ b/src/modules/about/libkviabout.cpp
@@ -88,13 +88,13 @@ static bool about_module_can_unload(KviModule * m)
 // =======================================
 
 KVIRC_MODULE(
-    "KVIrc about dialog",
+	"KVIrc about dialog",
 	"2.0.0",
-    "Till Bush <buti@geocities.com>\n" \
+	"Till Bush <buti@geocities.com>\n" \
 	"Szymon Stefanek <pragma at kvirc dot net>" ,
 	"Exports the /about.kvirc command\n",
-    about_module_init ,
-    about_module_can_unload,
-    0,
+	about_module_init ,
+	about_module_can_unload,
+	0,
 	about_module_cleanup
 )
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 47c75983d..1eb13f65f 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -234,7 +234,7 @@ static bool action_kvs_cmd_disable(KviKvsModuleCommandCall * c)
 		only script actions that have been defined by the user (or other scripts).
 	@seealso:
 		# this will trigger a warning and NOT work
-		action.destroy connect 
+		action.destroy connect
 */
 
 static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
@@ -436,15 +436,9 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
 		debug("action.validate has provided invalid flags: %d fixed to %d",iOldFlags,iFlags);
 
 	KviKvsUserAction * a = KviKvsUserAction::createInstance(KviActionManager::instance(),
-											szName,
-											szCmd,
-											szVisibleText,
-											szDescription,
-											szCategory,
-											szBigIconId,
-											szSmallIconId,
-											iFlags,
-											szKeySequence);
+		szName,szCmd,szVisibleText,
+		szDescription,szCategory,szBigIconId,
+		szSmallIconId,iFlags,szKeySequence);
 
 	KviActionManager::instance()->registerAction(a);
 
@@ -463,7 +457,7 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
 		<boolean> $action.exists(<name:string>)
 	@description:
 		Returns 1 if the action with the specified <name> is currently defined
-		and 0 otherwise. 
+		and 0 otherwise.
 */
 
 static bool action_kvs_fnc_exists(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 07d8f0418..ec3ac3ff7 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -70,7 +70,7 @@ static bool actioneditor_module_can_unload(KviModule * m)
 static bool actioneditor_module_cleanup(KviModule *m)
 {
 	if(g_pActionEditorWindow)delete g_pActionEditorWindow;
-    g_pActionEditorWindow = 0;
+	g_pActionEditorWindow = 0;
 	return true;
 }
 
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 118d7b80f..04157ded9 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -498,7 +498,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
 		installed files or code.
 		[/p]
 	@seealso:
-		[cmd]addon.uninstall[/cmd], [fnc]$addon.exists()[/fnc],
+		[cmd]addon.uninstall[/cmd], [fnc]$addon.exists[/fnc],
 		[cmd]addon.setconfigurecallback[/cmd], [cmd]addon.configure[/cmd],
 		[cmd]addon.sethelpcallback[/cmd], [cmd]addon.help[/cmd]
 	@examples:
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index 456de2153..6dfc7a293 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -74,7 +74,7 @@ static bool aliaseditor_module_can_unload(KviModule * m)
 static bool aliaseditor_module_cleanup(KviModule *m)
 {
 	if(g_pAliasEditorWindow)delete g_pAliasEditorWindow;
-    g_pAliasEditorWindow = 0;
+	g_pAliasEditorWindow = 0;
 	return true;
 }
 
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 30c181d76..c3c60fa83 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -70,10 +70,10 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par,const
 	
 	QString msg = "<center>";
 	msg += __tr2qs("Please select an avatar image. " \
-				"The full path to a local file or an image on the Web can be used.<br>" \
-				"If you wish to use a local image file, click the \"<b>Browse</b>\"" \
-				"button to browse local folders.<br>" \
-				"The full URL for an image (including <b>http://</b>) can be entered manually.");
+		"The full path to a local file or an image on the Web can be used.<br>" \
+		"If you wish to use a local image file, click the \"<b>Browse</b>\"" \
+		"button to browse local folders.<br>" \
+		"The full URL for an image (including <b>http://</b>) can be entered manually.");
 	msg += "</center><br>";
 
 	QLabel * l = new QLabel(msg,this);
@@ -136,7 +136,7 @@ void KviAsyncAvatarSelectionDialog::cancelClicked()
 void KviAsyncAvatarSelectionDialog::chooseFileClicked()
 {
 	QString tmp;
- 	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs("Choose an Image File - KVIrc")))
+	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs("Choose an Image File - KVIrc")))
 	{
 		m_pLineEdit->setText(tmp);
 	}
@@ -440,7 +440,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
 		is returned. The returned string is empty if the specified user has no
 		avatar set or there is no such user at all.
 	@seealso:
-		[fnc]$avatar.path[/fnc]()
+		[fnc]$avatar.path[/fnc]
 */
 
 static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c)
@@ -484,7 +484,7 @@ static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 		is returned. The returned string is empty if the specified user has no
 		avatar set or there is no such user at all.
 	@seealso:
-		[fnc]$avatar.name[/fnc]()
+		[fnc]$avatar.name[/fnc]
 */
 
 static bool avatar_kvs_fnc_path(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 08c867cba..a42833d0b 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -75,7 +75,7 @@ static KviChannel * chan_kvs_find_channel(KviKvsModuleFunctionCall * c,QString &
 */
 
 static bool chan_kvs_fnc_name(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -104,7 +104,7 @@ static bool chan_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_getUrl(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId,url;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -147,7 +147,7 @@ static bool chan_kvs_fnc_getUrl(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_isdead(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -181,7 +181,7 @@ static bool chan_kvs_fnc_isdead(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_topic(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -215,7 +215,7 @@ static bool chan_kvs_fnc_topic(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_topicsetby(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -249,7 +249,7 @@ static bool chan_kvs_fnc_topicsetby(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -280,7 +280,7 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -312,7 +312,7 @@ static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_ownercount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -344,7 +344,7 @@ static bool chan_kvs_fnc_ownercount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_admincount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -377,7 +377,7 @@ static bool chan_kvs_fnc_admincount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_opcount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -409,7 +409,7 @@ static bool chan_kvs_fnc_opcount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_voicecount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -441,7 +441,7 @@ static bool chan_kvs_fnc_voicecount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_halfopcount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -473,7 +473,7 @@ static bool chan_kvs_fnc_halfopcount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_useropcount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -505,7 +505,7 @@ static bool chan_kvs_fnc_useropcount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_bancount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -537,7 +537,7 @@ static bool chan_kvs_fnc_bancount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_banexceptioncount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -569,7 +569,7 @@ static bool chan_kvs_fnc_banexceptioncount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_invitecount(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -596,7 +596,7 @@ static bool chan_kvs_fnc_invitecount(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_ison(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId,szNick;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
@@ -633,7 +633,7 @@ static bool chan_kvs_fnc_ison(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_getflag(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId,szNick;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
@@ -933,7 +933,7 @@ IS_ME_KVS_FUNC(chan_kvs_fnc_ismeuserop,isMeUserOp)
 */
 
 static bool chan_kvs_fnc_mode(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -969,7 +969,7 @@ static bool chan_kvs_fnc_mode(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_key(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -999,7 +999,7 @@ static bool chan_kvs_fnc_key(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -1077,7 +1077,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
@@ -1192,7 +1192,7 @@ next_item:
 */
 
 static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
@@ -1235,7 +1235,7 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
@@ -1278,7 +1278,7 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
@@ -1323,7 +1323,7 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
@@ -1372,7 +1372,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
@@ -1421,7 +1421,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
@@ -1478,7 +1478,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 */
 
 static bool chan_kvs_fnc_usermodelevel(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szNick,szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
@@ -1510,11 +1510,11 @@ static bool chan_kvs_fnc_usermodelevel(KviKvsModuleFunctionCall * c)
 		for all the users that were on the channel before the local user has joined it (e.g.
 		you know the join time only for users that YOU see joining).[br]
 	@seealso:
-		[fnc]$unixtime[/fnc], [fnc]$chan.userLastActionTime[/fnc]()
+		[fnc]$unixTime[/fnc], [fnc]$chan.userLastActionTime[/fnc]
 */
 
 static bool chan_kvs_fnc_userjointime(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szNick,szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
@@ -1547,11 +1547,11 @@ static bool chan_kvs_fnc_userjointime(KviKvsModuleFunctionCall * c)
 		for all the users that were on the channel before the local user has joined it
 		and have performed no actions since that moment.
 	@seealso:
-		[fnc]$unixtime[/fnc](), [fnc]$chan.userJoinTime[/fnc]()
+		[fnc]$unixTime[/fnc], [fnc]$chan.userJoinTime[/fnc]
 */
 
 static bool chan_kvs_fnc_userlastactiontime(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szNick,szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
@@ -1567,7 +1567,6 @@ static bool chan_kvs_fnc_userlastactiontime(KviKvsModuleFunctionCall * c)
 
 static bool chan_module_init(KviModule * m)
 {
-
 	KVSM_REGISTER_FUNCTION(m,"name",chan_kvs_fnc_name);
 	KVSM_REGISTER_FUNCTION(m,"topic",chan_kvs_fnc_topic);
 	KVSM_REGISTER_FUNCTION(m,"topicsetby",chan_kvs_fnc_topicsetby);
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index 64a8a0683..e89c44afa 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -52,7 +52,7 @@ QRect                   g_rectChannelsJoinGeometry;
 */
 
 static bool channelsjoin_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_pChannelsWindow)g_pChannelsWindow = new KviChannelsJoinWindow(c->window()->frame(),"channelsjoin");
 
 	g_pChannelsWindow->setConsole(c->window()->console());
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index 0c4dad576..e82ffa311 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -47,7 +47,7 @@ KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList = 0;
 */
 
 static bool codetester_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviCodeTesterWindow * w = new KviCodeTesterWindow(c->window()->frame());
 	c->window()->frame()->addWindow(w);
 	w->setFocus();
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index ef1c5b4b6..d14137336 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -81,7 +81,7 @@ static int g_iNextConfigId = 0;
 
 
 static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szFile; 
 	QString szMode;
 	
@@ -149,8 +149,8 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_id(KviKvsModuleFunctionCall * c)
-{ 
-	QString szFile; 
+{
+	QString szFile;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("file",KVS_PT_STRING,0,szFile)
@@ -200,8 +200,8 @@ static bool config_kvs_fnc_id(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_read(KviKvsModuleFunctionCall * c)
-{ 
-	QString szId; 
+{
+	QString szId;
 	QString szKey;
 	QString szDefault;
 	
@@ -240,8 +240,8 @@ static bool config_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_section(KviKvsModuleFunctionCall * c)
-{ 
-	QString szId; 
+{
+	QString szId;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
@@ -278,8 +278,8 @@ static bool config_kvs_fnc_section(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_readonly(KviKvsModuleFunctionCall * c)
-{ 
-	QString szId; 
+{
+	QString szId;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
@@ -316,8 +316,8 @@ static bool config_kvs_fnc_readonly(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_filename(KviKvsModuleFunctionCall * c)
-{ 
-	QString szId; 
+{
+	QString szId;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
@@ -351,7 +351,7 @@ static bool config_kvs_fnc_filename(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_hassection(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szId;
 	QString szSect;
 	
@@ -389,8 +389,8 @@ static bool config_kvs_fnc_hassection(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_sectionlist(KviKvsModuleFunctionCall * c)
-{ 
-	QString szId; 
+{
+	QString szId;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
@@ -433,8 +433,8 @@ static bool config_kvs_fnc_sectionlist(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_keylist(KviKvsModuleFunctionCall * c)
-{ 
-	QString szId; 
+{
+	QString szId;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
@@ -481,8 +481,7 @@ static bool config_kvs_fnc_keylist(KviKvsModuleFunctionCall * c)
 */
 
 static bool config_kvs_fnc_filelist(KviKvsModuleFunctionCall * c)
-{ 
-	
+{
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETERS_END(c)
 	
@@ -810,16 +809,16 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c)
 		You write entries by using [cmd]config.write[/cmd] and read them by using [fnc]$config.read[/fnc]().[br]
 		You can change the "current" config section by using [cmd]config.setsection[/cmd].[br]
 		Here comes a complete list of commands and functions exported by this module:[br]
-		[fnc]$config.open[/fnc]()[br]
-		[fnc]$config.read[/fnc]()[br]
-		[fnc]$config.section[/fnc]()[br]
-		[fnc]$config.hassection[/fnc]()[br]
-		[fnc]$config.sectionlist[/fnc]()[br]
-		[fnc]$config.keylist[/fnc]()[br]
-		[fnc]$config.filelist[/fnc]()[br]
-		[fnc]$config.filename[/fnc]()[br]
-		[fnc]$config.id[/fnc]()[br]
-		[fnc]$config.readonly[/fnc]()[br]
+		[fnc]$config.open[/fnc][br]
+		[fnc]$config.read[/fnc][br]
+		[fnc]$config.section[/fnc][br]
+		[fnc]$config.hassection[/fnc][br]
+		[fnc]$config.sectionlist[/fnc][br]
+		[fnc]$config.keylist[/fnc][br]
+		[fnc]$config.filelist[/fnc][br]
+		[fnc]$config.filename[/fnc][br]
+		[fnc]$config.id[/fnc][br]
+		[fnc]$config.readonly[/fnc][br]
 		[cmd]config.close[/cmd][br]
 		[cmd]config.flush[/cmd][br]
 		[cmd]config.clear[/cmd][br]
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index c97c7cebe..889a9593b 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -90,7 +90,7 @@
 		returns nothing. If the specified IRC context is not currently connected
 		then this function returns nothing.
 	@seealso:
-		$context.serverHostName
+		[fnc]$context.serverHostName[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -122,7 +122,9 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		Please note that this is different from $my.server() which might
 		return an invalid DNS entry.
 	@seealso:
-		$context.serverPort, $context.serverIpAddress, $context.serverPassword
+		[fnc]$context.serverPort[/fnc],
+		[fnc]$context.serverIpAddress[/fnc],
+		[fnc]$context.serverPassword[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -148,7 +150,9 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		returns nothing. If the specified IRC context is not currently connected
 		then this function returns nothing.
 	@seealso:
-		$context.serverPort, $context.serverHostName, $context.serverPassword
+		[fnc]$context.serverPort[/fnc],
+		[fnc]$context.serverHostName[/fnc],
+		[fnc]$context.serverPassword[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -175,7 +179,9 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		is not currently connected then this function returns nothing (that
 		evaluates to false).
 	@seealso:
-		$context.serverPort, $context.serverHostName, $context.serverPassword
+		[fnc]$context.serverPort[/fnc],
+		[fnc]$context.serverHostName[/fnc],
+		[fnc]$context.serverPassword[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -202,7 +208,9 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		is not currently connected then this function returns nothing (that
 		evaluates to false).
 	@seealso:
-		$context.serverPort, $context.serverHostName, $context.serverPassword
+		[fnc]$context.serverPort[/fnc],
+		[fnc]$context.serverHostName[/fnc],
+		[fnc]$context.serverPassword[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -228,7 +236,9 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		returns nothing. If the specified IRC context is not currently connected
 		then this function returns nothing.
 	@seealso:
-		$context.serverHostName, $context.serverIpAddress, $context.serverPort
+		[fnc]$context.serverHostName[/fnc],
+		[fnc]$context.serverIpAddress[/fnc],
+		[fnc]$context.serverPort[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -255,7 +265,8 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		returns nothing. If the specified IRC context is not currently connected
 		then this function returns nothing.
 	@seealso:
-		$context.serverHostName, $context.serverIpAddress
+		[fnc]$context.serverHostName[/fnc],
+		[fnc]$context.serverIpAddress[/fnc]
 */
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
@@ -282,7 +293,8 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		If the irc_context_id specification is not valid then this function
 		returns nothing.
 	@seealso:
-		$context.serverHostName, $context.serverIpAddress
+		[fnc]$context.serverHostName[/fnc],
+		[fnc]$context.serverIpAddress[/fnc]
 */
 
 static bool context_kvs_fnc_state(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index e5bebbb26..a3d2ecec8 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -1663,6 +1663,7 @@ static bool dcc_kvs_cmd_setBandwidthLimit(KviKvsModuleCommandCall * c)
 	}
 	return true;
 }
+
 /*
 	@doc: dcc.protocol
 	@type:
@@ -1913,7 +1914,6 @@ static bool dcc_kvs_fnc_localUser(KviKvsModuleFunctionCall * c)
 	return true;
 }
 
-
 /*
 	@doc: dcc.localHost
 	@type:
@@ -2087,7 +2087,6 @@ static bool dcc_kvs_fnc_localFileSize(KviKvsModuleFunctionCall * c)
 }
 
 
-
 /*
 	@doc: dcc.remoteNick
 	@type:
@@ -2569,8 +2568,6 @@ static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c)
 }
 
 
-
-
 /*
 	@doc: dcc.sessionList
 	@type:
@@ -2637,7 +2634,6 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 }
 
 
-
 /*
 	@doc: dcc
 	@type:
@@ -2670,29 +2666,29 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 		and functions exported by this module and by passing the above session
 		id as parameter.[br]
 		The session related commands and functions are the following:[br]
-		[fnc]$dcc.sessionList[/fnc]()[br]
-		[fnc]$dcc.protocol[/fnc]()[br]
-		[fnc]$dcc.connectionType[/fnc]()[br]
-		[fnc]$dcc.transferStatus[/fnc]()[br]
-		[fnc]$dcc.isFileTransfer[/fnc]()[br]
-		[fnc]$dcc.isFileUpload[/fnc]()[br]
-		[fnc]$dcc.isFileDownload[/fnc]()[br]
-		[fnc]$dcc.localNick[/fnc]()[br]
-		[fnc]$dcc.localUser[/fnc]()[br]
-		[fnc]$dcc.localHost[/fnc]()[br]
-		[fnc]$dcc.localIp[/fnc]()[br]
-		[fnc]$dcc.localPort[/fnc]()[br]
-		[fnc]$dcc.localFileName[/fnc]()[br]
-		[fnc]$dcc.localFileSize[/fnc]()[br]
-		[fnc]$dcc.remoteNick[/fnc]()[br]
-		[fnc]$dcc.remoteUser[/fnc]()[br]
-		[fnc]$dcc.remoteHost[/fnc]()[br]
-		[fnc]$dcc.remoteIp[/fnc]()[br]
-		[fnc]$dcc.remotePort[/fnc]()[br]
-		[fnc]$dcc.remoteFileName[/fnc]()[br]
-		[fnc]$dcc.remoteFileSize[/fnc]()[br]
-		[fnc]$dcc.ircContext[/fnc]()[br]
-		[fnc]$dcc.session[/fnc]()[br]
+		[fnc]$dcc.sessionList[/fnc][br]
+		[fnc]$dcc.protocol[/fnc][br]
+		[fnc]$dcc.connectionType[/fnc][br]
+		[fnc]$dcc.transferStatus[/fnc][br]
+		[fnc]$dcc.isFileTransfer[/fnc][br]
+		[fnc]$dcc.isFileUpload[/fnc][br]
+		[fnc]$dcc.isFileDownload[/fnc][br]
+		[fnc]$dcc.localNick[/fnc][br]
+		[fnc]$dcc.localUser[/fnc][br]
+		[fnc]$dcc.localHost[/fnc][br]
+		[fnc]$dcc.localIp[/fnc][br]
+		[fnc]$dcc.localPort[/fnc][br]
+		[fnc]$dcc.localFileName[/fnc][br]
+		[fnc]$dcc.localFileSize[/fnc][br]
+		[fnc]$dcc.remoteNick[/fnc][br]
+		[fnc]$dcc.remoteUser[/fnc][br]
+		[fnc]$dcc.remoteHost[/fnc][br]
+		[fnc]$dcc.remoteIp[/fnc][br]
+		[fnc]$dcc.remotePort[/fnc][br]
+		[fnc]$dcc.remoteFileName[/fnc][br]
+		[fnc]$dcc.remoteFileSize[/fnc][br]
+		[fnc]$dcc.ircContext[/fnc][br]
+		[fnc]$dcc.session[/fnc][br]
 */
 
 
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 6fbb81912..426580d8f 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -54,23 +54,23 @@
 static KviPointerList<QWidget> * g_pDialogModuleDialogList;
 
 KviKvsCallbackMessageBox::KviKvsCallbackMessageBox(
-		const QString &szCaption,
-		const QString &szText,
-		const QString &szIcon,
-		const QString &szButton0,
-		const QString &szButton1,
-		const QString &szButton2,
-		const QString &szCode,
-		KviKvsVariantList * pMagicParams,
-		KviWindow * pWindow,bool modal)
-	: QMessageBox(
-		szCaption,
-		szText,
-		QMessageBox::NoIcon,
-		szButton0.isEmpty() ? QMessageBox::NoButton : QMessageBox::Ok | QMessageBox::Default,
-		szButton1.isEmpty() ? QMessageBox::NoButton : (szButton2.isEmpty() ? QMessageBox::No | QMessageBox::Escape : QMessageBox::No),
-		szButton2.isEmpty() ? QMessageBox::NoButton : QMessageBox::Cancel | QMessageBox::Escape,
-		0,0,modal) ,
+	const QString &szCaption,
+	const QString &szText,
+	const QString &szIcon,
+	const QString &szButton0,
+	const QString &szButton1,
+	const QString &szButton2,
+	const QString &szCode,
+	KviKvsVariantList * pMagicParams,
+	KviWindow * pWindow,bool modal)
+: QMessageBox(
+	szCaption,
+	szText,
+	QMessageBox::NoIcon,
+	szButton0.isEmpty() ? QMessageBox::NoButton : QMessageBox::Ok | QMessageBox::Default,
+	szButton1.isEmpty() ? QMessageBox::NoButton : (szButton2.isEmpty() ? QMessageBox::No | QMessageBox::Escape : QMessageBox::No),
+	szButton2.isEmpty() ? QMessageBox::NoButton : QMessageBox::Cancel | QMessageBox::Escape,
+	0,0,modal) ,
 	KviKvsCallbackObject("dialog.message",pWindow,szCode,pMagicParams,0)
 {
 	g_pDialogModuleDialogList->append(this);
@@ -734,7 +734,7 @@ static bool dialog_kvs_cmd_image(KviKvsModuleCallbackCommandCall * c)
 		KVSM_PARAMETER("maxsize",KVS_PT_UINT,KVS_PF_OPTIONAL,iMaxSize)
 		KVSM_PARAMETER("magic",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL,params)
 	KVSM_PARAMETERS_END(c)
-bool modal;
+	bool modal;
 	if(c->hasSwitch('b',"modal")) modal=true;
 	else modal=false;
 	QString szCmd = c->callback()->code();
@@ -773,7 +773,7 @@ bool modal;
 */
 
 static bool dialog_kvs_fnc_yesno(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szCaption;
 	QString szText;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -888,7 +888,7 @@ static bool dialog_module_init(KviModule * m)
 
 	KVSM_REGISTER_FUNCTION(m,"yesno",dialog_kvs_fnc_yesno);
 
-    return true;
+	return true;
 }
 
 static bool dialog_module_cleanup(KviModule *m)
@@ -896,7 +896,7 @@ static bool dialog_module_cleanup(KviModule *m)
 	// Here we get a tragedy if g_iLocalEventLoops > 0!
 	while(g_pDialogModuleDialogList->first())delete g_pDialogModuleDialogList->first();
 	delete g_pDialogModuleDialogList;
-    g_pDialogModuleDialogList = 0;
+	g_pDialogModuleDialogList = 0;
 	return true;
 }
 
@@ -907,13 +907,13 @@ static bool dialog_module_can_unload(KviModule *m)
 
 
 KVIRC_MODULE(
-    "KVIrc script dialogs",
+	"KVIrc script dialogs",
 	"1.0.0",
 	"Szymon Stefanek <pragma at kvirc dot net>" ,
 	"Adds the /dialog.* commands functionality\n",
-    dialog_module_init ,
-    dialog_module_can_unload,
-    0,
+	dialog_module_init ,
+	dialog_module_can_unload,
+	0,
 	dialog_module_cleanup
 )
 
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 9283907c2..798718709 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -321,7 +321,7 @@ void KviDockWidget::enterEvent( QEvent* )
 		qt_x_time = 1;
 		g_pApp->x11ProcessEvent( &ev );
 		qt_x_time = time;
-    }
+	}
 #endif
 }
 
@@ -503,7 +503,7 @@ void KviDockWidget::refresh()
 	bitBlt(g_pCurrentPixmap,0,8,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,Qt::ClearROP);
 	bitBlt(g_pCurrentPixmap,8,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,Qt::ClearROP);
 	bitBlt(g_pCurrentPixmap,8,8,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,Qt::ClearROP);
-#endif	
+#endif
 	
 	if( (m_iChannels == 2) || (m_iQueries == 2) ) 
 	{
@@ -682,11 +682,11 @@ static KviDockWidget * dockwidget_find(KviFrame *f)
 		The dock widget is currently working in KDE compilation mode only:
 		it relies on the KWin implementation of the Window Manager interaction protocol.
 	@seealso:
-		[cmd]dockwidget.hide[/doc]
+		[cmd]dockwidget.hide[/cmd]
 */
 
 static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!(dockwidget_find(c->window()->frame())))
 	{
 		KviDockWidget * w = new KviDockWidget(c->window()->frame(),"dock_widget");
@@ -712,11 +712,11 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
 	@description:
 		Hides the dock widget for the current frame window
 	@seealso:
-		[cmd]dockwidget.show[/doc]
+		[cmd]dockwidget.show[/cmd]
 */
 
 static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
 	// show the parent frame.. otherwise there will be no way to get it back
@@ -740,11 +740,11 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 	@description:
 		Hides the window, assotiated with dockwidget
 	@seealso:
-		[cmd]dockwidget.show[/cmd] [cmd]dockwidget.hide[/cmd]
+		[cmd]dockwidget.show[/cmd], [cmd]dockwidget.hide[/cmd]
 */
 
 static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)
 	{
@@ -757,7 +757,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 }
 
 /*
-	@doc: dockwidget.isvisible
+	@doc: dockwidget.isVisible
 	@type:
 		function
 	@title:
@@ -773,7 +773,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 */
 
 static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c)
-{ 
+{
 	c->returnValue()->setBoolean(dockwidget_find(c->window()->frame()));
 	return true;
 }
@@ -818,18 +818,18 @@ static bool dockwidget_module_cleanup(KviModule *m)
 {
 	while(g_pDockWidgetList->first())delete g_pDockWidgetList->first();
 	delete g_pDockWidgetList;
-    g_pDockWidgetList = 0;
+	g_pDockWidgetList = 0;
 
 #ifdef COMPILE_ON_WINDOWS
 	DestroyIcon(g_pCurrentIcon);
 #endif
 
 	delete g_pDock1;
-    g_pDock1 = 0;
+	g_pDock1 = 0;
 	delete g_pDock2;
-    g_pDock2 = 0;
+	g_pDock2 = 0;
 	delete g_pDock3;
-    g_pDock3 = 0;
+	g_pDock3 = 0;
 
 	return true;
 }
@@ -843,12 +843,12 @@ static bool dockwidget_module_can_unload(KviModule *)
 // plugin definition structure
 // =======================================
 KVIRC_MODULE(
-    "KVIrc dock widget implementation",
+	"KVIrc dock widget implementation",
 	"1.0.0",
 	"Szymon Stefanek <pragma at kvirc dot net>" ,
 	"exports the /dockwidget.* interface\n",
-    dockwidget_module_init ,
-    dockwidget_module_can_unload,
+	dockwidget_module_init ,
+	dockwidget_module_can_unload,
 	0,
 	dockwidget_module_cleanup
 )
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index 997c8c8a1..c017ecd9e 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -129,6 +129,7 @@ void KviDockWidget::die()
 {
 	delete this;
 }
+
 void KviDockWidget::flashingTimerShot()
 {
 	m_bFlashed=!m_bFlashed;
@@ -516,11 +517,11 @@ static KviDockWidget * dockwidget_find(KviFrame *f)
 		The dock widget is currently working in KDE compilation mode only:
 		it relies on the KWin implementation of the Window Manager interaction protocol.
 	@seealso:
-		[cmd]dockwidget.hide[/doc]
+		[cmd]dockwidget.hide[/cmd]
 */
 
 static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!(dockwidget_find(c->window()->frame())))
 	{
 		KviDockWidget * w = new KviDockWidget(c->window()->frame());
@@ -542,11 +543,11 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
 	@description:
 		Hides the dock widget for the current frame window
 	@seealso:
-		[cmd]dockwidget.show[/doc]
+		[cmd]dockwidget.show[/cmd]
 */
 
 static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
 	// show the parent frame.. otherwise there will be no way to get it back
@@ -570,11 +571,11 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 	@description:
 		Hides the window, assotiated with dockwidget
 	@seealso:
-		[cmd]dockwidget.show[/cmd] [cmd]dockwidget.hide[/cmd]
+		[cmd]dockwidget.show[/cmd], [cmd]dockwidget.hide[/cmd]
 */
 
 static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)
 	{
@@ -584,7 +585,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 }
 
 /*
-	@doc: dockwidget.isvisible
+	@doc: dockwidget.isVisible
 	@type:
 		function
 	@title:
@@ -600,7 +601,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 */
 
 static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c)
-{ 
+{
 	c->returnValue()->setBoolean(dockwidget_find(c->window()->frame()));
 	return true;
 }
@@ -631,7 +632,7 @@ static bool dockwidget_module_init(KviModule * m)
 	g_pApp->findImage(buffer,"kvi_dock_win32-2.png");
 #else
 	g_pApp->findImage(buffer,"kvi_dock_part-2.png");
-#endif	
+#endif
 	
 	g_pDock3 = new QPixmap(buffer);
 
@@ -652,7 +653,7 @@ static bool dockwidget_module_cleanup(KviModule *m)
 {
 	while(g_pDockWidgetList->first())delete g_pDockWidgetList->first();
 	delete g_pDockWidgetList;
-    g_pDockWidgetList = 0;
+	g_pDockWidgetList = 0;
 
 	delete g_pDock1;
 	g_pDock1 = 0;
@@ -675,12 +676,12 @@ static bool dockwidget_module_can_unload(KviModule *)
 // plugin definition structure
 // =======================================
 KVIRC_MODULE(
-    "KVIrc dock widget implementation",
+	"KVIrc dock widget implementation",
 	"2.0.0",
 	"Szymon Stefanek <pragma at kvirc dot net> and Alexey Uzhva <alexey at kvirc dot ru>" ,
 	"exports the /dockwidget.* interface\n",
-    dockwidget_module_init ,
-    dockwidget_module_can_unload,
+	dockwidget_module_init ,
+	dockwidget_module_can_unload,
 	0,
 	dockwidget_module_cleanup
 )
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index d4b5d0c4d..9113c791f 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -44,7 +44,7 @@ KviEventEditorWindow * g_pEventEditorWindow = 0;
 */
 
 static bool eventeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_pEventEditorWindow)
 	{
 		g_pEventEditorWindow = new KviEventEditorWindow(c->window()->frame());
@@ -55,8 +55,6 @@ static bool eventeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	return true;
 }
 
-
-
 static bool eventeditor_module_init(KviModule * m)
 {
 
@@ -74,7 +72,7 @@ static bool eventeditor_module_can_unload(KviModule * m)
 static bool eventeditor_module_cleanup(KviModule *m)
 {
 	if(g_pEventEditorWindow)delete g_pEventEditorWindow;
-    g_pEventEditorWindow = 0;
+	g_pEventEditorWindow = 0;
 	return true;
 }
 
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index d6d976876..001ba9f82 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -61,7 +61,7 @@
 		is running on so you don't have to bother about portability: it *should* be automatically
 		guaranteed. Just use UNIX style paths for them.[br]
 	@seealso:
-		[cmd]file.rename[/cmd], [fnc]$file.exists[/fnc]()
+		[cmd]file.rename[/cmd], [fnc]$file.exists[/fnc]
 */
 
 static bool file_kvs_cmd_copy(KviKvsModuleCommandCall * c)
@@ -181,7 +181,7 @@ static bool file_kvs_cmd_delimagepath(KviKvsModuleCommandCall * c)
 		The file is saved in utf8 unless the -l switch is specified (in that case the local 8 bit encoding is used).
 		Please note that uf8 is the only character set that preserves ALL the possible characters.
 	@seealso:
-		[cmd]file.rename[/cmd], [fnc]$file.exists[/fnc]()
+		[cmd]file.rename[/cmd], [fnc]$file.exists[/fnc]
 */
 
 static bool file_kvs_cmd_write(KviKvsModuleCommandCall * c)
@@ -226,7 +226,7 @@ static bool file_kvs_cmd_write(KviKvsModuleCommandCall * c)
 		is running on so you don't have to bother about portability: it *should* be automatically
 		guaranteed.Just use UNIX style paths for them.[br]
 	@seealso:
-		[cmd]file.copy[/cmd], [fnc]$file.exists[/fnc]()
+		[cmd]file.copy[/cmd], [fnc]$file.exists[/fnc]
 */
 
 static bool file_kvs_cmd_rename(KviKvsModuleCommandCall * c)
@@ -267,7 +267,7 @@ static bool file_kvs_cmd_rename(KviKvsModuleCommandCall * c)
 		is running on so you don't have to bother about portability: it *should* be automatically
 		guaranteed. Just use an UNIX style path.[br]
 	@seealso:
-		[fnc]$file.exists[/fnc]()
+		[fnc]$file.exists[/fnc]
 */
 
 static bool file_kvs_cmd_mkdir(KviKvsModuleCommandCall * c)
@@ -306,7 +306,7 @@ static bool file_kvs_cmd_mkdir(KviKvsModuleCommandCall * c)
 		is running on so you don't have to bother about portability: it *should* be automatically
 		guaranteed. Just use an UNIX style path.[br]
 	@seealso:
-		[fnc]$file.exists[/fnc]()
+		[fnc]$file.exists[/fnc]
 */
 
 static bool file_kvs_cmd_remove(KviKvsModuleCommandCall * c)
@@ -348,7 +348,7 @@ static bool file_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		is running on so you don't have to bother about portability: it *should* be automatically
 		guaranteed. Just use an UNIX style path.[br]
 	@seealso:
-		[fnc]$file.exists[/fnc]()
+		[fnc]$file.exists[/fnc]
 		[cmd]file.remove[/cmd]
 */
 
@@ -799,7 +799,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 			echo $file.readLines(/proc/cpuinfo)
 		[/example]
 	@seealso:
-		[fnc]$file.read[/fnc](), [cmd]file.writeLines[/fnc], [fnc]$lf[/fnc]
+		[fnc]$file.read[/fnc], [cmd]file.writeLines[/cmd], [fnc]$lf[/fnc]
 */
 
 
@@ -1160,7 +1160,7 @@ static bool file_kvs_fnc_globaldir(KviKvsModuleFunctionCall * c)
 		For example, if <filepath> is /usr/arch/mp3/Carisma_SuonoDelSilenzio.mp3 then
 		this function will return /usr/arch/mp3 on UNIX and C:\usr\arch\mp3 on Windows.
 	@seealso:
-		[fnc]$file.extractfilename[/fnc]
+		[fnc]$file.extractFileName[/fnc]
 */
 
 static bool file_kvs_fnc_extractpath(KviKvsModuleFunctionCall * c)
@@ -1190,7 +1190,7 @@ static bool file_kvs_fnc_extractpath(KviKvsModuleFunctionCall * c)
 		For example, if <filepath> is /usr/arch/mp3/Carisma_SuonoDelSilenzio.mp3 then
 		this function will return Carisma_SuonoDelSilenzio.mp3
 	@seealso:
-		[fnc]$file.extractpath[/fnc]
+		[fnc]$file.extractPath[/fnc]
 */
 
 static bool file_kvs_fnc_extractfilename(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 916375372..33cd2e107 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -121,9 +121,9 @@ static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 static bool filetransferwindow_module_init(KviModule * m)
 {
 	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-							KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME,
-							__tr2qs("Manage File &Transfers"),
-							filetransferwindow_extension_alloc);
+		KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME,
+		__tr2qs("Manage File &Transfers"),
+		filetransferwindow_extension_alloc);
 
 	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FILETRANSFER)));
 
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 5bf4737c7..ccbcbadf2 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -213,10 +213,10 @@ static bool help_module_cleanup(KviModule *m)
 	if(g_pDocIndex) delete g_pDocIndex;
 	while(g_pHelpWidgetList->first())delete g_pHelpWidgetList->first();
 	delete g_pHelpWidgetList;
-    g_pHelpWidgetList = 0;
+	g_pHelpWidgetList = 0;
 	while(g_pHelpWindowList->first())g_pHelpWindowList->first()->close();
 	delete g_pHelpWindowList;
-    g_pHelpWindowList = 0;
+	g_pHelpWindowList = 0;
 	return true;
 }
 
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index fbe5c978d..551395a24 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -549,7 +549,7 @@ exit_thread:
 */
 
 static bool ident_kvs_cmd_start(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_iIdentDaemonRunningUsers)
 		startIdentService();
 	g_iIdentDaemonRunningUsers++;
@@ -573,7 +573,7 @@ static bool ident_kvs_cmd_start(KviKvsModuleCommandCall * c)
 */
 
 static bool ident_kvs_cmd_stop(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(g_iIdentDaemonRunningUsers) g_iIdentDaemonRunningUsers--;
 	if(!g_iIdentDaemonRunningUsers) stopIdentService();
 	return true;
@@ -591,7 +591,7 @@ static bool ident_module_cleanup(KviModule *m)
 {
 	stopIdentService();
 	delete g_pIdentSentinel;
-    g_pIdentSentinel = 0;
+	g_pIdentSentinel = 0;
 
 	return true;
 }
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 66512534c..718df2360 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -232,7 +232,7 @@ static bool lamerizer_module_init(KviModule * m)
 	d->deallocFunc = deallocLamerizerEngine;
 	m->registerCryptEngine(d);
 
-    return true;
+	return true;
 #else
 	return false;
 #endif
@@ -243,7 +243,7 @@ static bool lamerizer_module_cleanup(KviModule *m)
 #ifdef COMPILE_CRYPT_SUPPORT
 	while(g_pEngineList->first())delete g_pEngineList->first();
 	delete g_pEngineList;
-    g_pEngineList = 0;
+	g_pEngineList = 0;
 	m->unregisterCryptEngines();
 	return true;
 #else
@@ -264,13 +264,13 @@ static bool lamerizer_module_can_unload(KviModule *)
 // plugin definition structure
 // =======================================
 KVIRC_MODULE(
-    "Lamerizer crypt engine",
+	"Lamerizer crypt engine",
 	"1.0.1",
 	"Szymon Stefanek <pragma at kvirc dot net> \n Jan Wagner <istari@kvirc.net>" ,
 	"Exports the lamerizer text transformation engine",
-    lamerizer_module_init ,
-    lamerizer_module_can_unload,
-    0,
+	lamerizer_module_init ,
+	lamerizer_module_can_unload,
+	0,
 	lamerizer_module_cleanup
 )
 
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index baf6ba69f..28c54b04c 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -61,7 +61,7 @@ KviPointerList<KviLinksWindow> * g_pLinksWindowList = 0;
 
 
 static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	
 	// FIND ME
 	if(!c->window()->console())return c->context()->errorNoIrcContext();
@@ -95,7 +95,7 @@ static bool links_module_cleanup(KviModule *m)
 {
 	while(g_pLinksWindowList->first())g_pLinksWindowList->first()->die();
 	delete g_pLinksWindowList;
-    g_pLinksWindowList = 0;
+	g_pLinksWindowList = 0;
 	return true;
 }
 
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index 161c714cc..b5761479b 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -51,7 +51,7 @@ KviPointerList<KviListWindow> * g_pListWindowList = 0;
 */
 
 static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 
 	if(!c->window()->console())return c->context()->errorNoIrcContext();
 
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index f08045131..0bbf11111 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -258,7 +258,7 @@ static bool log_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 */
 
 static bool log_kvs_fnc_file(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szWindow; 
 	QString buffer;
 	KVSM_PARAMETERS_BEGIN(c)
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index 83e54ddac..7f81da977 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -144,13 +144,13 @@ static bool logview_module_init(KviModule * m)
 static bool logview_module_cleanup(KviModule * m)
 {
 	if(g_pLogViewWindow)delete g_pLogViewWindow;
-    g_pLogViewWindow = 0;
+	g_pLogViewWindow = 0;
 	return true;
 }
 
 static bool logview_module_can_unload(KviModule *m)
 {
-    return (!g_pLogViewWindow);
+	return (!g_pLogViewWindow);
 }
 
 
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index 6b53c5741..23d9876d7 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -76,7 +76,7 @@ static bool mask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	*/
 
 static bool mask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
-{ 
+{
 
 	QString mask;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -102,7 +102,7 @@ static bool mask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
 	*/
 
 static bool mask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
-{ 
+{
 
 	QString mask;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -129,7 +129,7 @@ static bool mask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 	*/
 
 static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString mask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
@@ -156,7 +156,7 @@ static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 
 
 static bool mask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString mask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
@@ -181,7 +181,7 @@ static bool mask_module_init(KviModule * m)
 	KVSM_REGISTER_FUNCTION(m,"host",mask_kvs_fnc_host);
 	KVSM_REGISTER_FUNCTION(m,"hasnumerichost",mask_kvs_fnc_hasnumerichost);
 
-  return true;
+	return true;
 }
 
 static bool mask_module_cleanup(KviModule *m)
diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index af7152c96..62b7cda75 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -31,12 +31,12 @@
 // Workaround for lost isnan and isinf definitions after
 // inclusion of iostream.h on some MacOS X systems
 #ifdef Q_OS_MACX
-  #ifndef isnan
-    extern "C" int isnan (double);
-  #endif
-  #ifndef isinf
-    extern "C" int isinf (double);
-  #endif
+	#ifndef isnan
+		extern "C" int isnan (double);
+	#endif
+	#ifndef isinf
+		extern "C" int isinf (double);
+	#endif
 #endif
 
 #define MATH_KVS_1PARAM_FUNCTION(__fncname,__paramname,__mathcallname) \
@@ -54,40 +54,31 @@ static bool __fncname(KviKvsModuleFunctionCall * c) \
 // dobbiamo testare meglio, i risultati.
 static double cbrt(double x)
 {
-    if (x > 0.0)
-	return pow(x, 1.0/3.0);
-    else
-	return -pow(-x, 1.0/3.0);
+	if (x > 0.0) return pow(x, 1.0/3.0);
+	else return -pow(-x, 1.0/3.0);
 }
+
 static int isinf (double d) {
-    int expon = 0;
-    double val = frexp (d, &expon);
-    if (expon == 1025) {
-        if (val == 0.5) {
-            return 1;
-        } else if (val == -0.5) {
-            return -1;
-        } else {
-            return 0;
-        }
-    } else {
-        return 0;
-    }
+	int expon = 0;
+	double val = frexp (d, &expon);
+	if (expon == 1025) {
+		if (val == 0.5) return 1;
+		else if (val == -0.5) return -1;
+		else return 0;
+	} else {
+		return 0;
+	}
 }
 static int isnan (double d) {
-    int expon = 0;
-    double val = frexp (d, &expon);
-    if (expon == 1025) {
-        if (val == 0.5) {
-            return 0;
-        } else if (val == -0.5) {
-            return 0;
-        } else {
-            return 1;
-        }
-    } else {
-        return 0;
-    }
+	int expon = 0;
+	double val = frexp (d, &expon);
+	if (expon == 1025) {
+		if (val == 0.5) return 0;
+		else if (val == -0.5) return 0;
+		else return 1;
+	} else {
+		return 0;
+	}
 }
 #endif
 /*
@@ -442,7 +433,6 @@ static bool math_kvs_fnc_e(KviKvsModuleFunctionCall * c)
 #endif
 static bool math_module_init(KviModule * m)
 {
-
 	KVSM_REGISTER_FUNCTION(m,"sin",math_kvs_fnc_sin);
 	KVSM_REGISTER_FUNCTION(m,"cos",math_kvs_fnc_cos);
 	KVSM_REGISTER_FUNCTION(m,"tan",math_kvs_fnc_tan);
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 0ed46a805..ed639c0fb 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -184,8 +184,12 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.stop[/cmd],
+		[cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(play,play)
@@ -206,7 +210,9 @@ MP_KVS_SIMPLE_COMMAND(play,play)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.quit[/cmd],[cmd]mediaplayer.show[/cmd],[cmd]mediaplayer.minimize[/cmd]
+		[cmd]mediaplayer.quit[/cmd],
+		[cmd]mediaplayer.show[/cmd],
+		[cmd]mediaplayer.minimize[/cmd]
 */
 
 MP_KVS_SIMPLE_COMMAND(hide,hide)
@@ -229,7 +235,9 @@ MP_KVS_SIMPLE_COMMAND(hide,hide)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.quit[/cmd],[cmd]mediaplayer.hide[/cmd],[cmd]mediaplayer.minimize[/cmd]
+		[cmd]mediaplayer.quit[/cmd],
+		[cmd]mediaplayer.hide[/cmd],
+		[cmd]mediaplayer.minimize[/cmd]
 */
 
 MP_KVS_SIMPLE_COMMAND(show,show)
@@ -250,7 +258,9 @@ MP_KVS_SIMPLE_COMMAND(show,show)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.quit[/cmd],[cmd]mediaplayer.hide[/cmd],[cmd]mediaplayer.show[/cmd]
+		[cmd]mediaplayer.quit[/cmd],
+		[cmd]mediaplayer.hide[/cmd],
+		[cmd]mediaplayer.show[/cmd]
 */
 
 MP_KVS_SIMPLE_COMMAND(minimize,minimize)
@@ -271,8 +281,12 @@ MP_KVS_SIMPLE_COMMAND(minimize,minimize)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.play[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.play[/cmd],
+		[cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(stop,stop)
@@ -293,8 +307,12 @@ MP_KVS_SIMPLE_COMMAND(stop,stop)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.stop[/cmd],
+		[cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.play[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(next,next)
@@ -315,8 +333,12 @@ MP_KVS_SIMPLE_COMMAND(next,next)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.play[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.stop[/cmd],
+		[cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.play[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(prev,prev)
@@ -337,8 +359,12 @@ MP_KVS_SIMPLE_COMMAND(prev,prev)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.stop[/cmd],
+		[cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(quit,quit)
@@ -359,8 +385,12 @@ MP_KVS_SIMPLE_COMMAND(quit,quit)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.stop[/cmd],
+		[cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(pause,pause)
@@ -387,9 +417,13 @@ MP_KVS_SIMPLE_COMMAND(pause,pause)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc],
-		[cmd]mediaplayer.setPlayer[/cmd], [fnc]$mediaplayer.player()[/fnc]
+		[cmd]mediaplayer.stop[/cmd], [cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc],
+		[cmd]mediaplayer.setPlayer[/cmd],
+		[fnc]$mediaplayer.player[/fnc]
 */
 
 MP_KVS_COMMAND(detect)
@@ -416,7 +450,7 @@ MP_KVS_COMMAND(detect)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.detect[/cmd], [fnc]$mediaplayer.player()[/fnc]
+		[cmd]mediaplayer.detect[/cmd], [fnc]$mediaplayer.player[/fnc]
 */
 
 MP_KVS_COMMAND(setPlayer)
@@ -480,7 +514,7 @@ MP_KVS_FUNCTION(player)
 		Take a look at the [module:mediaplayer]mediaplayer module documentation[/module]
 		for more details about how it works.[br]
 	@seealso:
-		[module:mediaplayer]media player module documentation[/module]m
+		[module:mediaplayer]media player module documentation[/module]
 		[cmd]mediaplayer.detect[/cmd], [cmd]mediaplayer.setPlayer[/cmd],
 		[fnc]$mediaplayer.player[/fnc]
 */
@@ -516,7 +550,8 @@ MP_KVS_FUNCTION(playerList)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [fnc]$mediaplayer.localFile()[/fnc],
+		[fnc]$mediaplayer.mrl[/fnc],
+		[fnc]$mediaplayer.localFile[/fnc],
 		[cmd]mediaplayer.play[/cmd]
 */
 
@@ -581,7 +616,8 @@ MP_KVS_COMMAND(amipExec)
 		Sets the position in seconds of the current song .
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.position()[/fnc], [fnc]$mediaplayer.lenght()[/fnc],
+		[fnc]$mediaplayer.position[/fnc],
+		[fnc]$mediaplayer.lenght[/fnc],
 */
 
 MP_KVS_COMMAND(jumpTo)
@@ -620,7 +656,7 @@ MP_KVS_COMMAND(jumpTo)
 		Set the media player volume to <vol> (the valid range is from 0 to ....)
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.getVol()[/fnc]
+		[fnc]$mediaplayer.getVol[/fnc]
 */
 
 MP_KVS_COMMAND(setVol)
@@ -683,8 +719,11 @@ MP_KVS_SIMPLE_INT_FUNCTION(getVol,getVol)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.play[/cmd], [cmd]mediaplayer.pause[/cmd], [cmd]mediaplayer.prev[/cmd],
-		[cmd]mediaplayer.next[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc], [fnc]$mediaplayer.status()[/fnc]
+		[cmd]mediaplayer.play[/cmd], [cmd]mediaplayer.pause[/cmd],
+		[cmd]mediaplayer.prev[/cmd],
+		[cmd]mediaplayer.next[/cmd],
+		[fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.status[/fnc]
 */
 
 MP_KVS_SIMPLE_COMMAND(mute,mute)
@@ -713,7 +752,8 @@ MP_KVS_SIMPLE_COMMAND(mute,mute)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]mediaplayer.playMrl[/cmd], [fnc]$mediaplayer.localFile()[/fnc]
+		[cmd]mediaplayer.playMrl[/cmd],
+		[fnc]$mediaplayer.localFile[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(mrl,mrl)
@@ -741,13 +781,15 @@ MP_KVS_SIMPLE_STRING_FUNCTION(mrl,mrl)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.title()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.genre()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc], [fnc]$mediaplayer.bitRate()[/fnc],
-		[fnc]$mediaplayer.sampleRate()[/fnc],
-		[fnc]$mediaplayer.length()[/fnc], [fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.title[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.genre[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc],
+		[fnc]$mediaplayer.bitRate[/fnc],
+		[fnc]$mediaplayer.sampleRate[/fnc],
+		[fnc]$mediaplayer.length[/fnc],
+		[fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(nowPlaying,nowPlaying)
@@ -772,11 +814,11 @@ MP_KVS_SIMPLE_STRING_FUNCTION(nowPlaying,nowPlaying)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.genre()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.genre[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(title,title)
@@ -801,12 +843,14 @@ MP_KVS_SIMPLE_STRING_FUNCTION(title,title)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.title()[/fnc], [fnc]$mediaplayer.genre()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc], [fnc]$mediaplayer.album()[/fnc],
-		[fnc]$mediaplayer.length()[/fnc], [fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.title[/fnc], [fnc]$mediaplayer.genre[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc],
+		[fnc]$mediaplayer.album[/fnc],
+		[fnc]$mediaplayer.length[/fnc],
+		[fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(artist,artist)
@@ -831,12 +875,12 @@ MP_KVS_SIMPLE_STRING_FUNCTION(artist,artist)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc], [fnc]$mediaplayer.album()[/fnc],
-		[fnc]$mediaplayer.length()[/fnc], [fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc], [fnc]$mediaplayer.album[/fnc],
+		[fnc]$mediaplayer.length[/fnc], [fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(genre,genre)
@@ -861,12 +905,12 @@ MP_KVS_SIMPLE_STRING_FUNCTION(genre,genre)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.genre()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc], [fnc]$mediaplayer.album()[/fnc],
-		[fnc]$mediaplayer.length()[/fnc], [fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.genre[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc], [fnc]$mediaplayer.album[/fnc],
+		[fnc]$mediaplayer.length[/fnc], [fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(year,year)
@@ -891,12 +935,12 @@ MP_KVS_SIMPLE_STRING_FUNCTION(year,year)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.year()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc], [fnc]$mediaplayer.album()[/fnc],
-		[fnc]$mediaplayer.length()[/fnc], [fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.year[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc], [fnc]$mediaplayer.album[/fnc],
+		[fnc]$mediaplayer.length[/fnc], [fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(comment,comment)
@@ -921,13 +965,15 @@ MP_KVS_SIMPLE_STRING_FUNCTION(comment,comment)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.mediaType()[/fnc], [fnc]$mediaplayer.bitRate()[/fnc],
-		[fnc]$mediaplayer.sampleRate()[/fnc], [fnc]$mediaplayer.length()[/fnc],
-		[fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.mediaType[/fnc],
+		[fnc]$mediaplayer.bitRate[/fnc],
+		[fnc]$mediaplayer.sampleRate[/fnc],
+		[fnc]$mediaplayer.length[/fnc],
+		[fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(album,album)
@@ -950,10 +996,11 @@ MP_KVS_SIMPLE_STRING_FUNCTION(album,album)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc]
 */
 
 MP_KVS_SIMPLE_STRING_FUNCTION(mediaType,mediaType)
@@ -977,12 +1024,13 @@ MP_KVS_SIMPLE_STRING_FUNCTION(mediaType,mediaType)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.sampleRate()[/fnc], [fnc]$mediaplayer.length()[/fnc],
-		[fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.sampleRate[/fnc],
+		[fnc]$mediaplayer.length[/fnc],
+		[fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_INT_FUNCTION(bitRate,bitRate)
@@ -1007,12 +1055,12 @@ MP_KVS_SIMPLE_INT_FUNCTION(bitRate,bitRate)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.bitRate()[/fnc], [fnc]$mediaplayer.length()[/fnc],
-		[fnc]$mediaplayer.position()[/fnc], [fnc]$mediaplayer.channels()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.bitRate[/fnc], [fnc]$mediaplayer.length[/fnc],
+		[fnc]$mediaplayer.position[/fnc], [fnc]$mediaplayer.channels[/fnc]
 */
 
 MP_KVS_SIMPLE_INT_FUNCTION(sampleRate,sampleRate)
@@ -1035,12 +1083,14 @@ MP_KVS_SIMPLE_INT_FUNCTION(sampleRate,sampleRate)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.sampleRate()[/fnc], [fnc]$mediaplayer.bitRate()[/fnc],
-		[fnc]$mediaplayer.position()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.sampleRate[/fnc],
+		[fnc]$mediaplayer.bitRate[/fnc],
+		[fnc]$mediaplayer.position[/fnc]
 */
 
 MP_KVS_SIMPLE_INT_FUNCTION(length,length)
@@ -1063,12 +1113,13 @@ MP_KVS_SIMPLE_INT_FUNCTION(length,length)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module]
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.playMrl[/cmd],
-		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying()[/fnc],
-		[fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.artist()[/fnc],
-		[fnc]$mediaplayer.year()[/fnc], [fnc]$mediaplayer.comment()[/fnc],
-		[fnc]$mediaplayer.sampleRate()[/fnc], [fnc]$mediaplayer.length()[/fnc],
-		[fnc]$mediaplayer.bitRate()[/fnc], [fnc]$mediaplayer.channels()[/fnc]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.playMrl[/cmd],
+		[cmd]mediaplayer.play[/cmd], [fnc]$mediaplayer.nowPlaying[/fnc],
+		[fnc]$mediaplayer.artist[/fnc], [fnc]$mediaplayer.artist[/fnc],
+		[fnc]$mediaplayer.year[/fnc], [fnc]$mediaplayer.comment[/fnc],
+		[fnc]$mediaplayer.sampleRate[/fnc],
+		[fnc]$mediaplayer.length[/fnc],
+		[fnc]$mediaplayer.bitRate[/fnc], [fnc]$mediaplayer.channels[/fnc]
 */
 
 MP_KVS_SIMPLE_INT_FUNCTION(position,position)
@@ -1175,7 +1226,6 @@ MP_KVS_SIMPLE_INT_FUNCTION(getPlayListPos,getPlayListPos)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[cmd]
 */
 
 MP_KVS_SIMPLE_INT_FUNCTION(getListLength,getListLength)
@@ -1198,7 +1248,7 @@ MP_KVS_SIMPLE_INT_FUNCTION(getListLength,getListLength)
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
 		[cmd]mediaplayer.setRepeat[/cmd], [cmd]mediaplayer.setShuffle[/cmd],
-		[fnc]mediaplayer.getShuffle[/cmd]
+		[fnc]$mediaplayer.getShuffle[/fnc]
 */
 
 MP_KVS_SIMPLE_INT_FUNCTION(getRepeat,getRepeat)
@@ -1221,7 +1271,7 @@ MP_KVS_SIMPLE_INT_FUNCTION(getRepeat,getRepeat)
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
 		[cmd]mediaplayer.setShuffle[/cmd], [cmd]mediaplayer.setRepeat[/cmd],
-		[fnc]mediaplayer.getRepeat[/cmd]
+		[fnc]$mediaplayer.getRepeat[/fnc]
 */
 
 MP_KVS_SIMPLE_BOOL_FUNCTION(getShuffle,getShuffle)
@@ -1244,7 +1294,7 @@ MP_KVS_SIMPLE_BOOL_FUNCTION(getShuffle,getShuffle)
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
 		[cmd]mediaplayer.setShuffle[/cmd], [cmd]mediaplayer.setRepeat[/cmd],
-		[fnc]mediaplayer.getRepeat[/cmd]
+		[fnc]$mediaplayer.getRepeat[/fnc]
 
 */
 
@@ -1339,7 +1389,7 @@ MP_KVS_COMMAND(setEqData)
 		for more details about how it works.[br]
 	@seealso:
 		[module:mediaplayer]media player module documentation[/module],
-		[fnc]$mediaplayer.mrl()[/fnc], [cmd]mediaplayer.play[/cmd]
+		[fnc]$mediaplayer.mrl[/fnc], [cmd]mediaplayer.play[/cmd]
 */
 
 MP_KVS_FUNCTION(localFile)
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 42245778e..96cc131e8 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -343,8 +343,8 @@ static bool mircimport_module_cleanup(KviModule *m)
 {
 	if(g_pMircServersIniImport)delete g_pMircServersIniImport;
 	if(g_pRemoteMircServersIniImport)delete g_pRemoteMircServersIniImport;
-    g_pMircServersIniImport = 0;
-    g_pRemoteMircServersIniImport = 0;
+	g_pMircServersIniImport = 0;
+	g_pRemoteMircServersIniImport = 0;
 
 	return true;
 }
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index b1c5dcafc..9caa25ca2 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -70,7 +70,7 @@ Idle* g_pIdle;
 
 
 static bool my_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -95,7 +95,7 @@ static bool my_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_cmd_startIdleTimer(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_pIdle)
 		g_pIdle = new Idle();
 	g_pIdle->start();
@@ -117,7 +117,7 @@ static bool my_kvs_cmd_startIdleTimer(KviKvsModuleCommandCall * c)
 */
 
 static bool my_kvs_cmd_stopIdleTimer(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_pIdle) return true;
 	g_pIdle->stop();
 	//delete g_pIdle;
@@ -167,7 +167,7 @@ static bool my_kvs_fnc_globalIdle(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_fnc_umode(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -195,7 +195,7 @@ static bool my_kvs_fnc_umode(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_fnc_user(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -224,7 +224,7 @@ static bool my_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 
 
 static bool my_kvs_fnc_host(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -256,7 +256,7 @@ static bool my_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 
 
 static bool my_kvs_fnc_ip(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -284,7 +284,7 @@ static bool my_kvs_fnc_ip(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_fnc_serverIsIPV6(KviKvsModuleFunctionCall * c)
-{ 
+{
 	
 	GET_KVS_CONSOLE
 	if(wnd)
@@ -314,7 +314,7 @@ static bool my_kvs_fnc_serverIsIPV6(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_fnc_serverIsSSL(KviKvsModuleFunctionCall * c)
-{ 
+{
 	
 	GET_KVS_CONSOLE
 	if(wnd)
@@ -347,7 +347,7 @@ static bool my_kvs_fnc_serverIsSSL(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_fnc_server(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -375,7 +375,7 @@ static bool my_kvs_fnc_server(KviKvsModuleFunctionCall * c)
 */
 
 static bool my_kvs_fnc_network(KviKvsModuleFunctionCall * c)
-{ 
+{
 	GET_KVS_CONSOLE
 	if(wnd)
 	{
@@ -384,6 +384,7 @@ static bool my_kvs_fnc_network(KviKvsModuleFunctionCall * c)
 	}
 	return true;
 }
+
 static bool my_module_init(KviModule * m)
 {
 	g_pIdle = 0;
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 5deb62778..e513f439f 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -113,7 +113,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 */
 
 static bool notifier_kvs_cmd_message(KviKvsModuleCommandCall * c)
-{ 
+{
 	QString szMessage;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("message",KVS_PT_STRING,0,szMessage)
@@ -184,7 +184,7 @@ static bool notifier_kvs_cmd_message(KviKvsModuleCommandCall * c)
 */
 
 static bool notifier_kvs_cmd_hide(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(g_pNotifierWindow) g_pNotifierWindow->doHide(!(c->hasSwitch('n',"notanimated")));
 	return true;
 }
@@ -214,7 +214,7 @@ static bool notifier_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 */
 
 static bool notifier_kvs_cmd_show(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_pNotifierWindow)return true;
 	if(!g_pNotifierWindow->countTabs())return true;
 
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 7df3f07fe..d4806d91a 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -517,7 +517,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 }
 
 static bool objects_kvs_cmd_disconnect(KviKvsModuleCommandCall * c)
-{ 
+{
 	/*
 		@doc: objects.disconnect
 		@title:
@@ -569,7 +569,7 @@ static bool objects_kvs_cmd_disconnect(KviKvsModuleCommandCall * c)
 
 
 static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
-{ 
+{
 	/*
 		@doc: objects.bitblt
 		@type:
@@ -680,7 +680,7 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
 	kvs_int_t iBkX,iBkY;
 	kvs_int_t iFoX,iFoY;
 	kvs_int_t iDesX,iDesY,uW,uH;
-    kvs_real_t dBlend;
+	kvs_real_t dBlend;
 
 	kvs_hobject_t hBk,hFo,hDest;
 
@@ -765,12 +765,12 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
 		{
 			
 	
-		*dst = qRgba(
-						(int)((qRed(*bkg) * dRemaining) + (qRed(*fgn) * dBlend)),
-						(int)((qGreen(*bkg) * dRemaining) + (qGreen(*fgn) * dBlend)),
-						(int)((qBlue(*bkg) * dRemaining) + (qBlue(*fgn) * dBlend)),
-						(int)((qAlpha(*bkg) * dRemaining) + (qAlpha(*fgn) * dBlend))
-						);
+			*dst = qRgba(
+				(int)((qRed(*bkg) * dRemaining) + (qRed(*fgn) * dBlend)),
+				(int)((qGreen(*bkg) * dRemaining) + (qGreen(*fgn) * dBlend)),
+				(int)((qBlue(*bkg) * dRemaining) + (qBlue(*fgn) * dBlend)),
+				(int)((qAlpha(*bkg) * dRemaining) + (qAlpha(*fgn) * dBlend))
+				);
 
 			dst++;
 			bkg++;
@@ -833,18 +833,18 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	QString  szTemp;
 	KviKvsArray * n = new KviKvsArray();
 	int idx=0;
-    for(int i=0;i<list.count();i++)
+	for(int i=0;i<list.count();i++)
 	{
 		if( list.at(i)->isWidgetType())
-        {
+		{
 			if (bFlag)
 			{
 				cmd->window()->output(80, "Ptr %u: top level object: %c%s%c, class %s, %s, rect = %d, %d, %d, %d",
-                list.at(i),
-                KVI_TEXT_BOLD, list.at(i)->name(), KVI_TEXT_BOLD,
-                list.at(i)->className(),
-                list.at(i)->isVisible() ? "visible" : "hidden",
-                list.at(i)->x(), list.at(i)->y(), list.at(i)->width(), list.at(i)->height());
+				list.at(i),
+				KVI_TEXT_BOLD, list.at(i)->name(), KVI_TEXT_BOLD,
+				list.at(i)->className(),
+				list.at(i)->isVisible() ? "visible" : "hidden",
+				list.at(i)->x(), list.at(i)->y(), list.at(i)->width(), list.at(i)->height());
 			}
 			QString  szClass=list.at(i)->className();
 			QString szObj=list.at(i)->name();
@@ -860,32 +860,30 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 			idx++;
 	
 			dumpChildObjects(cmd->window(), list.at(i), spacing.ptr(), bFlag,n,idx);
-		
-	
-        }
-        //++it;
+		}
+	//++it;
 	}
 
 #else
 	QWidgetList *l = g_pApp->topLevelWidgets();
 	l->setAutoDelete(false);
-    QWidgetListIt it(*l);
-    KviStr spacing = ">";
+	QWidgetListIt it(*l);
+	KviStr spacing = ">";
 	QString  szTemp;
 	KviKvsArray * n = new KviKvsArray();
 	int idx=0;
-    while( it.current() )
-    {
+	while( it.current() )
+	{
 		if( it.current()->isWidgetType())
-        {
+		{
 			if (bFlag)
 			{
 				cmd->window()->output(80, "Ptr %u: top level object: %c%s%c, class %s, %s, rect = %d, %d, %d, %d",
-                it.current(),
-                KVI_TEXT_BOLD, it.current()->name(), KVI_TEXT_BOLD,
-                it.current()->className(),
-                it.current()->isVisible() ? "visible" : "hidden",
-                it.current()->x(), it.current()->y(), it.current()->width(), it.current()->height());
+				it.current(),
+				KVI_TEXT_BOLD, it.current()->name(), KVI_TEXT_BOLD,
+				it.current()->className(),
+				it.current()->isVisible() ? "visible" : "hidden",
+				it.current()->x(), it.current()->y(), it.current()->width(), it.current()->height());
 			}
 			QString  szClass=it.current()->className();
 			QString szObj=it.current()->name();
@@ -903,80 +901,77 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 			dumpChildObjects(cmd->window(), it.current(), spacing.ptr(), bFlag,n,idx);
 		
 	
-        }
-        ++it;
+		}
+	++it;
 	}
 
 #endif
-    cmd->returnValue()->setArray(n);
-    return true;
-                
+	cmd->returnValue()->setArray(n);
+	return true;
 }
 
 static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
 {
 #ifdef COMPILE_USE_QT4
-        const QObjectList list = parent->children();
-    	if( !list.count() ) return;
-        QString sp(spacing);
-        sp.append(">");
- 		for(int i=0;i<list.count();i++)         
+	const QObjectList list = parent->children();
+	if( !list.count() ) return;
+	QString sp(spacing);
+	sp.append(">");
+	for(int i=0;i<list.count();i++)
+	{
+		if( list.at(i)->isWidgetType() )
 		{
-                
-                if( list.at(i)->isWidgetType() ) 
-				{
-					if (bFlag)
-					{
-                        pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
-                        spacing, list.at(i), KVI_TEXT_BOLD,
-                        list.at(i)->name(), KVI_TEXT_BOLD, list.at(i)->className()
-                        );
-					}
-				QString szClass=list.at(i)->className();
-                QString szObj=list.at(i)->name();
-				QString szTemp;
-				szTemp=spacing+szClass+"::"+szObj;
-				KviKvsVariant v;
-				v.setString(szTemp);
-				n->set(idx,new KviKvsVariant(v));
-				debug ("string %s",szTemp.latin1());
-				idx++;
-                dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx );
-                }
-         }
+			if (bFlag)
+			{
+				pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
+					spacing, list.at(i), KVI_TEXT_BOLD,
+					list.at(i)->name(), KVI_TEXT_BOLD, list.at(i)->className()
+				);
+			}
+			QString szClass=list.at(i)->className();
+			QString szObj=list.at(i)->name();
+			QString szTemp;
+			szTemp=spacing+szClass+"::"+szObj;
+			KviKvsVariant v;
+			v.setString(szTemp);
+			n->set(idx,new KviKvsVariant(v));
+			debug ("string %s",szTemp.latin1());
+			idx++;
+			dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx );
+		}
+	}
 
 #else
-        const QObjectList *l = parent->children();
-    	if( !l ) return;
-        if( l->isEmpty() ) return;
-        QObjectListIt it(*l);
-        QString sp(spacing);
-        sp.append(">");
-        while( it.current() ) 
-                {
-                
-                if( it.current()->isWidgetType() ) 
-				{
-					if (bFlag)
-					{
-                        pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
-                        spacing, it.current(), KVI_TEXT_BOLD,
-                        it.current()->name(), KVI_TEXT_BOLD, it.current()->className()
-                        );
-					}
-				QString szClass=it.current()->className();
-                QString szObj=it.current()->name();
-				QString szTemp;
-				szTemp=spacing+szClass+"::"+szObj;
-				KviKvsVariant v;
-				v.setString(szTemp);
-				n->set(idx,new KviKvsVariant(v));
-				debug ("string %s",szTemp.latin1());
-				idx++;
-                dumpChildObjects(pWnd, it.current(), sp, bFlag, n, idx );
+	const QObjectList *l = parent->children();
+	if( !l ) return;
+	if( l->isEmpty() ) return;
+	QObjectListIt it(*l);
+	QString sp(spacing);
+	sp.append(">");
+	while( it.current() )
+	{
+                if( it.current()->isWidgetType() )
+		{
+			if (bFlag)
+			{
+				pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
+					spacing, it.current(), KVI_TEXT_BOLD,
+					it.current()->name(), KVI_TEXT_BOLD, it.current()->className()
+				);
+			}
+			QString szClass=it.current()->className();
+			QString szObj=it.current()->name();
+			QString szTemp;
+			szTemp=spacing+szClass+"::"+szObj;
+			KviKvsVariant v;
+			v.setString(szTemp);
+			n->set(idx,new KviKvsVariant(v));
+			debug ("string %s",szTemp.latin1());
+			idx++;
+			dumpChildObjects(pWnd, it.current(), sp, bFlag, n, idx );
                 }
-          ++it;
-        }
+		++it;
+	}
 #endif
 }
 
@@ -986,7 +981,7 @@ static bool objects_module_can_unload(KviModule *m)
 	// FIXME: unlock when no more instances & derived classes!
 	return false;
 }
-    static bool objects_module_init(KviModule * m)
+static bool objects_module_init(KviModule * m)
 {
 	// functions
 	KVSM_REGISTER_FUNCTION(m,"exists",objects_kvs_fnc_exists);
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index eca1ff85d..98371a708 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -87,7 +87,7 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall * c)
 		If [options_group] is omitted, the option group "general" is assumed.
 		This command is exported by the "options" module.
 	@seealso:
-		[fnc]$options.isdialog[/fnc]
+		[fnc]$options.isDialog[/fnc]
 */
 
 
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index ca8c64234..d33d1879d 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -102,7 +102,7 @@ static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
 			regchan.remove #kvirc openprojects
 		[/example]
 	@seealso:
-		regchan.add
+		[cmd]regchan.add[/cmd]
 */
 static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 { 
@@ -151,7 +151,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 			regchan.setproperty #kvirc openprojects autojoin true
 		[/example]
 	@seealso:
-		regchan.add
+		[cmd]regchan.add[/cmd]
 */
 
 static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
@@ -338,12 +338,12 @@ static bool regchan_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 			echo $regchan.match(#kvirc,$my.network)
 		[/example]
 	@seealso:
-		$regchan.find
+		[fnc]$regchan.find[/fnc]
 */
 
 
 static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szChan,szNetwork;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
@@ -375,7 +375,7 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 			echo $regchan.find(#kvirc,*)
 		[/example]
 	@seealso:
-		$regchan.match
+		[fnc]$regchan.match[/fnc]
 */
 
 static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 53f403b0e..3f0c652a9 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -253,7 +253,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
@@ -315,8 +315,8 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
-		[fnc]reguser.exactMatch[/fnc]
+		[fnc]$reguser.match[/fnc],
+		[fnc]$reguser.exactMatch[/fnc]
 */
 
 static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
@@ -384,12 +384,12 @@ static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
-		[fnc]reguser.exactMatch[/fnc]
+		[fnc]$reguser.match[/fnc],
+		[fnc]$reguser.exactMatch[/fnc]
 */
 
 static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c)
@@ -563,12 +563,12 @@ static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
+		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
 */
 
@@ -618,12 +618,12 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
+		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
 */
 
@@ -733,7 +733,7 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
@@ -792,10 +792,10 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[fnc]reguser.match[/fnc],
-		[fnc]reguser.exactMatch[/fnc]
+		[fnc]$reguser.match[/fnc],
+		[fnc]$reguser.exactMatch[/fnc]
 */
 
 static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
@@ -867,11 +867,11 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.exactMatch[/fnc]
+		[fnc]$reguser.exactMatch[/fnc]
 */
 
 static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
@@ -904,11 +904,11 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc]
+		[fnc]$reguser.match[/fnc]
 */
 
 static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
@@ -1002,12 +1002,12 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
+		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
 */
 
@@ -1066,11 +1066,11 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
+		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
 */
 
@@ -1119,12 +1119,12 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
 		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
-		[fnc]reguser.match[/fnc],
-		[fnc]reguser.property[/fnc]
+		[fnc]$reguser.match[/fnc],
+		[fnc]$reguser.property[/fnc]
 */
 
 static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
@@ -1166,7 +1166,7 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
-		[cmd]reguser.add[cmd],
+		[cmd]reguser.add[/cmd],
 */
 
 static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
@@ -1213,11 +1213,11 @@ static bool reguser_module_init(KviModule * m)
 static bool reguser_module_cleanup(KviModule *m)
 {
 	if(g_pRegisteredUsersDialog)delete g_pRegisteredUsersDialog;
-    g_pRegisteredUsersDialog = 0;
+	g_pRegisteredUsersDialog = 0;
 
 	while(KviRegistrationWizard * w = g_pRegistrationWizardList->first())delete w;
 	delete g_pRegistrationWizardList;
-    g_pRegistrationWizardList = 0;
+	g_pRegistrationWizardList = 0;
 
 	// FIXME: UNREGISTER THE METAOBJECTS
 	return true;
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index e974d0f68..60d9bb67f 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -806,7 +806,7 @@ static bool rijndael_module_init(KviModule * m)
 	m->registerCryptEngine(d);
 
 
-    return true;
+	return true;
 #else
 	return false;
 #endif
@@ -817,7 +817,7 @@ static bool rijndael_module_cleanup(KviModule *m)
 #ifdef COMPILE_CRYPT_SUPPORT
 	while(g_pEngineList->first())delete g_pEngineList->first();
 	delete g_pEngineList;
-    g_pEngineList = 0;
+	g_pEngineList = 0;
 	m->unregisterCryptEngines();
 	return true;
 #else
@@ -838,13 +838,13 @@ static bool rijndael_module_can_unload(KviModule *)
 // plugin definition structure
 // =======================================
 KVIRC_MODULE(
-    "Rijndael crypt engine",
+	"Rijndael crypt engine",
 	"1.0.0",
 	"Szymon Stefanek <pragma at kvirc dot net>" ,
 	"Exports the rijndael crypt engine",
-    rijndael_module_init ,
-    rijndael_module_can_unload,
-    0,
+	rijndael_module_init ,
+	rijndael_module_can_unload,
+	0,
 	rijndael_module_cleanup
 )
 
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 60ee16d31..701daf62a 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -147,12 +147,12 @@ static bool setup_module_can_unload(KviModule *m)
 }
 
 KVIRC_MODULE(
-    "Setup wizard",
+	"Setup wizard",
 	"1.0.0",
 	"Szymon Stefanek <pragma at kvirc dot net>" ,
 	"First-time-run setup wizard",
-    setup_module_init ,
-    setup_module_can_unload,
-    0,
+	setup_module_init ,
+	setup_module_can_unload,
+	0,
 	setup_module_cleanup
 )
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index df4a3e299..2d637b88b 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -121,9 +121,9 @@ static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 static bool sharedfileswindow_module_init(KviModule * m)
 {
 	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-							KVI_SHARED_FILES_WINDOW_EXTENSION_NAME,
-							__tr2qs_ctx("Manage S&hared Files","sharedfileswindow"),
-							sharedfileswindow_extension_alloc);
+		KVI_SHARED_FILES_WINDOW_EXTENSION_NAME,
+		__tr2qs_ctx("Manage S&hared Files","sharedfileswindow"),
+		sharedfileswindow_extension_alloc);
 
 	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SHAREDFILES)));
 
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index cfdfac002..c33c85665 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -371,11 +371,11 @@ void KviSoundThread::run()
 				frameSize = afGetVirtualFrameSize(file, AF_DEFAULT_TRACK, 1);
 				channelCount = afGetVirtualChannels(file, AF_DEFAULT_TRACK); 
 				buffer = kvi_malloc(int(BUFFER_FRAMES * frameSize));
-			    
+
 				int audiofd_c = open("/dev/dsp", O_WRONLY | O_EXCL | O_NDELAY);
 				QFile audiofd;
 				audiofd.open(IO_WriteOnly,audiofd_c);
-			    
+
 				if(audiofd_c < 0)
 				{
 					debug("Could not open audio devive /dev/dsp! [OSS]");
@@ -564,21 +564,21 @@ void KviSoundThread::run()
 
 
 /*
-    @doc: snd.play
-    @type:
-        command
-    @title:
-        snd.play
-    @short:
-        Play a sound file from the disk
-    @syntax:
-        snd.play [-q|quiet] <filename:string>
-    @description:
-        Play a file, using the sound system specified by the user in the options.[br]
-        The supported file formats vary from one sound system to another, but the best
-        bet could be Au Law (.au) files. Artsd, EsounD and Linux/OSS with audiofile support also
-        support other formats like .wav files but in OSS without audiofile only .au files are
-        supported.
+	@doc: snd.play
+	@type:
+		command
+	@title:
+		snd.play
+	@short:
+		Play a sound file from the disk
+	@syntax:
+		snd.play [-q|quiet] <filename:string>
+	@description:
+		Play a file, using the sound system specified by the user in the options.[br]
+		The supported file formats vary from one sound system to another, but the best
+		bet could be Au Law (.au) files. Artsd, EsounD and Linux/OSS with audiofile support also
+		support other formats like .wav files but in OSS without audiofile only .au files are
+		supported.
 		On windows the supported file formats are determined by the drivers installed.
 		You should be able to play at least *.wav files.[br]
 		(This is a task where the Windows interface is really well done, I must say that :)
@@ -588,7 +588,7 @@ void KviSoundThread::run()
 */
 
 static bool snd_kvs_cmd_play(KviKvsModuleCommandCall * c)
-{ 
+{
 	QString szFile;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("file name",KVS_PT_STRING,0,szFile)
@@ -608,7 +608,7 @@ static bool snd_kvs_cmd_play(KviKvsModuleCommandCall * c)
 }
 
 static bool snd_kvs_cmd_autodetect(KviKvsModuleCommandCall * c)
-{ 
+{
 	g_pSoundPlayer->detectSoundSystem();
 	if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringSoundSystem),"null"))
 	{
@@ -621,21 +621,21 @@ static bool snd_kvs_cmd_autodetect(KviKvsModuleCommandCall * c)
 
 
 /*
-    @doc: snd.mute
-    @type:
-        command
-    @title:
-        snd.mute
-    @short:
-        Mute all sounds
-    @syntax:
-        snd.mute 
-    @description:
-        Mute all sounds
+	@doc: snd.mute
+	@type:
+		command
+	@title:
+		snd.mute
+	@short:
+		Mute all sounds
+	@syntax:
+		snd.mute
+	@description:
+		Mute all sounds
 */
 
 static bool snd_kvs_cmd_mute(KviKvsModuleCommandCall * c)
-{ 
+{
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETERS_END(c)
 	g_pSoundPlayer->setMuted(TRUE);
@@ -643,21 +643,21 @@ static bool snd_kvs_cmd_mute(KviKvsModuleCommandCall * c)
 }
 
 /*
-    @doc: snd.unmute
-    @type:
-        command
-    @title:
-        snd.unmute
-    @short:
-        UnMute all sounds
-    @syntax:
-        snd.mute 
-    @description:
-        UnMute all sounds
+	@doc: snd.unmute
+	@type:
+		command
+	@title:
+		snd.unmute
+	@short:
+		UnMute all sounds
+	@syntax:
+		snd.mute
+	@description:
+		UnMute all sounds
 */
 
 static bool snd_kvs_cmd_unmute(KviKvsModuleCommandCall * c)
-{ 
+{
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETERS_END(c)
 	g_pSoundPlayer->setMuted(FALSE);
@@ -680,7 +680,7 @@ static bool snd_kvs_cmd_unmute(KviKvsModuleCommandCall * c)
 
 
 static bool snd_kvs_fnc_ismuted(KviKvsModuleFunctionCall * c)
-{ 
+{
 	c->returnValue()->setBoolean(g_pSoundPlayer->isMuted());
 	return true;
 }
@@ -702,7 +702,7 @@ static bool snd_module_init(KviModule * m)
 static bool snd_module_cleanup(KviModule *m)
 {
 	delete g_pSoundPlayer;
-    g_pSoundPlayer = 0;
+	g_pSoundPlayer = 0;
 	return true;
 }
 
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index f77d863c4..2e8e632d7 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -71,7 +71,7 @@ static bool socketspy_module_cleanup(KviModule *m)
 {
 	while(g_pSocketSpyWindowList->first())g_pSocketSpyWindowList->first()->die();
 	delete g_pSocketSpyWindowList;
-    g_pSocketSpyWindowList = 0;
+	g_pSocketSpyWindowList = 0;
 	return true;
 }
 
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 0d3457c40..16fc3f2fc 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -55,38 +55,38 @@ static SPasteController * spaste_find_controller(KviWindow * w)
 
 static KviWindow * spaste_kvs_find_window(QString &win, KviKvsModuleCommandCall * c)
 {
-    KviWindow * w;
-    if(!win.isEmpty())w = g_pApp->findWindow(win);
-    else w = c->window();
-    if(!w)
-    {
-        c->warning(__tr("Window with ID '%Q' not found"),&win);
-        return 0;
-    }
-    if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_QUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
-    c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"),&win);
-    return 0;
+	KviWindow * w;
+	if(!win.isEmpty())w = g_pApp->findWindow(win);
+	else w = c->window();
+	if(!w)
+	{
+		c->warning(__tr("Window with ID '%Q' not found"),&win);
+		return 0;
+	}
+	if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_QUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
+	c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"),&win);
+	return 0;
 }
 //-------------------------------------------------
 /*
-    @doc: spaste.file
-    @type:
-        command
-    @title:
-        spaste.file
-    @short:
-        Sends the contents of a file to a window, with a delay between each line
-    @syntax:
-         spaste.file <filename:string> [window:string]
-    @description:
-        Sends the contents of a file to a conversation window doing a pause between each line. [br]
-        the optional window parameter must be a channel, query or DCC chat window, if [br]
-        no window is specified the text will be send to the current window.
-    @seealso:
-        [cmd]spaste.clipboard[/cmd],
-        [cmd]spaste.stop[/cmd],
-        [cmd]spaste.list[/cmd],
-        [cmd]spaste.setdelay[/cmd]
+	@doc: spaste.file
+	@type:
+		command
+	@title:
+		spaste.file
+	@short:
+		Sends the contents of a file to a window, with a delay between each line
+	@syntax:
+		spaste.file <filename:string> [window:string]
+	@description:
+		Sends the contents of a file to a conversation window doing a pause between each line. [br]
+		the optional window parameter must be a channel, query or DCC chat window, if [br]
+		no window is specified the text will be send to the current window.
+	@seealso:
+		[cmd]spaste.clipboard[/cmd],
+		[cmd]spaste.stop[/cmd],
+		[cmd]spaste.list[/cmd],
+		[cmd]spaste.setdelay[/cmd]
 */
 //-------------------------------------------
 // spaste.file
@@ -101,7 +101,7 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	KviWindow * window = spaste_kvs_find_window(szWindow,c);
-    if( (!window) || window->console()->isNotConnected())return false;
+	if( (!window) || window->console()->isNotConnected())return false;
 
 	if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.ascii())))
 	{
@@ -109,86 +109,86 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c)
 		return false;
 	}
 
-    QFile tmp(szFile);
-    if(!tmp.open(IO_ReadOnly)) {
-        c->warning(__tr2qs("I can't open that file"));
-        return false;
-    }
-    tmp.close();
+	QFile tmp(szFile);
+	if(!tmp.open(IO_ReadOnly)) {
+		c->warning(__tr2qs("I can't open that file"));
+		return false;
+	}
+	tmp.close();
 
-    SPasteController * controller = spaste_find_controller(window);
+	SPasteController * controller = spaste_find_controller(window);
 	if(!controller)controller = new SPasteController(window,++ctrlId);
-    if(!controller->pasteFileInit(szFile)) {
-        c->warning(__tr2qs("Could not paste file"));
-        return false;
-    }
+	if(!controller->pasteFileInit(szFile)) {
+		c->warning(__tr2qs("Could not paste file"));
+		return false;
+	}
 	return true;
 }
 
 
 /*
-    @doc: spaste.clipboard
-    @type:
-        command
-    @title:
-        spaste.clipboard
-    @short:
-        Sends the contents of the clipboard to a window, pausing between each line
-    @syntax:
-        spaste.clipboard [window:string]
-    @description:
-        Sends the contents of the clipboard to a conversation window, with a delay between each line. [br]
-        the optional window parameter must be a channel, query or DCC chat window. [br]
-        If no window is specified, the text will be sent to the current window.
-    @seealso:
-        [cmd]spaste.file[/cmd],
-        [cmd]spaste.stop[/cmd],
-        [cmd]spaste.list[/cmd],
-        [cmd]spaste.setdelay[/cmd]
+	@doc: spaste.clipboard
+	@type:
+		command
+	@title:
+		spaste.clipboard
+	@short:
+		Sends the contents of the clipboard to a window, pausing between each line
+	@syntax:
+		spaste.clipboard [window:string]
+	@description:
+		Sends the contents of the clipboard to a conversation window, with a delay between each line. [br]
+		the optional window parameter must be a channel, query or DCC chat window. [br]
+		If no window is specified, the text will be sent to the current window.
+	@seealso:
+		[cmd]spaste.file[/cmd],
+		[cmd]spaste.stop[/cmd],
+		[cmd]spaste.list[/cmd],
+		[cmd]spaste.setdelay[/cmd]
 */
 //-------------------------------------------------
 // spaste.clipboard
 //-------------------------------------------------
 
 static bool spaste_kvs_cmd_clipboard(KviKvsModuleCommandCall * c)
-{ 
+{
 	QString szWindow;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window",KVS_PT_STRING,KVS_PF_OPTIONAL,szWindow)
 	KVSM_PARAMETERS_END(c)
 	KviWindow * window = spaste_kvs_find_window(szWindow,c);
-    if( (!window) || window->console()->isNotConnected())return false;
-
-    SPasteController * controller = spaste_find_controller(window);
+	if( (!window) || window->console()->isNotConnected())return false;
+	
+	SPasteController * controller = spaste_find_controller(window);
 	if(!controller)controller = new SPasteController(window,++ctrlId);
-    controller->pasteClipboardInit();
+	controller->pasteClipboardInit();
 	return true;
 }
 
 /*
-    @doc: spaste.stop
-    @type:
-        command
-    @title:
-        spaste.stop
-    @short:
-        Stops one or more slow-paste process.
-    @syntax:
-        spaste.stop [-a] [id:integer]
-    @description:
-        This commands stop one or more slow-paste processes. It can operate in three ways. The first, [br]
-        without any parameter or switch, stops all slow-paste processes running in the same window [br]
-        as the command. The second, using the -a switch, stops all slow paste processes running [br]
-        on all windows. The third form, without the switch and specifying a numerical slow paste process ID [br]
-        (which you can obtain with the [cmd]spaste.list[/cmd] command), stops only that process ID.
-	@switches:
-		!sw: -a | --all
-		Stops all slow paste processes running
-		@seealso:
-        [cmd]spaste.clipboard[/cmd],
-        [cmd]spaste.file[/cmd],
-        [cmd]spaste.list[/cmd],
-        [cmd]spaste.setdelay[/cmd]
+	@doc: spaste.stop
+	@type:
+		command
+	@title:
+		spaste.stop
+	@short:
+		Stops one or more slow-paste process.
+	@syntax:
+		spaste.stop [-a] [id:integer]
+	@description:
+		This commands stop one or more slow-paste processes. It can operate in three ways. The first, [br]
+		without any parameter or switch, stops all slow-paste processes running in the same window [br]
+		as the command. The second, using the -a switch, stops all slow paste processes running [br]
+		on all windows. The third form, without the switch and specifying a numerical slow paste process ID [br]
+		(which you can obtain with the [cmd]spaste.list[/cmd] command), stops only that process ID.
+		@switches:
+			!sw: -a | --all
+			Stops all slow paste processes running
+			@seealso:
+		[cmd]spaste.clipboard[/cmd],
+		[cmd]spaste.file[/cmd],
+		[cmd]spaste.list[/cmd],
+		[cmd]spaste.setdelay[/cmd]
 
 */
 //--------------------------------------------------
@@ -196,67 +196,64 @@ static bool spaste_kvs_cmd_clipboard(KviKvsModuleCommandCall * c)
 //--------------------------------------------------
 
 static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
-{ 
+{
 	kvs_int_t iId=0;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("delay",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,iId)
 	KVSM_PARAMETERS_END(c)
 
 	if(c->hasSwitch('a',"all")) //Delete all spaste's
-    {
-        while(g_pControllerList->first()) delete g_pControllerList->first();
-        return true;
-    } else 
-    {
-        KviPointerListIterator<SPasteController> it(*g_pControllerList);
-        SPasteController *item;
+	{
+		while(g_pControllerList->first()) delete g_pControllerList->first();
+		return true;
+	} else {
+		KviPointerListIterator<SPasteController> it(*g_pControllerList);
+		SPasteController *item;
         
-        if(!iId) //Delete all spaste's from the current window
-        {
-            if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
-            {
+		if(!iId) //Delete all spaste's from the current window
+		{
+			if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
+			{
 				QString szWinId = c->window()->id();
-                c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
-                return false;
-            } else 
-            {
-                
-                while( (item = it.current()) != 0)
-                {
-                    ++it;
-                    if(kvi_strEqualCS(item->window()->id(),c->window()->id()))delete item;
-                }
-            }
-        } else //Delete the spaste with the given id
-        { 
-            while( (item = it.current()) != 0) 
-            { 
-                ++it;
-                if(item->getId() == iId)delete item;
-            }
-        }
-        return true;
-    } 
+				c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
+				return false;
+			} else {
+				while( (item = it.current()) != 0)
+				{
+					++it;
+					if(kvi_strEqualCS(item->window()->id(),c->window()->id()))delete item;
+				}
+			}
+		} else //Delete the spaste with the given id
+		{
+			while( (item = it.current()) != 0) 
+			{ 
+				++it;
+				if(item->getId() == iId)delete item;
+			}
+		}
+		return true;
+	}
 }
 
 /*
-    @doc: spaste.list
-    @type:
-        command
-    @title:
-        spaste.list
-    @short:
-        Lists all the running spaste processes.
-    @syntax:
-        spaste.list
-    @description:
-        This command will list in the window where it is executed all the current slow-paste [br]
-        processes, their identification numbers, and the windows where they are running. [br]
-    @seealso:
-        [cmd]spaste.clipboard[/cmd],
-        [cmd]spaste.file[/cmd],
-        [cmd]spaste.stop[/cmd],
-        [cmd]spaste.setdelay[/cmd]
+	@doc: spaste.list
+	@type:
+		command
+	@title:
+		spaste.list
+	@short:
+		Lists all the running spaste processes.
+	@syntax:
+		spaste.list
+	@description:
+		This command will list in the window where it is executed all the current slow-paste [br]
+		processes, their identification numbers, and the windows where they are running. [br]
+	@seealso:
+		[cmd]spaste.clipboard[/cmd],
+		[cmd]spaste.file[/cmd],
+		[cmd]spaste.stop[/cmd],
+		[cmd]spaste.setdelay[/cmd]
 */
 //--------------------------------------------------
 // spaste.list
@@ -265,34 +262,34 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
 { 
 	KviPointerListIterator<SPasteController> it(*g_pControllerList);
-    SPasteController *item;
-    
-    while( (item = it.current()) != 0)
-    {
-        ++it;
+	SPasteController *item;
+
+	while( (item = it.current()) != 0)
+	{
+		++it;
 		QString szWinId = item->window()->id();
-        c->window()->output(KVI_OUT_NONE,__tr2qs("Slow-paste ID:%d Window:%Q"),item->getId(),&szWinId);
-    }
+		c->window()->output(KVI_OUT_NONE,__tr2qs("Slow-paste ID:%d Window:%Q"),item->getId(),&szWinId);
+	}
 	return true;
 }
 
 /*
-    @doc: spaste.setdelay
-    @type:
-        command
-    @title:
-        spaste.setdelay
-    @short:
-        Sets the delay time in miliseconds for the spaste module command delay
-    @syntax:
-        spaste.setdelay <time_in_msecs:integer>
-    @description:
-        Sets the delay time in milliseconds for the spaste module command delay.
-    @seealso:
-        [cmd]spaste.clipboard[/cmd],
-        [cmd]spaste.file[/cmd],
-        [cmd]spaste.stop[/cmd],
-        [cmd]spaste.list[/cmd]
+	@doc: spaste.setdelay
+	@type:
+		command
+	@title:
+		spaste.setdelay
+	@short:
+		Sets the delay time in miliseconds for the spaste module command delay
+	@syntax:
+		spaste.setdelay <time_in_msecs:integer>
+	@description:
+		Sets the delay time in milliseconds for the spaste module command delay.
+	@seealso:
+		[cmd]spaste.clipboard[/cmd],
+		[cmd]spaste.file[/cmd],
+		[cmd]spaste.stop[/cmd],
+		[cmd]spaste.list[/cmd]
 */
 //-------------------------------------------------
 // spaste.setdelay
@@ -312,8 +309,8 @@ static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c)
 //-------------------------------------------------    
 static bool spaste_module_init(KviModule * m)
 {
-    g_pControllerList = new KviPointerList<SPasteController>;
-    g_pControllerList->setAutoDelete(false);
+	g_pControllerList = new KviPointerList<SPasteController>;
+	g_pControllerList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"file",spaste_kvs_cmd_file);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"clipboard",spaste_kvs_cmd_clipboard);
@@ -325,16 +322,16 @@ static bool spaste_module_init(KviModule * m)
 //-------------------------------------------------
 static bool spaste_module_cleanup(KviModule *m)
 {
-    while(g_pControllerList->first()) delete g_pControllerList->first();
-    delete g_pControllerList;
-    g_pControllerList = 0;
-    
+	while(g_pControllerList->first()) delete g_pControllerList->first();
+	delete g_pControllerList;
+	g_pControllerList = 0;
+
 	return true;
 }
 //-------------------------------------------------
 static bool spaste_module_can_unload(KviModule *m)
 {
-    return (g_pControllerList->isEmpty());
+	return (g_pControllerList->isEmpty());
 }
 //-------------------------------------------------
 KVIRC_MODULE(
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 011c29038..af5ace281 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -178,16 +178,16 @@ static bool str_kvs_fnc_len(KviKvsModuleFunctionCall * c)
 }
 
 /*
-    @doc: str.lowcase
-    @type:
-        function
-    @title:
-        $str.lowcase
-    @short:
-        Returns the given string with all characters turned to lower case
-    @syntax:
-        <string> $str.lowcase(<string_to_convert:string>)
-    @description:
+	@doc: str.lowcase
+	@type:
+		function
+	@title:
+		$str.lowcase
+	@short:
+		Returns the given string with all characters turned to lower case
+	@syntax:
+		<string> $str.lowcase(<string_to_convert:string>)
+	@description:
 		Returns the <string_to_convert> with all characters turned to lower case.
 		Warning: this function uses ISO-8859-1 locale to make the case translation.
 		If you want to use a locale aware translation mapping then please
@@ -284,16 +284,16 @@ static bool str_kvs_fnc_localeupcase(KviKvsModuleFunctionCall * c)
 }
 
 /*
-    @doc: str.isnumber
-    @type:
-        function
-    @title:
-        $str.isnumber
-    @short:
-        Returns 1 if the given string represents a number
-    @syntax:
-        <bool> $str.isnumber(<givenstring:string>)
-    @description:
+	@doc: str.isnumber
+	@type:
+		function
+	@title:
+		$str.isnumber
+	@short:
+		Returns 1 if the given string represents a number
+	@syntax:
+		<bool> $str.isnumber(<givenstring:string>)
+	@description:
 		Returns 1 if the given string represents a number, 0 if not.
 */
 
@@ -310,16 +310,16 @@ static bool str_kvs_fnc_isnumber(KviKvsModuleFunctionCall * c)
 
 
 /*
-    @doc: str.isunsignednumber
-    @type:
-        function
-    @title:
-        $str.isunsignednumber
-    @short:
-        Returns 1 if the given string represents an unsigned number
-    @syntax:
-        <bool> $str.isunsignednumber(<givenstring:string>)
-    @description:
+	@doc: str.isunsignednumber
+	@type:
+		function
+	@title:
+		$str.isunsignednumber
+	@short:
+		Returns 1 if the given string represents an unsigned number
+	@syntax:
+		<bool> $str.isunsignednumber(<givenstring:string>)
+	@description:
 		Returns 1 if the given string represents an unsigned number, 0 if not.
 */
 
@@ -438,16 +438,16 @@ static bool str_kvs_fnc_containsnocase(KviKvsModuleFunctionCall * c)
 }
 
 /*
-    @doc: str.equal
-    @type:
-        function
-    @title:
-        $str.equal
-    @short:
-        Returns 1 if the two string parameters are equal
-    @syntax:
-        <bool> $str.equal(<fromcompare:string>,<tocompare:string>)
-    @description:
+	@doc: str.equal
+	@type:
+		function
+	@title:
+		$str.equal
+	@short:
+		Returns 1 if the two string parameters are equal
+	@syntax:
+		<bool> $str.equal(<fromcompare:string>,<tocompare:string>)
+	@description:
 		Returns 1 if the two string parameters are equal. This function is case sensitive.
 	@seealso:
 		[fnc]$str.equalnocase[/fnc]()
@@ -466,16 +466,16 @@ static bool str_kvs_fnc_equal(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.equalnocase
-    @type:
-        function
-    @title:
-        $str.equalnocase
-    @short:
-        Returns 1 if the two string parameters are equal, case insensitive
-    @syntax:
-        <bool> $str.equalnocase(<fromcompare:string>,<tocompare:string>)
-    @description:
+	@doc: str.equalnocase
+	@type:
+		function
+	@title:
+		$str.equalnocase
+	@short:
+		Returns 1 if the two string parameters are equal, case insensitive
+	@syntax:
+		<bool> $str.equalnocase(<fromcompare:string>,<tocompare:string>)
+	@description:
 		Returns 1 if the two strngs parameters are equal, without taking the case of the
 		characters in consideration.
 	@seealso:
@@ -527,19 +527,19 @@ static bool str_kvs_fnc_cmp(KviKvsModuleFunctionCall * c)
 }
 
 /*
-    @doc: str.cmpnocase
-    @type:
-        function
-    @title:
-        $str.cmpnocase
-    @short:
-        Compare two strings alphabetically, case insensitive.
-    @syntax:
-        <bool> $str.cmpnocase(<fromcompare:string>,<tocompare:string>)
-    @description:
-        This function compares two strings alphabetically. If the first string is 'greater'
-        than the second, it will return a positive number, a negative number is the second is
-        greater and 0 if the two strings are equal. This function is case insensitive.
+	@doc: str.cmpnocase
+	@type:
+		function
+	@title:
+		$str.cmpnocase
+	@short:
+		Compare two strings alphabetically, case insensitive.
+	@syntax:
+		<bool> $str.cmpnocase(<fromcompare:string>,<tocompare:string>)
+	@description:
+		This function compares two strings alphabetically. If the first string is 'greater'
+		than the second, it will return a positive number, a negative number is the second is
+		greater and 0 if the two strings are equal. This function is case insensitive.
 	@seealso:
 		[fnc]$str.cmp[/fnc]()
 */
@@ -650,19 +650,19 @@ static bool str_kvs_fnc_findfirst(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.findfirstnocase
-    @type:
-        function
-    @title:
-        $str.findfirstnocase
-    @short:
-        Find the index of a substring in a string, case insensitive
-    @syntax:
-        <int> $str.findfirstnocase(<findIn:string>,<toFind:string>)
-    @description:
-        This function search in the string given as the first parameter for the string
-        given as his second parameter, and will return the index where is first located or
-        -1 if it's not located. This function is case insensitive.
+	@doc: str.findfirstnocase
+	@type:
+		function
+	@title:
+		$str.findfirstnocase
+	@short:
+		Find the index of a substring in a string, case insensitive
+	@syntax:
+		<int> $str.findfirstnocase(<findIn:string>,<toFind:string>)
+	@description:
+		This function search in the string given as the first parameter for the string
+		given as his second parameter, and will return the index where is first located or
+		-1 if it's not located. This function is case insensitive.
 */
 
 static bool str_kvs_fnc_findfirstnocase(KviKvsModuleFunctionCall * c)
@@ -676,19 +676,19 @@ static bool str_kvs_fnc_findfirstnocase(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.findlast
-    @type:
-        function
-    @title:
-        $str.findlast
-    @short:
-        Find the last index of a substring in a string
-    @syntax:
-        <int> $str.findlast(<findIn:string>,<toFind:string>)
-    @description:
-        This function search in the string given as the first parameter for the string
-        given as his second parameter, and will return the index where is last located or
-        -1 if it's not located.
+	@doc: str.findlast
+	@type:
+		function
+	@title:
+		$str.findlast
+	@short:
+		Find the last index of a substring in a string
+	@syntax:
+		<int> $str.findlast(<findIn:string>,<toFind:string>)
+	@description:
+		This function search in the string given as the first parameter for the string
+		given as his second parameter, and will return the index where is last located or
+		-1 if it's not located.
 */
 
 static bool str_kvs_fnc_findlast(KviKvsModuleFunctionCall * c)
@@ -702,19 +702,19 @@ static bool str_kvs_fnc_findlast(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.findlastnocase
-    @type:
-        function
-    @title:
-        $str.findlastnocase
-    @short:
-        Find the last index of a substring in a string, case insensitive
-    @syntax:
-        <int> $str.findlastnocase(<findIn:string>,<toFind:string>)
-    @description:
-        This function search in the string given as the first parameter for the string
-        given as his second parameter, and will return the index where is last located or
-        -1 if it's not located. This function is case insensitive.
+	@doc: str.findlastnocase
+	@type:
+		function
+	@title:
+		$str.findlastnocase
+	@short:
+		Find the last index of a substring in a string, case insensitive
+	@syntax:
+		<int> $str.findlastnocase(<findIn:string>,<toFind:string>)
+	@description:
+		This function search in the string given as the first parameter for the string
+		given as his second parameter, and will return the index where is last located or
+		-1 if it's not located. This function is case insensitive.
 */
 
 static bool str_kvs_fnc_findlastnocase(KviKvsModuleFunctionCall * c)
@@ -728,16 +728,16 @@ static bool str_kvs_fnc_findlastnocase(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.left
-    @type:
-        function
-    @title:
-        $str.left
-    @short:
+	@doc: str.left
+	@type:
+		function
+	@title:
+		$str.left
+	@short:
 		Returns a substring starting from the left until the given index.
-    @syntax:
-        <string> $str.left(<data:string>,<index:int>)
-    @description:
+	@syntax:
+		<string> $str.left(<data:string>,<index:int>)
+	@description:
 		This function returns a substring of the first string parameter which is the
 		string starting from the left until the index specified in the second parameter.
 */
@@ -754,16 +754,16 @@ static bool str_kvs_fnc_left(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.right
-    @type:
-        function
-    @title:
-        $str.right
-    @short:
+	@doc: str.right
+	@type:
+		function
+	@title:
+		$str.right
+	@short:
 		Returns a substring starting from the right until the given index.
-    @syntax:
-        <string> $str.right(<data:string>,<index:int>)
-    @description:
+	@syntax:
+		<string> $str.right(<data:string>,<index:int>)
+	@description:
 		This function returns a substring of the first string parameter which is the
 		string starting from the right until the index specified in the second parameter.
 		The index start counting at the last character and increase until the first.
@@ -781,16 +781,16 @@ static bool str_kvs_fnc_right(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.mid
-    @type:
-        function
-    @title:
-        $str.mid
-    @short:
+	@doc: str.mid
+	@type:
+		function
+	@title:
+		$str.mid
+	@short:
 		Returns a substring starting from a given index.
-    @syntax:
-        <string> $str.mid(<data:string>,<startidx:int>,<nchars:int>)
-    @description:
+	@syntax:
+		<string> $str.mid(<data:string>,<startidx:int>,<nchars:int>)
+	@description:
 		This function returns a substring of the first string parameter wich is the
 		string starting at the (numeric) index given with startidx and counting nchars
 		forward.
@@ -809,16 +809,16 @@ static bool str_kvs_fnc_mid(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.append
-    @type:
-        function
-    @title:
-        $str.append
-    @short:
+	@doc: str.append
+	@type:
+		function
+	@title:
+		$str.append
+	@short:
 		Append one string to another.
-    @syntax:
-        <string> $str.append(<string:string>,<toappend:string>)
-    @description:
+	@syntax:
+		<string> $str.append(<string:string>,<toappend:string>)
+	@description:
 		This function returns a string created appending the second string parameter
 		to the end of the first string parameter.
 */
@@ -834,16 +834,16 @@ static bool str_kvs_fnc_append(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.prepend
-    @type:
-        function
-    @title:
-        $str.prepend
-    @short:
+	@doc: str.prepend
+	@type:
+		function
+	@title:
+		$str.prepend
+	@short:
 		Prepend one string to another.
-    @syntax:
-        <string> $str.prepend(<string:string>,<toprepend:string>)
-    @description:
+	@syntax:
+		<string> $str.prepend(<string:string>,<toprepend:string>)
+	@description:
 		This function returns a string created prepending the second string parameter
 		to the start of the first string parameter.
 */
@@ -859,16 +859,16 @@ static bool str_kvs_fnc_prepend(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.insert
-    @type:
-        function
-    @title:
-        $str.insert
-    @short:
-        Inserts a substring in a string at a given index
-    @syntax:
-        <string> $str.insert(<string:string>,<substring:string>,<index:int>)
-    @description:
+	@doc: str.insert
+	@type:
+		function
+	@title:
+		$str.insert
+	@short:
+		Inserts a substring in a string at a given index
+	@syntax:
+		<string> $str.insert(<string:string>,<substring:string>,<index:int>)
+	@description:
 		Inserts the substring given in the second parameter in the string given in the
 		first parameter at the index given in the third parameter, then returns the
 		resulting string.
@@ -887,16 +887,16 @@ static bool str_kvs_fnc_insert(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.strip
-    @type:
-        function
-    @title:
-        $str.strip
-    @short:
+	@doc: str.strip
+	@type:
+		function
+	@title:
+		$str.strip
+	@short:
 		Returns a whitespace stripped string
-    @syntax:
-        <string> $str.strip(<string:string>)
-    @description:
+	@syntax:
+		<string> $str.strip(<string:string>)
+	@description:
 		Returns a left and right whitespace stripped version of the string given as the
 		first parameter.
 */
@@ -911,16 +911,16 @@ static bool str_kvs_fnc_strip(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.stripleft
-    @type:
-        function
-    @title:
-        $str.stripleft
-    @short:
+	@doc: str.stripleft
+	@type:
+		function
+	@title:
+		$str.stripleft
+	@short:
 		Returns a left whitespace stripped string
-    @syntax:
-        <string> $str.stripleft(<string:string>)
-    @description:
+	@syntax:
+		<string> $str.stripleft(<string:string>)
+	@description:
 		Returns a left whitespace stripped version of the string given as the
 		first parameter.
 */
@@ -941,16 +941,16 @@ static bool str_kvs_fnc_stripleft(KviKvsModuleFunctionCall * c)
 	return true;
 }
 /*
-    @doc: str.stripright
-    @type:
-        function
-    @title:
-        $str.stripright
-    @short:
+	@doc: str.stripright
+	@type:
+		function
+	@title:
+		$str.stripright
+	@short:
 		Returns a right whitespace stripped string
-    @syntax:
-        <string> $str.stripright(<string:string>)
-    @description:
+	@syntax:
+		<string> $str.stripright(<string:string>)
+	@description:
 		Returns a right whitespace stripped version of the string given as the
 		first parameter.
 */
@@ -969,16 +969,16 @@ static bool str_kvs_fnc_stripright(KviKvsModuleFunctionCall * c)
 }
 
 /*
-    @doc: str.stripcolors
-    @type:
-        function
-    @title:
-        $str.stripcolors
-    @short:
+	@doc: str.stripcolors
+	@type:
+		function
+	@title:
+		$str.stripcolors
+	@short:
 		Returns a mirc color codes stripped string
-    @syntax:
-        <string> $str.stripcolors(<string:string>)
-    @description:
+	@syntax:
+		<string> $str.stripcolors(<string:string>)
+	@description:
 		Removes all mirc color codes from a string, including also bold, underline, reverse,
 		icon, crypting and ctcp control codes.
 */
@@ -1254,7 +1254,7 @@ static bool str_kvs_fnc_rightfromlast(KviKvsModuleFunctionCall * c)
 			[cmd]if[/cmd]($str.match(H*y*i?K*a,%test))[cmd]echo[/cmd] "Matches H*y*i?K*a"
 		[/example]
 	@seealso:
-		[fnc]$str.matchnocase[/fnc]()
+		[fnc]$str.matchnocase[/fnc]
 */
 
 static bool str_kvs_fnc_match(KviKvsModuleFunctionCall * c)
@@ -1300,7 +1300,7 @@ static bool str_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 			[cmd]if[/cmd]($str.match(G*if?sx,%test))[cmd]echo[/cmd] "Matches G*if?sx"
 		[/example]
 	@seealso:
-		[fnc]$str.match[/fnc]()
+		[fnc]$str.match[/fnc]
 */
 
 static bool str_kvs_fnc_matchnocase(KviKvsModuleFunctionCall * c)
@@ -1343,7 +1343,7 @@ static bool str_kvs_fnc_matchnocase(KviKvsModuleFunctionCall * c)
 			[cmd]echo[/cmd] $str.word(4,%test)
 		[/example]
 	@seealso:
-		[fnc]$str.token[/fnc]()
+		[fnc]$str.token[/fnc]
 */
 
 static bool str_kvs_fnc_word(KviKvsModuleFunctionCall * c)
@@ -1408,8 +1408,8 @@ static bool str_kvs_fnc_word(KviKvsModuleFunctionCall * c)
 			[cmd]echo[/cmd] $str.token(1," hoursmintecd",%test)
 		[/example]
 	@seealso:
-		[fnc]$str.word[/fnc]()[br]
-		[fnc]$str.split[/fnc]()[br]
+		[fnc]$str.word[/fnc][br]
+		[fnc]$str.split[/fnc][br]
 */
 
 static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
@@ -2320,8 +2320,8 @@ KVIRC_MODULE(
 	"1.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)"\
 	"          (C) 2002 Juanjo Alvarez (juanjux@yahoo.es)" \
-    "          (C) 2005 Tonino Imbesi (grifisx at barmes dot org)" \
-    "          (C) 2005 Alessandro Carbone (noldor at barmes dot org)", // author & (C)
+	"          (C) 2005 Tonino Imbesi (grifisx at barmes dot org)" \
+	"          (C) 2005 Alessandro Carbone (noldor at barmes dot org)", // author & (C)
 	"Interface to the str system",
 	str_module_init,
 	0,
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 15125fd4e..ddbf25980 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -233,7 +233,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 		of "selection" (most notably X11) which is NOT the same as the clipboard.
 		See [fnc]$system.selection[/fnc]().
 	@seealso:
-		[fnc]$system.selection[/fnc](),
+		[fnc]$system.selection[/fnc],
 		[cmd]system.setClipboard[/cmd],
 		[cmd]system.setSelection[/cmd]
 */
@@ -263,8 +263,8 @@ static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall *c)
 		of "selection" (most notably X11) which is NOT the same as the clipboard.
 		See [fnc]$system.selection[/fnc]().
 	@seealso:
-		[fnc]$system.selection[/fnc](),
-		[fnc]$system.clipboard[/fnc](),
+		[fnc]$system.selection[/fnc],
+		[fnc]$system.clipboard[/fnc],
 		[cmd]system.setSelection[/cmd]
 */
 
@@ -296,8 +296,8 @@ static bool system_kvs_cmd_setClipboard(KviKvsModuleCommandCall * c)
 		Please note that this command will work only on systems that have the concept
 		of "selection" (most notably X11) which is NOT the same as the clipboard.
 	@seealso:
-		[fnc]$system.selection[/fnc](),
-		[fnc]$system.clipboard[/fnc](),
+		[fnc]$system.selection[/fnc],
+		[fnc]$system.clipboard[/fnc],
 		[cmd]system.setClipboard[/cmd]
 */
 
@@ -330,7 +330,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c)
 		On other systems this function will always return an empty string.
 		See [fnc]$system.clipboard[/fnc]().
 	@seealso:
-		[fnc]$system.clipboard[/fnc](),
+		[fnc]$system.clipboard[/fnc],
 		[cmd]system.setClipboard[/cmd],
 		[cmd]system.setSelection[/cmd]
 */
@@ -620,7 +620,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
 		Sets the enviroinement <variable> to the <value> string.[br]
 		If <value> is not given , the <variable> is unset.[br]
 	@seealso:
-		[fnc]$system.getenv[/fnc]()
+		[fnc]$system.getenv[/fnc]
 */
 
 
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 94f38035e..a81a394f7 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -147,10 +147,10 @@ static bool term_module_cleanup(KviModule *m)
 #ifdef COMPILE_KDE_SUPPORT
 	while(g_pTermWidgetList->first())delete g_pTermWidgetList->first();
 	delete g_pTermWidgetList;
-    g_pTermWidgetList = 0;
+	g_pTermWidgetList = 0;
 	while(g_pTermWindowList->first())g_pTermWindowList->first()->close();
 	delete g_pTermWindowList;
-    g_pTermWindowList = 0;
+	g_pTermWindowList = 0;
 #endif
 	return true;
 }
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index 36cdd7f75..44ccca655 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -41,7 +41,7 @@
 		if <iconName:string> is setted returns integer icon id or string filename, associciated with <iconName:string>[br]
 		if <iconName:string> isn't set returns hash where keys are the icon names, and values are the icon id's or filenames
 	@seealso:
-		[cmd]texticons.get[/cmd]
+		[fnc]$texticons.get[/fnc]
 */
 
 static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index daa16d65a..f4aa8d6ee 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -266,7 +266,7 @@ void KviTipWindow::closeEvent(QCloseEvent *e)
 
 
 static bool tip_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	QString szTipfilename;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szTipfilename)
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index 56952b7cf..9a2d39e68 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -28,23 +28,22 @@
 
 //-------------------------------------------------
 /*
-    @doc: tmphighlight.add
-    @type:
-        command
-    @title:
-        tmphighlight.add
-    @short:
-        Adds a user to the channel temporary highlight list
-    @syntax:
-        tmphighlight.add <nick:string>
-    @description:
-        This command adds a user to the channel temporary highlight list, so that user messages[br]
-        will be highlighted until you close the channel. This is useful when you are in a very crowded [br]
-        channel with lots of conversations running in parallel and you want to follow one of them.[br]
-        
-    @seealso:
-        [cmd]tmphighlight.remove[/cmd]
-        [cmd]tmphighlight.ishighlighted[/cmd]
+	@doc: tmphighlight.add
+	@type:
+		command
+	@title:
+		tmphighlight.add
+	@short:
+		Adds a user to the channel temporary highlight list
+	@syntax:
+		tmphighlight.add <nick:string>
+	@description:
+		This command adds a user to the channel temporary highlight list, so that user messages[br]
+		will be highlighted until you close the channel. This is useful when you are in a very crowded [br]
+		channel with lots of conversations running in parallel and you want to follow one of them.[br]
+	@seealso:
+		[fnc]$tmphighlight.remove[/fnc]
+		[fnc]$tmphighlight.ishighlighted[/fnc]
 */
 //-------------------------------------------
 // tmphighlight.add
@@ -56,92 +55,89 @@ static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
 	KVSM_PARAMETERS_END(c)
-    if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
-    if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
-    {
-        c->warning(__tr2qs("Current window is not a channel"));
-        return false;
-    }
-
-    ((KviChannel *)c->window())->addHighlightedUser(szNick);
+	if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
+	if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+	{
+		c->warning(__tr2qs("Current window is not a channel"));
+		return false;
+	}
+	
+	((KviChannel *)c->window())->addHighlightedUser(szNick);
 
 	return true;
 }
 //-------------------------------------------------
 /*
-    @doc: tmphighlight.remove
-    @type:
-        command
-    @title:
-        tmphighlight.remove
-    @short:
-        Remove a user from the channel temporary highlight list
-    @syntax:
-        tmphighlight.remove <nick:string>
-    @description:
-        This command remove a user from the channel temporary highlight list, so that user messages[br]
-        stop being highlighted.
-        
-    @seealso:
-        [cmd]tmphighlight.add[/cmd]
-        [cmd]tmphighlight.ishighlighted[/cmd]
+	@doc: tmphighlight.remove
+	@type:
+		command
+	@title:
+		tmphighlight.remove
+	@short:
+		Remove a user from the channel temporary highlight list
+	@syntax:
+		tmphighlight.remove <nick:string>
+	@description:
+		This command remove a user from the channel temporary highlight list, so that user messages[br]
+		stop being highlighted.
+	@seealso:
+		[fnc]$tmphighlight.add[/fnc]
+		[fnc]$tmphighlight.ishighlighted[/fnc]
 */
 //-------------------------------------------
 // tmphighlight.remove
 //-------------------------------------------
 
 static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c)
-{ 
-	
+{
 	QString szNick;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
 	KVSM_PARAMETERS_END(c)
-    if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
-	if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
-    {
-        c->warning(__tr2qs("Current window is not a channel"));
-        return false;
-    }
-    
-    ((KviChannel *)c->window())->removeHighlightedUser(szNick);
+	if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
+		if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+	{
+		c->warning(__tr2qs("Current window is not a channel"));
+		return false;
+	}
+
+	((KviChannel *)c->window())->removeHighlightedUser(szNick);
 	return true;
 }
 //-------------------------------------------------
 /*
-    @doc: tmphighlight.ishighlighted
-    @type:
-        function
-    @title:
-        $tmphighlight.ishighlighted
-    @short:
-        Returns 1 if the user is highlighted on this channel, 0 otherwise
-    @syntax:
-        <boolean> $tmphighlight.ishighlighted <nick:string>
-    @description:
-        This command returns 1 if the user is highlighted on this channel and on this session of 0 otherwise.
-        
-    @seealso:
-        [cmd]tmphighlight.add[/cmd]
-        [cmd]tmphighlight.remove[/cmd]
-        
+	@doc: tmphighlight.ishighlighted
+	@type:
+		function
+	@title:
+		$tmphighlight.ishighlighted
+	@short:
+		Returns 1 if the user is highlighted on this channel, 0 otherwise
+	@syntax:
+		<boolean> $tmphighlight.ishighlighted <nick:string>
+	@description:
+		This command returns 1 if the user is highlighted on this channel and on this session of 0 otherwise.
+	@seealso:
+		[fnc]$tmphighlight.add[/fnc]
+		[fnc]$tmphighlight.remove[/fnc]
+
 */
 //-------------------------------------------
 // tmphighlight.ishighlighted
 //-------------------------------------------
 
 static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szNick;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
 	KVSM_PARAMETERS_END(c)
-    if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
-	if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
-    {
-        c->warning(__tr2qs("Current window is not a channel"));
-        return false;
-    }
+	if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
+		if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+	{
+		c->warning(__tr2qs("Current window is not a channel"));
+		return false;
+	}
 	c->returnValue()->setBoolean(((KviChannel *)c->window())->isHighlightedUser(szNick));
 	return true;
 }
@@ -163,7 +159,7 @@ static bool tmphighlight_module_cleanup(KviModule *m)
 //-------------------------------------------------
 static bool tmphighlight_module_can_unload(KviModule *m)
 {
-    return true;
+	return true;
 }
 //-------------------------------------------------
 KVIRC_MODULE(
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index 54b965004..dba61ce2f 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -64,9 +64,9 @@
 		The toolbar will exist until [cmd]toolbar.destroy[/cmd] is called (you might want to add
 		an "uninstall" feature to your script).[br]
 	@seealso:
-		[fnc]$toolbar.exists[/fnc]()[br]
-		[cmd]toolbar.remove[/cmd][br]
-		[cmd]toolbar.show[/cmd][br]
+		[fnc]$toolbar.exists[/fnc],
+		[cmd]toolbar.remove[/cmd],
+		[cmd]toolbar.show[/cmd],
 		[cmd]toolbar.destroy[/cmd]
 */
 
@@ -119,9 +119,9 @@ static bool toolbar_kvs_cmd_create(KviKvsModuleCommandCall * c)
 		Clears the contents of the toolbar specified by <id>. If the
 		toolbar does not exist then a warning is printed unless the -q switch is used.[br]
 	@seealso:
-		[fnc]$toolbar.exists[/fnc]()[br]
-		[cmd]toolbar.remove[/cmd][br]
-		[cmd]toolbar.show[/cmd][br]
+		[fnc]$toolbar.exists[/fnc],
+		[cmd]toolbar.remove[/cmd],
+		[cmd]toolbar.show[/cmd],
 		[cmd]toolbar.destroy[/cmd]
 */
 
@@ -164,7 +164,7 @@ static bool toolbar_kvs_cmd_clear(KviKvsModuleCommandCall * c)
 		If the -q switch is specified then this command runs in quiet mode and
 		does not warn if the toolbar was not existing.
 	@seealso:
-		[fnc]$toolbar.exists[/fnc]()
+		[fnc]$toolbar.exists[/fnc],
 		[cmd]toolbar.create[/cmd]
 */
 
@@ -208,7 +208,7 @@ static bool toolbar_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 		You should execute this command only if you create the toolbar after KVIrc has been
 		started.[br]
 	@seealso:
-		[fnc]$toolbar.exists[/fnc]()
+		[fnc]$toolbar.exists[/fnc],
 		[cmd]toolbar.create[/cmd]
 */
 
@@ -255,8 +255,8 @@ static bool toolbar_kvs_cmd_show(KviKvsModuleCommandCall * c)
 		can be shown again by using [cmd]toolbar.show[/cmd].[br]
 		If you want to completely remove the toolbar definition use [cmd]toolbar.destroy[/cmd].[br]
 	@seealso:
-		[fnc]$toolbar.exists[/fnc]()
-		[cmd]toolbar.create[/cmd]
+		[fnc]$toolbar.exists[/fnc],
+		[cmd]toolbar.create[/cmd],
 		[cmd]toolbar.destroy[/cmd]
 */
 
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index ebe5c1e7f..557cffd77 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -483,7 +483,8 @@ TC_KVS_STRINGRET_INT_FUNCTION(name, name, "torrent_number")
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.stop[/cmd], [cmd]torrent.stopAll[/cmd], [cmd]torrent.startAll[/cmd]
+		[cmd]torrent.stop[/cmd], [cmd]torrent.stopAll[/cmd],
+		[cmd]torrent.startAll[/cmd]
 */
 TC_KVS_INT_COMMAND(start, start, "torrent_number")
 
@@ -503,7 +504,8 @@ TC_KVS_INT_COMMAND(start, start, "torrent_number")
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.stopAll[/cmd], [cmd]torrent.startAll[/cmd], [cmd]torrent.start[/cmd]
+		[cmd]torrent.stopAll[/cmd], [cmd]torrent.startAll[/cmd],
+		[cmd]torrent.start[/cmd]
 */
 TC_KVS_INT_COMMAND(stop, stop, "torrent_number")
 
@@ -618,7 +620,8 @@ TC_KVS_INT_INT_STRING_COMMAND(setFilePriority, setFilePriority, "torrent_number"
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.stopAll[/cmd], [cmd]torrent.start[/cmd], [cmd]torrent.stop[/cmd]
+		[cmd]torrent.stopAll[/cmd], [cmd]torrent.start[/cmd],
+		[cmd]torrent.stop[/cmd]
 */
 
 TC_KVS_SIMPLE_COMMAND(startAll, startAll)
@@ -639,7 +642,8 @@ TC_KVS_SIMPLE_COMMAND(startAll, startAll)
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.startAll[/cmd], [cmd]torrent.start[/cmd], [cmd]torrent.stop[/cmd]
+		[cmd]torrent.startAll[/cmd], [cmd]torrent.start[/cmd],
+		[cmd]torrent.stop[/cmd]
 */
 
 TC_KVS_SIMPLE_COMMAND(stopAll, stopAll)
@@ -661,7 +665,8 @@ TC_KVS_SIMPLE_COMMAND(stopAll, stopAll)
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.startAll[/cmd], [cmd]torrent.start[/cmd], [cmd]torrent.stop[/cmd]
+		[cmd]torrent.startAll[/cmd], [cmd]torrent.start[/cmd],
+		[cmd]torrent.stop[/cmd]
 */
 
 //MP_KVS_SIMPLE_COMMAND(list,list)
@@ -684,7 +689,7 @@ TC_KVS_SIMPLE_COMMAND(stopAll, stopAll)
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.detect[/cmd], [fnc]$torrent.client()[/fnc]
+		[cmd]torrent.detect[/cmd], [fnc]$torrent.client[/fnc]
 */
 
 TC_KVS_COMMAND(setClient)
@@ -759,7 +764,8 @@ TC_KVS_FUNCTION(client)
 		for more details about how it works.[br]
 	@seealso:
 		[module:torrent]torrent client documentation[/module],
-		[cmd]torrent.detect[/cmd], [cmd]torrent.setClient[/cmd], [cmd]torrent.client[/cmd]
+		[cmd]torrent.detect[/cmd], [cmd]torrent.setClient[/cmd],
+		[cmd]torrent.client[/cmd]
 */
 TC_KVS_FUNCTION(clientList)
 {
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index f49729c1a..ecdb9e6ec 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -838,18 +838,18 @@ static bool url_module_cleanup(KviModule *m)
 	}
 
 	delete g_pList;
-    g_pList = 0;
+	g_pList = 0;
 	delete g_pBanList;
-    g_pBanList = 0;
+	g_pBanList = 0;
 
 	delete g_pUrlDlgList;
-    g_pUrlDlgList = 0;
+	g_pUrlDlgList = 0;
 	delete g_pUrlAction;
 	g_pUrlAction = 0;
 
 
 	delete g_pUrlIconPixmap;
-    g_pUrlIconPixmap = 0;
+	g_pUrlIconPixmap = 0;
 
 	return true;
 }
@@ -862,7 +862,6 @@ static bool url_module_can_unload(KviModule *m)
 
 void url_module_config()
 {
-
 	if (!g_pConfigDialog) g_pConfigDialog = new ConfigDialog();
 }
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 222cbb01b..49c7fc380 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -114,7 +114,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
 		If the specified window does not exist a warning is printed (unless the -q switch is used)
 		but the execution continues normally.
 	@seealso:
-		[fnc]$window.hasOutput[/fnc]()
+		[fnc]$window.hasOutput[/fnc]
 */
 
 static bool window_kvs_cmd_clearOutput(KviKvsModuleCommandCall * c)
@@ -234,8 +234,8 @@ static bool window_kvs_cmd_undock(KviKvsModuleCommandCall * c)
 		no operation is performed. If the specified window
 		does not exist a warning is printed unless the -q switch is used.
 	@seealso:
-		[cmd]window.minimize[/cmd], [cmd]window.restore[/cmd], [fnc]$window.isMaxmimized[/cmd],
-		[fnc]$window.isMinimized[/cmd]
+		[cmd]window.minimize[/cmd], [cmd]window.restore[/cmd], [fnc]$window.isMaxmimized[/fnc],
+		[fnc]$window.isMinimized[/fnc]
 */
 
 static bool window_kvs_cmd_maximize(KviKvsModuleCommandCall * c)
@@ -264,8 +264,8 @@ static bool window_kvs_cmd_maximize(KviKvsModuleCommandCall * c)
 		no operation is performed. If the specified window
 		does not exist a warning is printed unless the -q switch is used.
 	@seealso:
-		[cmd]window.maximize[/cmd], [cmd]window.restore[/cmd], [fnc]$window.isMaxmimized[/cmd],
-		[fnc]$window.isMinimized[/cmd]
+		[cmd]window.maximize[/cmd], [cmd]window.restore[/cmd], [fnc]$window.isMaxmimized[/fnc],
+		[fnc]$window.isMinimized[/fnc]
 */
 
 static bool window_kvs_cmd_minimize(KviKvsModuleCommandCall * c)
@@ -294,8 +294,8 @@ static bool window_kvs_cmd_minimize(KviKvsModuleCommandCall * c)
 		no operation is performed. If the specified window
 		does not exist a warning is printed unless the -q switch is used.
 	@seealso:
-		[cmd]window.maximize[/cmd], [cmd]window.minimize[/cmd], [fnc]$window.isMaxmimized[/cmd],
-		[fnc]$window.isMinimized[/cmd]
+		[cmd]window.maximize[/cmd], [cmd]window.minimize[/cmd], [fnc]$window.isMaxmimized[/fnc],
+		[fnc]$window.isMinimized[/fnc]
 */
 
 static bool window_kvs_cmd_restore(KviKvsModuleCommandCall * c)
@@ -391,7 +391,7 @@ static bool window_kvs_cmd_demandAttention(KviKvsModuleCommandCall * c)
 		The form with no parameters works on the current window. If the specified window
 		doesn't exist then 0 is returned.
 	@seealso:
-		[fnc]$window.isMinimized[/fnc](), [cmd]window.maximize[/cmd],
+		[fnc]$window.isMinimized[/fnc], [cmd]window.maximize[/cmd],
 		[cmd]window.minimize[/cmd], [cmd]window.restore[/cmd]
 */
 
@@ -495,7 +495,7 @@ static bool window_kvs_fnc_activityTemperature(KviKvsModuleFunctionCall * c)
 		The form with no parameters works on the current window. If the specified window
 		doesn't exist then 0 is returned.
 	@seealso:
-		[fnc]$window.isMaximized[/fnc](), [cmd]window.maximize[/cmd],
+		[fnc]$window.isMaximized[/fnc], [cmd]window.maximize[/cmd],
 		[cmd]window.minimize[/cmd], [cmd]window.restore[/cmd]
 */
 
@@ -1047,11 +1047,11 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	}
 
 	KviUserWindow * wnd = new KviUserWindow(
-						c->window()->frame(),
-						szCaption,
-						iIcon,
-						pConsole,
-						iFlags);
+		c->window()->frame(),
+		szCaption,
+		iIcon,
+		pConsole,
+		iFlags);
 
 	c->window()->frame()->addWindow(wnd,!szFlags.contains('m'));
 	if(szFlags.contains('m'))wnd->minimize();
@@ -1182,7 +1182,7 @@ static bool window_kvs_cmd_setInputText(KviKvsModuleCommandCall * c)
 	@description:
 		Sets the window input text to <text>
 	@seealso:
-	[cmd]window.setInputText[/cmd] [fnc]$window.inputText[/fnc]
+		[cmd]window.setInputText[/cmd], [fnc]$window.inputText[/fnc]
 */
 
 static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c)
@@ -1223,7 +1223,8 @@ static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c)
 	@description:
 		Returns the window input line text
 	@seealso:
-	[cmd]window.setInputText[/cmd] [cmd]window.insertInInputText[/cmd]
+		[cmd]window.setInputText[/cmd],
+		[cmd]window.insertInInputText[/cmd]
 */
 
 static bool window_kvs_fnc_inputText(KviKvsModuleFunctionCall * c)
@@ -1341,7 +1342,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c)
 		[/example]
 
 	@seealso:
-		[fnc]$asciitohex[/fnc], [fnc]$features[/fnc]
+		[fnc]$asciiToHex[/fnc], [fnc]$features[/fnc]
 */