Merge branch '2.0.6'

jquast · Feb 15, 2015 · 11da63f · 11da63f
2 parents dec648a + 0892756
commit 11da63f
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 1,198 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.0.6
+  - bugfix: ASCII colly diz with extended chars was causing an error
+  - deprecation: the "extras" subfolder of default script has been
+    moved to https://github.com/x84-extras
 2.0.5
   - bugfix: UnicodeDecodeError when quoting some messages
   - bugfix: '__uploads__' folder not hidden by sftp as intended

diff --git a/docs/default_api.rst b/docs/default_api.rst
@@ -4,7 +4,9 @@ Customizing your board
 
 The ``default.ini`` file option, *scriptpath*, of section *[system]*, defines folder ``'default/'``, containing the scripts documented in this section.
 
-This folder may be changed to a folder of your own chosing, and populated with your own scripts. A good start would be to copy the default/ folder, or even perform a checkout from github.
+Additional scripts can be found at https://github.com/x84-extras
+
+This folder may be changed to a folder of your own choosing, and populated with your own scripts. A good start would be to copy the default/ folder, or even perform a checkout from github.
 
 By default, *matrix.py* is called on-connect, with variations for sftp and ssh as *matrix_sftp.py* and *matrix_ssh.py* set by the ``default.ini`` file option *script* of section *[matrix]*. This script calls out to *nua.py* for new account creation, *top.py* when authenticated, and *main.py* for a main menu.
 

diff --git a/x84/default/extras/__init__.py b/x84/default/extras/__init__.py
diff --git a/x84/default/extras/art/automsg.ans b/x84/default/extras/art/automsg.ans
diff --git a/x84/default/extras/automsg.py b/x84/default/extras/automsg.py
diff --git a/x84/default/extras/bulletins.py b/x84/default/extras/bulletins.py
diff --git a/x84/default/extras/debug.py b/x84/default/extras/debug.py