summaryrefslogtreecommitdiffstats
path: root/docsite
diff options
context:
space:
mode:
authorSandra Wills <docschick@ansible.com>2015-10-12 14:01:24 +0200
committerSandra Wills <docschick@ansible.com>2015-10-12 14:01:24 +0200
commit748ff72b6b7ed3ec8d21f0b844835d4ab6bb59a8 (patch)
treee7fdc2947ac449eeb0c89a035b7bf89568ec60aa /docsite
parentfixed git conflict with double para (diff)
downloadansible-748ff72b6b7ed3ec8d21f0b844835d4ab6bb59a8.tar.xz
ansible-748ff72b6b7ed3ec8d21f0b844835d4ab6bb59a8.zip
fixed typo, depricated --> deprecated, in all 6 notes
Diffstat (limited to 'docsite')
-rw-r--r--docsite/rst/faq.rst2
-rw-r--r--docsite/rst/guide_rax.rst2
-rw-r--r--docsite/rst/guide_vagrant.rst2
-rw-r--r--docsite/rst/intro_inventory.rst2
-rw-r--r--docsite/rst/intro_windows.rst2
-rw-r--r--docsite/rst/playbooks_variables.rst2
6 files changed, 6 insertions, 6 deletions
diff --git a/docsite/rst/faq.rst b/docsite/rst/faq.rst
index e78edd9fef..ee6f5eacd6 100644
--- a/docsite/rst/faq.rst
+++ b/docsite/rst/faq.rst
@@ -5,7 +5,7 @@ Here are some commonly-asked questions and their answers.
.. note::
- Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
+ Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
.. _set_environment:
diff --git a/docsite/rst/guide_rax.rst b/docsite/rst/guide_rax.rst
index f427e94d66..8195b5e923 100644
--- a/docsite/rst/guide_rax.rst
+++ b/docsite/rst/guide_rax.rst
@@ -125,7 +125,7 @@ The rax module returns data about the nodes it creates, like IP addresses, hostn
.. note::
- Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
+ Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
.. code-block:: yaml
diff --git a/docsite/rst/guide_vagrant.rst b/docsite/rst/guide_vagrant.rst
index 4b4f5ecf19..746448c9b6 100644
--- a/docsite/rst/guide_vagrant.rst
+++ b/docsite/rst/guide_vagrant.rst
@@ -107,7 +107,7 @@ inventory file may look something like this:
.. note::
- Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
+ Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
If you want to run Ansible manually, you will want to make sure to pass
``ansible`` or ``ansible-playbook`` commands the correct arguments for the
diff --git a/docsite/rst/intro_inventory.rst b/docsite/rst/intro_inventory.rst
index 6a99a917f1..2fb934ab32 100644
--- a/docsite/rst/intro_inventory.rst
+++ b/docsite/rst/intro_inventory.rst
@@ -69,7 +69,7 @@ You can also select the connection type and user on a per host basis::
.. note::
- Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
+ Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
You can also select the connection type and user on a per host basis:
diff --git a/docsite/rst/intro_windows.rst b/docsite/rst/intro_windows.rst
index 4430f0520a..1cfd1eaf2e 100644
--- a/docsite/rst/intro_windows.rst
+++ b/docsite/rst/intro_windows.rst
@@ -156,7 +156,7 @@ Ansible's windows support relies on a few standard variables to indicate the use
.. note::
- Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
+ Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
In group_vars/windows.yml, define the following inventory variables::
diff --git a/docsite/rst/playbooks_variables.rst b/docsite/rst/playbooks_variables.rst
index 3d087369e6..021b640a1f 100644
--- a/docsite/rst/playbooks_variables.rst
+++ b/docsite/rst/playbooks_variables.rst
@@ -737,7 +737,7 @@ If multiple variables of the same name are defined in different places, they get
.. note::
-Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
+Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
In 1.x the precedence is: