AnsibleWorks -> Ansible

13 files changed, 32 insertions, 32 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b20e5f78aa..afa1b2bf24 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ You can help share Ansible with others by telling friends and colleagues, writin
 or presenting at user groups (like DevOps groups or the local LUG or BUG).  You are also 
 welcome to share slides on speakerdeck, sign up for a free account and tag it “Ansible”. On Twitter, 
 you can also share things with #ansible and may wish 
-to follow [@AnsibleWorks](https://twitter.com/ansibleworks).
+to follow [@Ansible](https://twitter.com/ansible).
 
 Sharing Content and Tips
 ------------------------
@@ -73,7 +73,7 @@ in!  Patches should be made against the 'devel' branch.
 
 Contributions can be for new features like modules, or to fix bugs you or others have found. If you 
 are interested in writing new modules to be included in the core Ansible distribution, please refer 
-to the [Module Developers documentation on our website](http://www.ansibleworks.com/docs/developing_modules.html).
+to the [Module Developers documentation on our website](http://docs.ansible.com/developing_modules.html).
 
 Ansible's aesthetic encourages simple, readable code and consistent, conservatively extending, 
 backwards-compatible improvements.  Code developed for Ansible needs to support Python 2.6+, 
@@ -121,7 +121,7 @@ Online Resources
 Documentation
 -------------
 
-The main ansible documentation can be found at [ansibleworks.com/docs](http://ansibleworks.com/docs). 
+The main ansible documentation can be found at [docs.ansible.com](http://docs.ansible.com). 
 As mentioned above this is an open source project, so we accept contributions to the documentation. 
 You can also find some best practices examples that we recommend reading at 
 [ansible-examples](http://github.com/ansible/ansible-examples).
@@ -157,17 +157,17 @@ development work, or getting help from other users.
 Miscellaneous Information
 =========================
 
-AnsibleWorks Staff
-------------------
+Staff
+-----
 
-AnsibleWorks is a company supporting Ansible and building additional solutions based on 
+Ansible, Inc is a company supporting Ansible and building additional solutions based on 
 Ansible.  We also do services and support for those that are interested.   Our most 
 important task however is enabling all the great things that happen in the Ansible 
 community, including organizing software releases of Ansible.  For more information about
-any of these things, contact info@ansibleworks.com
+any of these things, contact info@ansible.com
 
 On IRC, you can find us as mdehaan, jimi_c, Tybstar, and others.   On the mailing list, 
-we post with an @ansibleworks.com address.
+we post with an @ansible.com address.
 
 Community Code of Conduct
 -------------------------
diff --git a/README.md b/README.md
index 17d0846a3b..b8a400da63 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,10 @@ Ansible
 Ansible is a radically simple configuration-management, deployment, task-execution, and
 multinode orchestration framework.
 
-Read the documentation and more at http://ansibleworks.com/
+Read the documentation and more at http://ansible.com/
 
 Many users run straight from the development branch (it's generally fine to do so), but you might also wish to consume a release.  You can find 
-instructions [here](http://ansibleworks.com/docs/intro_getting_started.html) for a variety of platforms.  If you want a tarball of the last release, go to 
-http://ansibleworks.com/releases/ and you can also install with pip.
+instructions [here](http://docs.ansible.com/intro_getting_started.html) for a variety of platforms.  If you want a tarball of the last release, go to [releases.ansible.com](http://releases.ansible.com/ansible) and you can also install with pip.
 
 Design Principles
 =================
@@ -43,7 +42,7 @@ Branch Info
 Author
 ======
 
-Michael DeHaan -- michael@ansibleworks.com
+Michael DeHaan -- michael@ansible.com
 
-[AnsibleWorks](http://ansibleworks.com)
+[Ansible, Inc](http://ansible.com)
 
diff --git a/bin/ansible-galaxy b/bin/ansible-galaxy
index f46b9fd96e..b576156d00 100755
--- a/bin/ansible-galaxy
+++ b/bin/ansible-galaxy
@@ -2,7 +2,7 @@
 
 ########################################################################
 #
-# (C) 2013, James Cammarata <jcammarata@ansibleworks.com>
+# (C) 2013, James Cammarata <jcammarata@ansible.com>
 #
 # This file is part of Ansible
 #
diff --git a/docsite/README.md b/docsite/README.md
index bc6ee18139..5ff774895c 100644
--- a/docsite/README.md
+++ b/docsite/README.md
@@ -1,7 +1,7 @@
 Homepage and documentation source for Ansible
 =============================================
 
-This project hosts the source behind [ansibleworks.com/docs](http://www.ansibleworks.com/docs/)
+This project hosts the source behind [docs.ansible.com](http://docs.ansible.com/)
 
 Contributions to the documentation are welcome.  To make changes, submit a pull request
 that changes the reStructuredText files in the "rst/" directory only, and Michael can
@@ -24,5 +24,6 @@ in the module source, rather than in docsite source.
 To install sphinx and the required theme, install pip and then "pip install sphinx sphinx_rtd_theme"
 
 [file issues]: https://github.com/ansible/ansible/issues
-[module-docs]: http://www.ansibleworks.com/docs/developing_modules.html#documenting-your-module
+[module-docs]: http://docs.ansible.com/developing_modules.html#documenting-your-module
+
 
diff --git a/docsite/conf.py b/docsite/conf.py
index fae3a156f2..61c6de5c11 100644
--- a/docsite/conf.py
+++ b/docsite/conf.py
@@ -29,7 +29,7 @@ sys.path.insert(0, os.path.join('ansible', 'lib'))
 sys.path.append(os.path.abspath('_themes'))
 
 VERSION='0.01'
-AUTHOR='AnsibleWorks'
+AUTHOR='Ansible, Inc'
 
 
 # General configuration
@@ -55,7 +55,7 @@ master_doc = 'index'
 
 # General substitutions.
 project = 'Ansible Documentation'
-copyright = "2013 AnsibleWorks"
+copyright = "2013 Ansible, Inc"
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index f1a24605f8..930880df34 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -1,5 +1,5 @@
-# config file for ansible -- http://ansibleworks.com/
-# ==================================================
+# config file for ansible -- http://ansible.com/
+# ==============================================
 
 # nearly all parameters can be overridden in ansible-playbook 
 # or with command line flags. ansible will read ~/.ansible.cfg, 
diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py
index 4096f777ab..8b358486b9 100644
--- a/lib/ansible/playbook/task.py
+++ b/lib/ansible/playbook/task.py
@@ -99,7 +99,7 @@ class Task(object):
                 if isinstance(ds[x], basestring) and ds[x].lstrip().startswith("{{"):
                     utils.warning("It is unneccessary to use '{{' in conditionals, leave variables in loop expressions bare.")
             elif x.startswith("when_"):
-                utils.deprecated("The 'when_' conditional has been removed. Switch to using the regular unified 'when' statements as described in ansibleworks.com/docs/.","1.5", removed=True)
+                utils.deprecated("The 'when_' conditional has been removed. Switch to using the regular unified 'when' statements as described on docs.ansible.com.","1.5", removed=True)
 
                 if 'when' in ds:
                     raise errors.AnsibleError("multiple when_* statements specified in task %s" % (ds.get('name', ds['action'])))
diff --git a/lib/ansible/runner/action_plugins/include_vars.py b/lib/ansible/runner/action_plugins/include_vars.py
index 8d333af6df..6bae4e3006 100644
--- a/lib/ansible/runner/action_plugins/include_vars.py
+++ b/lib/ansible/runner/action_plugins/include_vars.py
@@ -1,4 +1,4 @@
-# (c) 2013-2014, Benno Joy <benno@ansibleworks.com>
+# (c) 2013-2014, Benno Joy <benno@ansible.com>
 #
 # This file is part of Ansible
 #
diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD
index fd2dc0e22b..74f02949a4 100644
--- a/packaging/arch/PKGBUILD
+++ b/packaging/arch/PKGBUILD
@@ -6,9 +6,9 @@ pkgver(){
 	git describe --tags --long | sed 's/^v//;s/-/./g'
 }
 pkgrel=1
-pkgdesc="A radically simple deployment, model-driven configuration management, and command execution framework"
+pkgdesc="A radically simple IT automation"
 arch=('any')
-url="http://www.ansibleworks.com"
+url="http://www.ansible.com"
 license=('GPL3')
 depends=('python2' 'python2-paramiko' 'python2-jinja' 'python2-yaml')
 makedepends=('git' 'asciidoc' 'fakeroot')
diff --git a/packaging/macports/sysutils/ansible/Portfile b/packaging/macports/sysutils/ansible/Portfile
index f06abf24d0..e041ffcbf6 100644
--- a/packaging/macports/sysutils/ansible/Portfile
+++ b/packaging/macports/sysutils/ansible/Portfile
@@ -11,8 +11,8 @@ supported_archs noarch
 
 maintainers     nomaintainer
 
-homepage        http://ansibleworks.com/
-description     SSH-based configuration management and deployment system
+homepage        http://ansible.com/
+description     Radically simple IT automation
 long_description \
     Ansible is a radically simple model-driven configuration \
     management, multi-node deployment, and orchestration \
diff --git a/packaging/port/sysutils/ansible/Makefile b/packaging/port/sysutils/ansible/Makefile
index f5b32b7548..607f2f4a47 100644
--- a/packaging/port/sysutils/ansible/Makefile
+++ b/packaging/port/sysutils/ansible/Makefile
@@ -4,7 +4,7 @@ PORTNAME=       ansible
 PORTVERSION=    1.0
 PORTREVISION=   1
 CATEGORIES=     python net-mgmt
-MASTER_SITES=   http://ansibleworks.com/releases/
+MASTER_SITES=   http://releases.ansible.com/ansible/
 DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		briancoca+ansible@gmail.com
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index ce929e4cdf..556e41c867 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -7,11 +7,11 @@
 Name:      %{name}
 Version:   1.5
 Release:   1%{?dist}
-Url:       http://www.ansibleworks.com
-Summary:   SSH-based configuration management, deployment, and orchestration engine
+Url:       http://www.ansible.com
+Summary:   SSH-based application deployment, configuration management, and IT orchestration platform
 License:   GPLv3
 Group:     Development/Libraries
-Source:    http://www.ansibleworks.com/releases/%{name}-%{version}.tar.gz
+Source:    http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
diff --git a/setup.py b/setup.py
index a1706f12ef..d7423a3f11 100644
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,8 @@ setup(name='ansible',
       version=__version__,
       description='Radically simple IT automation',
       author=__author__,
-      author_email='michael@ansibleworks.com',
-      url='http://ansibleworks.com/',
+      author_email='michael@ansible.com',
+      url='http://ansible.com/',
       license='GPLv3',
       install_requires=['paramiko', 'jinja2', "PyYAML"],
       package_dir={ 'ansible': 'lib/ansible' },