summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlicia Cozine <879121+acozine@users.noreply.github.com>2021-04-28 16:13:45 -0500
committerGitHub <noreply@github.com>2021-04-28 16:13:45 -0500
commitaf07c35f982bc7f72bf150996a54e8d6bbb715f8 (patch)
tree71ddd5423728f9dff48287203db99b759aefb101 /Makefile
parentd51ec33d8462353932145941e6d9330637ee630b (diff)
downloadansible-af07c35f982bc7f72bf150996a54e8d6bbb715f8.tar.gz
Backport/2.11/docs2 (#74484)
* Add description for COLLECTIONS_SCAN_SYS_PATH (#74351) Fixes: #74275 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> (cherry picked from commit 567361b124e79873537704bed7625141c33f35a8) * lighten navigation background to make section labels easier to read for core docs (#74356) * make section labels for /ansible-core/ docs easier to read, with black text and lighter gray background (cherry picked from commit 6119fb0a9a796887d7d8cc34b4501f69251bf4d6) * Correct splitext() description, and example (#74377) `splitext()` returns a 2-tuple of strings, and the last element of the return value includes the `.` (cherry picked from commit c295de661c8e9462f63bbf716c1d5db23b2e93e5) * Using "~" instead of "+" for concatination (#74364) Changed FAQ examples to conform with the Jinja documentation: If both values on either side of a plus/+ are numbers, they will be added whereas using "~" will convert all operands into strings and then concatenate them. Closes #73799. (cherry picked from commit e6a5245d6088894d56b8e0406f8ffed9a57046c3) * Docs - Split Developing collections page, add info on optional module_utils (#74105) * (cherry picked from commit c90922ee3670e049c9afbbaeaca32f16f0ebbd38) * Add weos4 network platform to documentation (#74088) * Add weos4 network platform to documentation * Fix small format issues (cherry picked from commit 7ca5dede978d01f53551da6ae4ccacbad365c88b) * Fix typo in Makefile (#74396) Fixed minor typo specfic -> specific (cherry picked from commit 4880fee6ca89b0733c12f61505d4462d99d428f3) * Update complex_data_manipulation.rst (#72509) (cherry picked from commit c2985c491b68ad34dd761d03da6e0e53e7c6444e) * Update VMware library installation docs (#71219) Depending upon OS/distro, please use pip/pip3. (cherry picked from commit ddfc648d37f12677935b606151d3be42bcb7d4d7) * Update AWS dev guides to use collections utils and fragments (#72312) (cherry picked from commit cf08c23b4f5708c38728da9020441777e0eebcda) * Use is_boto3_error_code in 'standard' example (#72313) Use is_boto3_error_code in 'standard' example rather than e.response['Error']['Code'] (#72313) Co-authored-by: Sloane Hertel <shertel@redhat.com> (cherry picked from commit 63afb33d8669ffc9180e017c4326cd25bf396fd3) * Update Kubernetes collection name in docs (#74440) (cherry picked from commit 8d499bbc83b6029f7e067f9f09abe11229202bdb) * Update argcomplete docs links on installation guide (#74410) Link on installation docs is outdated. Switch to currently docs at: https://kislyuk.github.io/argcomplete/ (cherry picked from commit f97787ca7489c69953710746ccb228c626f6109e) * fix spacing to fix header, reorg contributing page (#74421) Co-authored-by: John R Barker <john@johnrbarker.com> (cherry picked from commit 9d9b08bece5d9c422e8e4cfa1ec2f6f5bdfa6b06) * Update first_found documentation (#70502) * import_tasks do not work with loop, use use include_tasks instead * update documentation (cherry picked from commit bacede7a2b9615e0b1e83aeff69e5c4f080bf791) * Product-related updates. (#74454) (cherry picked from commit 34c9ed8a28e6353b927427fdc72a1ec7078040e6) Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com> Co-authored-by: Sandra McCann <samccann@redhat.com> Co-authored-by: Alex Willmer <alex@moreati.org.uk> Co-authored-by: Hublerho <43293510+Hublerho@users.noreply.github.com> Co-authored-by: Ernst Oudhof <17832702+ernst-s@users.noreply.github.com> Co-authored-by: Hu Shuai <hus.fnst@cn.fujitsu.com> Co-authored-by: dhx-mike-palandra <45608336+dhx-mike-palandra@users.noreply.github.com> Co-authored-by: jakelevinez <31458570+jakelevinez@users.noreply.github.com> Co-authored-by: Mark Chappell <mchappel@redhat.com> Co-authored-by: Lidiane Taquehara <lidi.mayra@gmail.com> Co-authored-by: Alex Domoradov <alex.hha@gmail.com> Co-authored-by: Bill Nottingham <notting@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0395802220..aff3d89423 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
# make deb ------------------ produce a DEB
# make docs ----------------- rebuild the manpages (results are checked in)
# make gettext -------------- produce POT files for docs
-# make generate-po ---------- generate language specfic po file
+# make generate-po ---------- generate language specific po file
# make needs-translation ---- generate list of file with unstranlated or fuzzy string for a specific language
# make tests ---------------- run the tests (see https://docs.ansible.com/ansible/devel/dev_guide/testing_units.html for requirements)