From 086a5f449672d3aa0059ec427b908478c42f4409 Mon Sep 17 00:00:00 2001
From: James Lu <james@overdrivenetworks.com>
Date: Tue, 26 Jun 2018 14:44:07 -0700
Subject: [PATCH] example-conf, relay, utils: replace 2.0-alpha4 references
 with 2.0-beta1

---
 example-conf.yml |  4 ++--
 plugins/relay.py | 10 +++++-----
 utils.py         |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/example-conf.yml b/example-conf.yml
index 26de96c..6986926 100644
--- a/example-conf.yml
+++ b/example-conf.yml
@@ -258,7 +258,7 @@ servers:
         # Determines whether IPv6 should be used for this connection. Should the ip:
         # above be a hostname instead of an IP, this will also affect whether A records
         # (IPv4) or AAAA records (IPv6) will be used in resolving it.
-        # As of PyLink 2.0-alpha4, you can leave this unset for direct connections to IP addresses;
+        # As of PyLink 2.0-beta1, you can leave this unset for direct connections to IP addresses;
         # the address type will be automatically detected.
         #ipv6: yes
 
@@ -717,7 +717,7 @@ relay:
     # network should be in which pool. A network can be part of one pool, multiple
     # pools, or none at all.
     # This option replaces the "relay::show_ips" and network-specific "relay_no_ips"
-    # options, which are DEPRECATED as of 2.0-alpha4.
+    # options, which are DEPRECATED as of 2.0-beta1.
     #ip_share_pools:
     #    - ["net1", "net2", "net3"]
     #    - ["net1", "meganet"]
diff --git a/plugins/relay.py b/plugins/relay.py
index 729ec38..4aa8c26 100644
--- a/plugins/relay.py
+++ b/plugins/relay.py
@@ -74,12 +74,12 @@ def main(irc=None):
                 initialize_all(ircobj)
 
             if 'relay_no_ips' in ircobj.serverdata:
-                log.warning('(%s) The "relay_no_ips" option is deprecated as of 2.0-alpha4. Consider migrating '
+                log.warning('(%s) The "relay_no_ips" option is deprecated as of 2.0-beta1. Consider migrating '
                             'to "ip_share_pools", which provides more fine-grained control over which networks '
                             'see which networks\' IPs.', netname)
 
     if 'relay' in conf.conf and 'show_ips' in conf.conf['relay']:
-        log.warning('The "relay::show_ips" option is deprecated as of 2.0-alpha4. Consider migrating '
+        log.warning('The "relay::show_ips" option is deprecated as of 2.0-beta1. Consider migrating '
                     'to "ip_share_pools", which provides more fine-grained control over which networks '
                     'see which networks\' IPs.')
 
@@ -387,7 +387,7 @@ def spawn_relay_user(irc, remoteirc, user, times_tagged=0, reuse_sid=None):
                       'working SID).', irc.name, user, nick, remoteirc.name)
             return
 
-    # This is the legacy (< 2.0-alpha4) control for relay IP sharing
+    # This is the legacy (< 2.0-beta1) control for relay IP sharing
     try:
         showRealIP = conf.conf['relay']['show_ips'] and not \
                      irc.serverdata.get('relay_no_ips') and not \
@@ -396,7 +396,7 @@ def spawn_relay_user(irc, remoteirc, user, times_tagged=0, reuse_sid=None):
     except KeyError:
         showRealIP = False
 
-    # New (>= 2.0-alpha4) IP sharing is configured via pools of networks
+    # New (>= 2.0-beta1) IP sharing is configured via pools of networks
     showRealIP = showRealIP or _has_common_pool(irc.name, remoteirc.name, "ip_share_pools")
     if showRealIP:
         ip = userobj.ip
@@ -2634,7 +2634,7 @@ def linkacl(irc, source, args):
     elif cmd == 'allow':
         if whitelist:
             # In whitelist mode, ALLOW *adds* to the whitelist
-            if 'allowed_nets' not in entry:  # Upgrading from < 2.0-alpha4
+            if 'allowed_nets' not in entry:  # Upgrading from < 2.0-beta1
                 entry['allowed_nets'] = set()
             db[relay]['allowed_nets'].add(remotenet)
         else:
diff --git a/utils.py b/utils.py
index 4b94cb1..05576c3 100644
--- a/utils.py
+++ b/utils.py
@@ -498,7 +498,7 @@ class ServiceBot():
                         # Single newlines are stripped so that word wrap can be applied in source
                         # code without affecting the output on IRC.
                         # (On the same topic, real line wrapping on IRC is done in irc.msg() as of
-                        #  2.0-alpha4)
+                        #  2.0-beta1)
                         next_line = ''
                         for linenum, line in enumerate(lines[1:], 1):
                             stripped_line = line.strip()