Merge branch 'master' into develop

Author: Bernardo-MG

.travis.yml

@@ -46,5 +46,5 @@ after_success:
   # Documentation deployment
   - ~/.scripts/sphinx/build-html.sh $DO_DEPLOY_DOCS docs
   - cd ~/sphinx/build/html
-  - ~/.scripts/deploy/deploy-ssh.sh $DO_DEPLOY_DOCS_RELEASE $DEPLOY_USERNAME $DEPLOY_PASSWORD $DEPLOY_HOST $DEPLOY_PORT $DEPLOY_PATH_RELEASE
-  - ~/.scripts/deploy/deploy-ssh.sh $DO_DEPLOY_DOCS_DEVELOP $DEPLOY_USERNAME $DEPLOY_PASSWORD $DEPLOY_HOST $DEPLOY_PORT $DEPLOY_PATH_DEVELOP
+  - ~/.scripts/deploy/deploy-ssh.sh $DO_DEPLOY_DOCS_RELEASE $DEPLOY_DOCS_USERNAME $DEPLOY_DOCS_PASSWORD $DEPLOY_DOCS_HOST $DEPLOY_DOCS_PORT $DEPLOY_DOCS_PATH_RELEASE
+  - ~/.scripts/deploy/deploy-ssh.sh $DO_DEPLOY_DOCS_DEVELOP $DEPLOY_DOCS_USERNAME $DEPLOY_DOCS_PASSWORD $DEPLOY_DOCS_HOST $DEPLOY_DOCS_PORT $DEPLOY_DOCS_PATH_DEVELOP

README.rst

@@ -19,10 +19,10 @@ operating with it on any Python application.
     :alt: Dice Notation Tools for Python Pypi package page
 
 .. image:: https://img.shields.io/badge/docs-release-blue.svg
-    :target: http://docs.wandrell.com/dice-notation-python
+    :target: http://docs.bernardomg.com/dice-notation-python
     :alt: Dice Notation Tools for Python latest documentation
 .. image:: https://img.shields.io/badge/docs-develop-blue.svg
-    :target: http://docs.wandrell.com/development/dice-notation-python
+    :target: http://docs.bernardomg.com/development/dice-notation-python
     :alt: Dice Notation Tools for Python development documentation
 
 Features
@@ -121,8 +121,8 @@ License
 The project has been released under the `MIT License`_.
 
 .. _GitHub project page: https://github.com/Bernardo-MG/dice-notation-python
-.. _latest docs: http://docs.wandrell.com/dice-notation-python
-.. _development docs: http://docs.wandrell.com/development/dice-notation-python
+.. _latest docs: http://docs.bernardomg.com/dice-notation-python
+.. _development docs: http://docs.bernardomg.com/development/dice-notation-python
 .. _Pypi package: https://pypi.python.org/pypi/dice-notation
 .. _MIT License: http://www.opensource.org/licenses/mit-license.php
 .. _project issues tracker: https://github.com/Bernardo-MG/dice-notation-python/issues

docs/source/conf.py

@@ -100,7 +100,7 @@
     'keywords': 'dice, dice notation, parser, Python, RPG',
     'author_name': ','.join(authors),
     'author_url': 'https://github.com/Bernardo-MG',
-    'twitter_id': '@Wandrell_BMG',
+    'twitter_id': '@BernardoMartG',
     'publish_date': datetime.datetime.now().date(),
     'years': '2016',
     'scm_name': 'Github',

setup.py

@@ -63,7 +63,7 @@ def run_tests(self):
     version=version_lib,
     description='Dice notation tools',
     author='Bernardo Martínez Garrido',
-    author_email='programming@wandrell.com',
+    author_email='programming@bernardomg.com',
     license='MIT',
     url='https://github.com/Bernardo-MG/dice-notation-python',
     download_url='https://pypi.python.org/pypi/dice-notation',