Merge branch 'master' into devel

Conflicts:
	README.md
	VERSION

README.md

@@ -42,13 +42,13 @@ If you are a developer and want to help make PyLink more portable, patches are h
     * ircmatch (`pip3 install ircmatch`)
     * *For password encryption*: Passlib (`pip3 install passlib`)
     * *For enhanced cron support (by removing stale PID files): psutil (`pip3 install psutil`)
-    * *For the servprotect plugin*: expiringdict (install this from [source](https://github.com/mailgun/expiringdict); installation is broken in pip due to [mailgun/expiringdict#13](https://github.com/mailgun/expiringdict/issues/13))
+    * *For the servprotect plugin*: expiringdict (`pip3 install expiringdict`)
 
 2) Clone the repository: `git clone https://github.com/GLolol/PyLink && cd PyLink`
 
 3) Pick your branch.
-    * By default you'll be on the **master** (stable) branch, which is mostly bugfix only (except when a new stable release is introduced). This means that new features or more intensive bug fixes may not always be included.
-    * Instead, the **devel** (pre-release) branch is where active development goes, and it can be accessed by running `git checkout devel` in your Git tree.
+    * By default you'll be on the **master** branch, which contains the latest stable code. This branch is recommended for production networks that don't require new features or intensive bug fixes as they are developed.
+    * The **devel** branch is where active development goes, and it can be accessed by running `git checkout devel` in your Git tree.
 
 4) Install PyLink using `python3 setup.py install` (global install) or `python3 setup.py install --user` (local install)
     * Note: `--user` is a *literal* string; *do not* replace it with your username.

RELNOTES.md

@@ -1,3 +1,27 @@
+# PyLink 1.2.1
+The "Dancer" release. Changes from 1.2.0:
+
+#### Bug fixes
+- unreal: fix TypeError when relaying prefix modes via `mode()`
+- Fix wrong database and PID filenames if the config file name includes a period (".")
+- automode: don't send empty mode lines if no users match the ACL
+- networks: check in "remote" that the remote network is actually connected
+- Fix commonly reported crashes on `logging:` config syntax errors ([49136d5](https://github.com/GLolol/PyLink/commit/49136d5abd609fd5e3ba2ec2e42a0443118e62ab))
+- Backported fixes from 2.0-dev:
+    - p10: fix wrong hook name for user introduction
+    - clientbot: warn when an outgoing message is blocked (e.g. due to bans) (#497)
+    - ts6: fix setting real host of users to 'None' if it wasn't given
+
+#### Misc changes
+- Removed incorrect descriptions regarding P10 `extended_accounts`. Both X3 and atheme support extended accounts, and this needs to match your IRCd settings regardless.
+- Updated definitions in `channel/user-modes.csv`.
+
+#### Internal improvements
+- Backported improvements from 2.0-dev:
+    - Fix support for Hybrid 8.x trunk
+    - Minor logging cleanup for relay and `Irc.matchHost()`.
+    - Fix cmode `+p` mapping on TS6 networks.
+
 # PyLink 1.2.0
 The "Dragons" release. Changes since 1.2.0-rc1:
 

docs/faq.md

@@ -65,10 +65,6 @@ However, if the nick mentioned is legal on IRC, this issue is likely caused by a
 
 Load the `relay_clientbot` plugin. https://github.com/GLolol/PyLink/blob/e1fab8c/example-conf.yml#L303-L306
 
-Also, make sure that nothing is blocking the Clientbot from actually sending text, such as blockcolor/regmoderated modes or bans. Temporarily setting the PyLink log level to DEBUG can assist in debugging.
-
-Future PyLink versions will have better handling for these errors; see https://github.com/GLolol/PyLink/issues/497.
-
 ### Relay is occasionally dropping users from channels!
 
 This usually indicates a serious bug in either Relay or PyLink's protocol modules, and should be reported as an issue. When asking for help, please state which IRCds your PyLink instance is linking to: specifically, which IRCd the missing users are *from* and which IRCd the users are missing *on*. Also, be prepared to send debug logs as you reproduce the issue!