diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-28 14:12:58 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-28 14:12:58 -0800 |
commit | 91373151335a84c5b78dbe46362cb678807d7509 (patch) | |
tree | 074a9acae0a00c9deeb3d13032a34b7cf39abb60 /docs/podman-container.1.md | |
parent | 03b236a754828c91ca3fc4845531eefb043b01b2 (diff) | |
parent | be0845936a2dd6c21ca59260bed0a8ecaa6d9c07 (diff) | |
download | podman-91373151335a84c5b78dbe46362cb678807d7509.tar.gz podman-91373151335a84c5b78dbe46362cb678807d7509.tar.bz2 podman-91373151335a84c5b78dbe46362cb678807d7509.zip |
Merge pull request #2484 from rhatdan/man
No podman container ps command exists
Diffstat (limited to 'docs/podman-container.1.md')
-rw-r--r-- | docs/podman-container.1.md | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/docs/podman-container.1.md b/docs/podman-container.1.md index 86ffd32c4..bb27200a1 100644 --- a/docs/podman-container.1.md +++ b/docs/podman-container.1.md @@ -14,7 +14,7 @@ The container command allows you to manage containers | Command | Man Page | Description | | --------- | --------------------------------------------------- | ---------------------------------------------------------------------------- | | attach | [podman-attach(1)](podman-attach.1.md) | Attach to a running container. | -| checkpoint | [podman-container-checkpoint(1)](podman-container-checkpoint.1.md) | Checkpoints one or more containers. | +| checkpoint | [podman-container-checkpoint(1)](podman-container-checkpoint.1.md) | Checkpoints one or more containers. | | cleanup | [podman-container-cleanup(1)](podman-container-cleanup.1.md) | Cleanup containers network and mountpoints. | | commit | [podman-commit(1)](podman-commit.1.md) | Create new image based on the changed container. | | create | [podman-create(1)](podman-create.1.md) | Create a new container. | @@ -24,14 +24,12 @@ The container command allows you to manage containers | export | [podman-export(1)](podman-export.1.md) | Export a container's filesystem contents as a tar archive. | | inspect | [podman-inspect(1)](podman-inspect.1.md) | Display a container or image's configuration. | | kill | [podman-kill(1)](podman-kill.1.md) | Kill the main process in one or more containers. | -| list | [podman-ps(1)](podman-ps.1.md) | List the containers on the system. | +| list | [podman-ps(1)](podman-ps.1.md) | List the containers on the system.(alias ls) | | logs | [podman-logs(1)](podman-logs.1.md) | Display the logs of a container. | -| ls | [podman-ps(1)](podman-ps.1.md) | List the containers on the system. | | mount | [podman-mount(1)](podman-mount.1.md) | Mount a working container's root filesystem. | | pause | [podman-pause(1)](podman-pause.1.md) | Pause one or more containers. | | port | [podman-port(1)](podman-port.1.md) | List port mappings for the container. | | prune | [podman-container-prune(1)](podman-container-prune.1.md)| Remove all stopped containers from local storage. | -| ps | [podman-ps(1)](podman-ps.1.md) | List the containers on the system. | | refresh | [podman-refresh(1)](podman-container-refresh.1.md) | Refresh the state of all containers | | restart | [podman-restart(1)](podman-restart.1.md) | Restart one or more containers. | | restore | [podman-container-restore(1)](podman-container-restore.1.md) | Restores one or more containers from a checkpoint. | @@ -42,8 +40,7 @@ The container command allows you to manage containers | stats | [podman-stats(1)](podman-stats.1.md) | Display a live stream of one or more container's resource usage statistics. | | stop | [podman-stop(1)](podman-stop.1.md) | Stop one or more running containers. | | top | [podman-top(1)](podman-top.1.md) | Display the running processes of a container. | -| umount | [podman-umount(1)](podman-umount.1.md) | Unmount a working container's root filesystem. | -| unmount | [podman-umount(1)](podman-umount.1.md) | Unmount a working container's root filesystem. | +| umount | [podman-umount(1)](podman-umount.1.md) | Unmount a working container's root filesystem.(Alias unmount) | | unpause | [podman-unpause(1)](podman-unpause.1.md) | Unpause one or more containers. | | wait | [podman-wait(1)](podman-wait.1.md) | Wait on one or more containers to stop and print their exit codes. | |