From fb38838feafb0d2adae278922da948e52419c9f3 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 31 Aug 2022 09:01:53 -0600 Subject: Man pages: refactor common options: --memory* (memory-star, i.e., several memory options) that didn't get included in #15276. Most of them are shoo-ins; the two in container-clone and pod-clone deserve special attention because of the "If unspecified" wording. Signed-off-by: Ed Santiago --- docs/source/markdown/podman-run.1.md.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'docs/source/markdown/podman-run.1.md.in') diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in index a32bf4781..3ad338662 100644 --- a/docs/source/markdown/podman-run.1.md.in +++ b/docs/source/markdown/podman-run.1.md.in @@ -307,15 +307,7 @@ This option is currently supported only by the **journald** log driver. @@option mac-address -#### **--memory**, **-m**=*number[unit]* - -Memory limit. A _unit_ can be **b** (bytes), **k** (kibibytes), **m** (mebibytes), or **g** (gibibytes). - -Allows you to constrain the memory available to a container. If the host -supports swap memory, then the **-m** memory setting can be larger than physical -RAM. If a limit of 0 is specified (not using **-m**), the container's memory is -not limited. The actual limit may be rounded up to a multiple of the operating -system's page size (the value would be very large, that's millions of trillions). +@@option memory @@option memory-reservation -- cgit v1.2.3-54-g00ecf