Skip to content

Commit 2dbc898

Browse files
authored
Merge pull request #25860 from locker95/docs/host-has-swap
docs: say the host, not the host container, has swap
2 parents 899f216 + c44db82 commit 2dbc898

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

content/manuals/engine/containers/resource_constraints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Its setting can have complicated effects:
115115
[Prevent a container from using swap](#prevent-a-container-from-using-swap).
116116

117117
- If `--memory-swap` is unset, and `--memory` is set, the container can use
118-
as much swap as the `--memory` setting, if the host container has swap
118+
as much swap as the `--memory` setting, if the host has swap
119119
memory configured. For instance, if `--memory="300m"` and `--memory-swap` is
120120
not set, the container can use 600m in total of memory and swap.
121121

content/reference/compose-file/services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ There is a performance penalty for applications that swap memory to disk often.
12941294
- If `memswap_limit` is set to a positive integer, then both `memory` and `memswap_limit` must be set. `memswap_limit` represents the total amount of memory and swap that can be used, and `memory` controls the amount used by non-swap memory. So if `memory`="300m" and `memswap_limit`="1g", the container can use 300m of memory and 700m (1g - 300m) swap.
12951295
- If `memswap_limit` is set to 0, the setting is ignored, and the value is treated as unset.
12961296
- If `memswap_limit` is set to the same value as `memory`, and `memory` is set to a positive integer, the container does not have access to swap.
1297-
- If `memswap_limit` is unset, and `memory` is set, the container can use as much swap as the `memory` setting, if the host container has swap memory configured. For instance, if `memory`="300m" and `memswap_limit` is not set, the container can use 600m in total of memory and swap.
1297+
- If `memswap_limit` is unset, and `memory` is set, the container can use as much swap as the `memory` setting, if the host has swap memory configured. For instance, if `memory`="300m" and `memswap_limit` is not set, the container can use 600m in total of memory and swap.
12981298
- If `memswap_limit` is explicitly set to -1, the container is allowed to use unlimited swap, up to the amount available on the host system.
12991299

13001300
### `models`

0 commit comments

Comments
 (0)