Merge pull request #10690 from rhatdan/VENDOR

Vendor in containers/common v0.40.0

1 files changed, 21 insertions, 17 deletions

diff --git a/docs/source/markdown/podman-login.1.md b/docs/source/markdown/podman-login.1.md
index 88d025c70..50c20fcec 100644
--- a/docs/source/markdown/podman-login.1.md
+++ b/docs/source/markdown/podman-login.1.md
@@ -28,18 +28,6 @@ For more details about format and configurations of the auth.json file, please r
 
 ## OPTIONS
 
-#### **--password**, **-p**=*password*
-
-Password for registry
-
-#### **--password-stdin**
-
-Take the password from stdin
-
-#### **--username**, **-u**=*username*
-
-Username for registry
-
 #### **--authfile**=*path*
 
 Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth.json.
@@ -47,14 +35,26 @@ Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth
 Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
 environment variable. `export REGISTRY_AUTH_FILE=path`
 
+#### **--cert-dir**=*path*
+
+Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry.
+Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client)
+
 #### **--get-login**
 
 Return the logged-in user for the registry.  Return error if no login is found.
 
-#### **--cert-dir**=*path*
+#### **--help**, **-h**
 
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry.
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client)
+Print usage statement
+
+#### **--password**, **-p**=*password*
+
+Password for registry
+
+#### **--password-stdin**
+
+Take the password from stdin
 
 #### **--tls-verify**=*true|false*
 
@@ -62,9 +62,13 @@ Require HTTPS and verify certificates when contacting registries (default: true)
 then TLS verification will be used. If set to false, then TLS verification will not be used. If not specified,
 TLS verification will be used unless the target registry is listed as an insecure registry in registries.conf.
 
-#### **--help**, **-h**
+#### **--username**, **-u**=*username*
 
-Print usage statement
+Username for registry
+
+#### **--verbose**, **-v**
+
+print detailed information about credential store
 
 ## EXAMPLES