summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-02-07 14:07:54 -0500
committerGitHub <noreply@github.com>2018-02-07 14:07:54 -0500
commit588c9bb5de08f0c3058a18b401ac87e38cd011be (patch)
treee633be56c5ee9bdbcbe3b14c562e10f34b5cdf63 /docs
parent6716581545f7936ab585b125e2cfc02d2d802f9f (diff)
parentbb37c11651b9a01ff9b5191eb5072cdf0db83a51 (diff)
downloadpodman-588c9bb5de08f0c3058a18b401ac87e38cd011be.tar.gz
podman-588c9bb5de08f0c3058a18b401ac87e38cd011be.tar.bz2
podman-588c9bb5de08f0c3058a18b401ac87e38cd011be.zip
Merge pull request #289 from TomSweeneyRedHat/dev/tsweeney/username
Change un/pwd handling to match Buildah's
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-pull.1.md4
-rw-r--r--docs/podman-push.1.md4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md
index cdbe834d3..1a1611fd0 100644
--- a/docs/podman-pull.1.md
+++ b/docs/podman-pull.1.md
@@ -66,7 +66,9 @@ Default certificates directory is _/etc/containers/certs.d_.
**--creds**
-Credentials (USERNAME:PASSWORD) to use for authenticating to a registry
+The [username[:password]] to use to authenticate with the registry if required.
+If one or both values are not supplied, a command line prompt will appear and the
+value can be entered. The password is entered without echo.
**--quiet, -q**
diff --git a/docs/podman-push.1.md b/docs/podman-push.1.md
index 7e1733abf..964758da6 100644
--- a/docs/podman-push.1.md
+++ b/docs/podman-push.1.md
@@ -53,7 +53,9 @@ If the authorization state is not found there, $HOME/.docker/config.json is chec
**--creds="CREDENTIALS"**
-Credentials (USERNAME:PASSWORD) to use for authenticating to a registry
+The [username[:password]] to use to authenticate with the registry if required.
+If one or both values are not supplied, a command line prompt will appear and the
+value can be entered. The password is entered without echo.
**cert-dir="PATHNAME"**