summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlan Rominger <arominge@redhat.com>2020-12-01 20:06:34 +0100
committerAlan Rominger <arominge@redhat.com>2020-12-01 20:06:34 +0100
commit44e6e9344be666041c50384ee4a74853c83eaddc (patch)
treeda11c822f49bfeb8c33dd0381805e6a8dff0b2c6 /docs
parentMerge pull request #8719 from ryanpetrello/tzid-support (diff)
downloadawx-44e6e9344be666041c50384ee4a74853c83eaddc.tar.xz
awx-44e6e9344be666041c50384ee4a74853c83eaddc.zip
Remove mercurial support
Diffstat (limited to 'docs')
-rw-r--r--docs/clustering.md2
-rw-r--r--docs/overview.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/clustering.md b/docs/clustering.md
index ecf9a97dee..c77968191d 100644
--- a/docs/clustering.md
+++ b/docs/clustering.md
@@ -304,7 +304,7 @@ When verifying acceptance, we should ensure that the following statements are tr
- Break the link between instances such that it forms two or more groups where Group A and Group B can't communicate but all instances can communicate with the database.
* Crucially, when network partitioning is resolved, all instances should recover into a consistent state.
* Upgrade Testing - verify behavior before and after are the same for the end user.
-* Project Updates should be thoroughly tested for all SCM types (`git`, `svn`, `hg`) and for manual projects.
+* Project Updates should be thoroughly tested for all SCM types (`git`, `svn`, `archive`) and for manual projects.
* Setting up instance groups in two scenarios:
a) instances are shared between groups
b) instances are isolated to particular groups
diff --git a/docs/overview.md b/docs/overview.md
index 4006cdc784..f410b2bdc2 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -16,8 +16,8 @@ of the most notable ones are:
### Projects
Projects represent a collection of Ansible playbooks. Most AWX users create
-Projects that import periodically from source control systems (such as git,
-mercurial, or subversion repositories). This import is accomplished via an
+Projects that import periodically from source control systems (such as git
+or subversion repositories). This import is accomplished via an
Ansible playbook included with AWX (which makes use of the various source
control management modules in Ansible).