summaryrefslogtreecommitdiff
path: root/docs/docsite/rst/user_guide
diff options
context:
space:
mode:
authorAlicia Cozine <879121+acozine@users.noreply.github.com>2019-10-23 10:05:12 -0500
committerGitHub <noreply@github.com>2019-10-23 10:05:12 -0500
commit07fa9b51875ece72d6fd1a40bae6cb50991000d9 (patch)
tree608617e1b88cd2274493aa51aa171971bf57a51f /docs/docsite/rst/user_guide
parente1b9bed57d08b24491ccc6ce5617e4fc74c353ee (diff)
downloadansible-07fa9b51875ece72d6fd1a40bae6cb50991000d9.tar.gz
Backport/2.9/docs (#63814)
* Replaced old DSC links that given 404 (#63556) Replace DSC links that returned "not found" with updated, working links. (cherry picked from commit f638f29e445b4e9e51d348ad0414c88cbaf67925) * Fix example in pip module documentation (#63462) (cherry picked from commit d8b9f9fb4f1d08693a6bcb724c66add7f265c8b5) * Update vmware ansible modules requirements section (#62797) Update vSphere Automation Python SDK to the requirement section Signed-off-by: Jobin George <jgeorge@vmware.com> Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> (cherry picked from commit 8a77f17dea7f479e755af64347fada0db0c90121) * Typo usersername should be username (#63671) (cherry picked from commit 2ef4ac140435f02c6cb2f55b09b2844dc078522a) * Update description for firstmatch option (#62896) Fixes issue https://github.com/ansible/ansible/issues/62862. The edit makes the description for the `firstmatch` option clearer. The `firstmatch` option was introduced by PR https://github.com/ansible/ansible/pull/33825 (cherry picked from commit aeb0dde7ccb0b7ac34623241835cc876067b8c86) * Update win_regmerge.py (#63633) s/windows/Windows/ in title (cherry picked from commit 4326165be56c1bc990d0e9eaef951227b0e94687) * Example incorrect: server_url is required argument (#63670) The example "Delete GitLab Group" does not work - requires server_url parameter. This likely applies to all Examples, so this change proposes at least putting in the required parameter in the examples. In future we can remove the soon-to-be deprecated server_url parameter. (cherry picked from commit b02467961a5d9357d48ea2d955bc4de69308a16c) * doc: win_user: fix typo in the description of the groups modifyer (#63743) (cherry picked from commit 6046386dba6ed3ce5328cda56bc27ca168b29d4b) * Update AWS dev guide to recommend module_defaults and point to CI policy repo (#63589) (cherry picked from commit 9cda5819b95200b7ce3585e3171a5606cb715cec) * Add example for port range to win_firewall_rule_module (#63269) (cherry picked from commit 2e81b813ddfdd0b37c0d5fad34ec061c6f0eb079) * added a link to install instruction of OpenSSH (#63548) (cherry picked from commit cfe2beae46722c6e36188ba1691e3d58a3547dc3)
Diffstat (limited to 'docs/docsite/rst/user_guide')
-rw-r--r--docs/docsite/rst/user_guide/windows_dsc.rst8
-rw-r--r--docs/docsite/rst/user_guide/windows_faq.rst2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/docsite/rst/user_guide/windows_dsc.rst b/docs/docsite/rst/user_guide/windows_dsc.rst
index a78f09b8eb..b8f1b41fee 100644
--- a/docs/docsite/rst/user_guide/windows_dsc.rst
+++ b/docs/docsite/rst/user_guide/windows_dsc.rst
@@ -12,7 +12,7 @@ is the same as Ansible, it is just executed in a different manner. Since
Ansible 2.4, the ``win_dsc`` module has been added and can be used to leverage
existing DSC resources when interacting with a Windows host.
-More details on DSC can be viewed at `DSC Overview <https://docs.microsoft.com/en-us/powershell/dsc/overview>`_.
+More details on DSC can be viewed at `DSC Overview <https://docs.microsoft.com/en-us/powershell/scripting/dsc/overview/overview>`_.
Host Requirements
`````````````````
@@ -27,7 +27,7 @@ Why Use DSC?
````````````
DSC and Ansible modules have a common goal which is to define and ensure the state of a
resource. Because of
-this, resources like the DSC `File resource <https://docs.microsoft.com/en-us/powershell/dsc/fileresource>`_
+this, resources like the DSC `File resource <https://docs.microsoft.com/en-us/powershell/scripting/dsc/reference/resources/windows/fileresource>`_
and Ansible ``win_file`` can be used to achieve the same result. Deciding which to use depends
on the scenario.
@@ -59,9 +59,9 @@ How to Use DSC?
```````````````
The ``win_dsc`` module takes in a free-form of options so that it changes
according to the resource it is managing. A list of built in resources can be
-found at `resources <https://docs.microsoft.com/en-us/powershell/dsc/resources>`_.
+found at `resources <https://docs.microsoft.com/en-us/powershell/scripting/dsc/resources/resources>`_.
-Using the `Registry <https://docs.microsoft.com/en-us/powershell/dsc/registryresource>`_
+Using the `Registry <https://docs.microsoft.com/en-us/powershell/scripting/dsc/reference/resources/windows/registryresource>`_
resource as an example, this is the DSC definition as documented by Microsoft:
.. code-block:: powershell
diff --git a/docs/docsite/rst/user_guide/windows_faq.rst b/docs/docsite/rst/user_guide/windows_faq.rst
index 6f2b511291..5c9da043bc 100644
--- a/docs/docsite/rst/user_guide/windows_faq.rst
+++ b/docs/docsite/rst/user_guide/windows_faq.rst
@@ -169,7 +169,7 @@ to manage Windows hosts. To connect to Windows hosts over SSH, you must install
fork that is in development with Microsoft on
the Windows host(s). While most of the basics should work with SSH,
``Win32-OpenSSH`` is rapidly changing, with new features added and bugs
-fixed in every release. It is highly recommend you install the latest release
+fixed in every release. It is highly recommend you `install <https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH>`_ the latest release
of ``Win32-OpenSSH`` from the GitHub Releases page when using it with Ansible
on Windows hosts.