--- a/mcabber/mcabberrc.example Sun Oct 11 15:59:53 2009 +0200
+++ b/mcabber/mcabberrc.example Sun Oct 11 16:00:53 2009 +0200
@@ -36,10 +36,10 @@
# SSL/TLS options:
# TLS is now regarded as the default encryption for connecting to jabber.
-# You can require TLS by setting tls to 1. If your jabber server
+# You can require TLS by setting tls to 1. If your jabber server
# still doesn't support TLS, you can use the old-style SSL by setting
-# ssl to 1. It's not possible to use old-style SSL and TLS together.
-set ssl = 0
+# ssl to 1. It's not possible to use old-style SSL and TLS together.
+#set ssl = 0
set tls = 1
# Moreover, it's possible to check whether the fingerprint of the
# ssl certificate matches ssl_fingerprint.
@@ -355,7 +355,7 @@
#set color_rosterselmsg = red
#set color_rosternewmsg = red
-# You can color roster items by their status and JID. For example, to have
+# You can color roster items by their status and JID. For example, to have
# all roster items white, just all contacts from jabber.org that are away,
# not available or do not disturb yellow, you do this:
#
@@ -426,7 +426,7 @@
# Set 'info' to anything you'd like to see in your lower status line.
#set info = woot
#
-# Set 'url_regex' to a regular expression matching urls. If it matches an
+# Set 'url_regex' to a regular expression matching urls. If it matches an
# url in an incoming messages, it'll print it to the log window.
#set url_regex = "(((https?|ftps?|nntp)://)|www[.][-a-z0-9.]+|(mailto:|news:))(%[0-9A-F]{2}|[-_.!~*';/?:@&=+$,#[:alnum:]])+"