Commit e82386cf authored by Guillaume Binet's avatar Guillaume Binet

Removing some last "err" references.

parent 969b1953
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Err documentation build configuration file, created by
# Errbot documentation build configuration file, created by
# sphinx-quickstart on Fri Sep 13 17:24:59 2013.
#
# This file is execfile()d with the current directory set to its containing dir.
......
......@@ -79,7 +79,7 @@ Please pay attention when you install a plugin as it may have additional depende
If the plugin contains a `requirements.txt` file then Errbot will automatically check the requirements listed within and warn you when you are missing any.
Additionally, if you set :code:`AUTOINSTALL_DEPS` to :code:`True` in your **config.py**, Errbot will use pip to install any missing dependencies automatically.
If you have installed Err in a virtualenv, this will run the equivalent of :code:`pip install -r requirements.txt`.
If you have installed Errbot in a virtualenv, this will run the equivalent of :code:`pip install -r requirements.txt`.
If no virtualenv is detected, the equivalent of :code:`pip install --user -r requirements.txt` is used to ensure the package(s) is/are only installed for the user running Err.
......
......@@ -22,7 +22,7 @@ __all__ = ['BotPlugin', 'CommandError', 'Command', 'webhook', 'webroute', 'webvi
log = logging.getLogger(__name__)
webroute = route # this allows plugins to expose dynamic webpages on err embedded webserver
webroute = route # this allows plugins to expose dynamic webpages on Errbot embedded webserver
webview = view # this allows to use the templating system
# TODO: Remove, this is for backend backward compatibility
......
......@@ -46,7 +46,7 @@ USER_IS_BOT_HELPTEXT = (
"channels itself (you must invite the bot to channels instead, "
"it will auto-accept) nor invite people.\n\n"
"If you need this functionality, you will have to create a "
"regular user account and connect Err using that account. "
"regular user account and connect Errbot using that account. "
"For this, you will also need to generate a user token at "
"https://api.slack.com/web."
)
......
......@@ -94,7 +94,7 @@ def main():
execution_dir = getcwd()
# By default insert the execution path (useful to be able to execute err from
# By default insert the execution path (useful to be able to execute Errbot from
# the source tree directly without installing it.
sys.path.insert(0, execution_dir)
......
##########################################################################
# #
# This is the config-template for Err. This file should be copied and #
# renamed to config.py, then modified as you see fit to run Err the way #
# you like it. #
# renamed to config.py, then modified as you see fit to run Errbot #
# the way you like it. #
# #
# As this is a regular Python file, note that you can do variable #
# assignments and the likes as usual. This can be useful for example if #
......@@ -19,7 +19,7 @@
import logging
##########################################################################
# Core Err configuration #
# Core Errbot configuration #
##########################################################################
# BACKEND selection.
......@@ -85,7 +85,7 @@ BOT_DATA_DIR = '/var/lib/err'
BOT_EXTRA_PLUGIN_DIR = None
# If you use an external backend as a plugin,
# this is where you tell err where to find it.
# this is where you tell Errbot where to find it.
# BOT_EXTRA_BACKEND_DIR = '/opt/errbackends'
# If you want only a subset of the core plugins that are bundled with errbot, you can specify them here.
......@@ -100,9 +100,9 @@ BOT_EXTRA_PLUGIN_DIR = None
PLUGINS_CALLBACK_ORDER = (None, )
# Should plugin dependencies be installed automatically? If this is true
# then Err will use pip to install any missing dependencies automatically.
# then Errbot will use pip to install any missing dependencies automatically.
#
# If you have installed Err in a virtualenv, this will run the equivalent
# If you have installed Errbot in a virtualenv, this will run the equivalent
# of `pip install -r requirements.txt`.
# If no virtualenv is detected, the equivalent of `pip install --user -r
# requirements.txt` is used to ensure the package(s) is/are only installed for
......@@ -128,7 +128,7 @@ BOT_LOG_SENTRY = False
SENTRY_DSN = ''
SENTRY_LOGLEVEL = BOT_LOG_LEVEL
# Execute commands in asynchronous mode. In this mode, Err will spawn 3
# Execute commands in asynchronous mode. In this mode, Errbot will spawn 10
# separate threads to handle commands, instead of blocking on each
# single command.
# BOT_ASYNC = True
......@@ -194,7 +194,7 @@ BOT_ADMINS = ('gbin@localhost',)
# CHATROOM_PRESENCE = ('err@conference.server.tld',)
# The FullName, or nickname, your bot should use. What you set here will
# be the nickname that Err shows in chatrooms. Note that some XMPP
# be the nickname that Errbot shows in chatrooms. Note that some XMPP
# implementations, notably HipChat, are very picky about what name you
# use. In the case of HipChat, make sure this matches exactly with the
# name you gave the user.
......@@ -331,9 +331,9 @@ REVERSE_CHATROOM_RELAY = {}
# To use only unencrypted plain auth:
#XMPP_FEATURE_MECHANISMS = {'use_mech': 'PLAIN', 'unencrypted_plain': True, 'encrypted_plain': False}
# Modify the default keep-alive interval. By default, Err will send
# Modify the default keep-alive interval. By default, Errbot will send
# some whitespace to the XMPP server every 300 seconds to keep the TCP
# connection alive. On some servers, or when running Err from behind
# connection alive. On some servers, or when running Errbot from behind
# a NAT router, the default might not be fast enough and you will need
# to set it to a lower value.
#
......
......@@ -36,7 +36,7 @@ log = logging.getLogger(__name__)
# noinspection PyAbstractClass
class ErrBot(Backend, StoreMixin):
""" ErrBot is the layer of Err that takes care of the plugin management and dispatching
""" ErrBot is the layer taking care of commands management and dispatching.
"""
__errdoc__ = """ Commands related to the bot administration """
MSG_ERROR_OCCURRED = 'Computer says nooo. See logs for details'
......
......@@ -4,7 +4,7 @@ Module = vcheck
Core = True
[Documentation]
Description = This is calling home to check if err has a new version available
Description = This is calling home to check if Errbot has a new version available
[Python]
Version = 2+
\ No newline at end of file
......@@ -4,7 +4,7 @@ Module = webserver
Core = True
[Documentation]
Description = This is a plugin for enabling webhooks and web interface to err
Description = This is a plugin for enabling webhooks and web interface to Errbot.
[Python]
Version = 2+
\ No newline at end of file
......@@ -160,13 +160,13 @@ def check_errbot_version(name: str, min_version: str, max_version: str):
current_version = version2array(VERSION)
if min_version and version2array(min_version) > current_version:
raise IncompatiblePluginException(
'The plugin %s asks for err with a minimal version of %s while err is version %s' % (
'The plugin %s asks for Errbot with a minimal version of %s while Errbot is version %s' % (
name, min_version, VERSION)
)
if max_version and version2array(max_version) < current_version:
raise IncompatiblePluginException(
'The plugin %s asks for err with a maximal version of %s while err is version %s' % (
'The plugin %s asks for Errbot with a maximal version of %s while Errbot is version %s' % (
name, max_version, VERSION)
)
......
# just the current version of err
# it is used for deployment on pypi AND for version checking at plugin load time
# Just the current version of Errbot.
# It is used for deployment on pypi AND for version checking at plugin load time.
VERSION = '9.9.9' # leave it at 9.9.9 on master until it is branched to a version.
......@@ -3,7 +3,7 @@ Name = Mention
Module = mention
[Documentation]
Description = An Err mention test plugin
Description = An Errbot mention test plugin.
[Python]
Version = 2+
......@@ -77,7 +77,7 @@ def test_plugin_callbacks(testbot): # noqa
assert p.events.get(timeout=5) == "callback_room_joined newroom"
p.query_room('newroom').topic = "Err rocks!"
assert p.events.get(timeout=5) == "callback_room_topic Err rocks!"
assert p.events.get(timeout=5) == "callback_room_topic Errbot rocks!"
p.query_room('newroom').leave()
assert p.events.get(timeout=5) == "callback_room_left newroom"
......@@ -121,4 +121,4 @@ def test_botcommands(testbot): # noqa
assert "err" in testbot.exec_command("!room occupants testroom")
assert "No topic is set for testroom" in testbot.exec_command("!room topic testroom")
assert "Topic for testroom set." in testbot.exec_command("!room topic testroom 'Err rocks!'")
assert "Topic for testroom: Err rocks!" in testbot.exec_command("!room topic testroom")
assert "Topic for testroom: Errbot rocks!" in testbot.exec_command("!room topic testroom")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment