Merge commit 'refs/merge-requests/5' of git://gitorious.org/inspircd/inspircd into insp20

5 files changed, 14 insertions, 17 deletions

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index fff58a868..7dff4bd7d 100644
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -164,12 +164,11 @@
 
 <bind address="" port="6660-6669" type="clients">
 
-# When linking servers, the openssl and gnutls transports are completely
+# When linking servers, the openssl and gnutls implementations are completely
 # link-compatible and can be used alongside each other
 # on each end of the link without any significant issues.
-# Transports can only be used on server blocks.
-# Supported Transports are: "ziplinks", "openssl" and "gnutls".
-# You must load m_ziplinks module for zip, m_ssl_openssl for openssl
+# Supported ssl types are: "openssl" and "gnutls".
+# You must load, m_ssl_openssl for openssl
 # or m_ssl_gnutls for gnutls.
 
 <bind address="" port="7000,7001" type="servers">
diff --git a/docs/inspircd.helpop-full.example b/docs/inspircd.helpop-full.example
index 4e679901c..f85aab9f5 100644
--- a/docs/inspircd.helpop-full.example
+++ b/docs/inspircd.helpop-full.example
@@ -96,13 +96,13 @@ and S queries the status.">
 
 Authenticate for a vhost using the specified username and password.">
 
-<helpop key="remove" value="/REMOVE [channel] [nick] {[reason]}
+<helpop key="remove" value="/REMOVE [nick] [channel] {[reason]}
 
 Removes a user from a channel you specify. You must be at least a
 channel halfoperator to remove a user. A removed user will part with
 a message stating they were removed from the channel and by whom.">
 
-<helpop key="fpart" value="/FPART [nick] [channel] {[reason]}
+<helpop key="fpart" value="/FPART [channel] [nick] {[reason]}
 
 This behaves identically to /REMOVE, the only difference is that that
 [channel] and [nick] parameters are switched around to match /KICK's
@@ -132,7 +132,7 @@ Valid SILENCE Flags
 Multiple letters may be specified. For an exception, you msut pair x
 with what you want excepted. For example, if you wanted to except
 everything from people with a host matching *.foo.net, you would do
-/SILENCE +xa *!*@*.foo.net
+/SILENCE +*!*@*.foo.net xa
 
 /SILENCE without a parameter will list the hostmasks that you have silenced.">
 
diff --git a/docs/links.conf.example b/docs/links.conf.example
index 2357220f9..27213f784 100644
--- a/docs/links.conf.example
+++ b/docs/links.conf.example
@@ -40,14 +40,12 @@
 
       # ssl: If defined, this states extra modules that will be used when
       # making an outbound connection to the server. Options are: "openssl"
-      # and "gnutls" for encryption (they are compatible with each other) and
-      # "ziplinks" for compression. You must use the same (or a compatible)
-      # transport on both sides of the link.
+      # and "gnutls" for encryption (they are compatible with each other).
+      # You must use the same (or a compatible) transport on both sides of the link.
       #
       # You will need to load the m_ssl_openssl.so module for openssl,
-      # m_ssl_gnutls.so for gnutls or m_ziplinks.so for ziplinks. The server
-      # port that you connect to must be capable of accepting this type of
-      # connection.
+      # m_ssl_gnutls.so for gnutls. The server port that you connect to
+      # must be capable of accepting this type of connection.
       ssl="gnutls"
 
       # fingerprint: If defined, this option will force servers to be
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index bd1e1ffe0..e99644298 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -317,7 +317,7 @@ class ModuleSilence : public Module
 		{
 			if (IS_LOCAL(i->first))
 			{
-				if (MatchPattern(i->first, sender, public_silence) == MOD_RES_ALLOW)
+				if (MatchPattern(i->first, sender, public_silence) == MOD_RES_DENY)
 				{
 					exempt_list.insert(i->first);
 				}
diff --git a/src/server.cpp b/src/server.cpp
index 8c8e1b0dc..91b911ff2 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -75,9 +75,9 @@ void InspIRCd::BuildISupport()
 {
 	// the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
 	std::stringstream v;
-	v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes - 1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax - 1;
-	v << " CASEMAPPING=rfc1459 STATUSMSG=" << Modes->BuildPrefixes(false) << " CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic - 1 << " KICKLEN=" << Config->Limits.MaxKick - 1 << " MAXTARGETS=" << Config->MaxTargets - 1;
-	v << " AWAYLEN=" << Config->Limits.MaxAway - 1 << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+	v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax;
+	v << " CASEMAPPING=rfc1459 STATUSMSG=" << Modes->BuildPrefixes(false) << " CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets;
+	v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
 	Config->data005 = v.str();
 	FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();