summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-06-06 14:22:06 +0200
committerGitHub <noreply@github.com>2022-06-06 14:22:06 +0200
commitfcf0e167c0da66e31985d768251a1da6ec804a56 (patch)
tree8598dad87c946bd5f02214d6030ebbe0ba542e38
parent60bba4f70cb64907b512e5261cc515a8b43c4318 (diff)
parent1fc5a107a0db01d8e147c45af95c97d106f3c320 (diff)
downloadpodman-fcf0e167c0da66e31985d768251a1da6ec804a56.tar.gz
podman-fcf0e167c0da66e31985d768251a1da6ec804a56.tar.bz2
podman-fcf0e167c0da66e31985d768251a1da6ec804a56.zip
Merge pull request #14487 from TomSweeneyRedHat/dev/tsweeney/fiximagedoc
[CI:DOCS] PodmanImage Readme touchup
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md6
-rw-r--r--contrib/podmanimage/README.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9a4563308..cc8b618f4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,9 +3,9 @@ Thanks for sending a pull request!
Please make sure you've read our contributing guidelines and how to submit a pull request (https://github.com/containers/podman/blob/main/CONTRIBUTING.md#submitting-pull-requests).
-In case you're only changing docs, make sure to prefix the pull-request title with "[CI:DOCS]". That will prevent functional tests from running and save time and energy.
+In case you're only changing docs, make sure to prefix the pull-request title with "[CI:DOCS]". That will prevent functional tests from running and save time and energy.
-Finally, be sure to sign commits with your real name. Since by opening
+Finally, be sure to sign commits with your real name. Since by opening
a PR you already have commits, you can add signatures if needed with
something like `git commit -s --amend`.
-->
@@ -18,7 +18,7 @@ is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".
-For more information on release notes please follow the kubernetes model:
+For more information on release notes, please follow the Kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->
diff --git a/contrib/podmanimage/README.md b/contrib/podmanimage/README.md
index 4f184ca28..7e35bdf0a 100644
--- a/contrib/podmanimage/README.md
+++ b/contrib/podmanimage/README.md
@@ -4,7 +4,7 @@
## Overview
-This directory contains the Dockerfiles necessary to create the podmanimage container
+This directory contains the Containerfiles necessary to create the podmanimage container
images that are housed on quay.io under the Podman account. All repositories where
the images live are public and can be pulled without credentials. These container images are secured and the
resulting containers can run safely with privileges within the container.