Skip to content

Commit 66c968b

Browse files
committed
Merge bitcoin/bitcoin#32444: doc: swap "Docker image" for "container image"
1372eb0 doc: swap "Docker image" for "container image" (fanquake) Pull request description: I haven't used Docker for some time (now Podman), and the images are generic, so just use "container image". I'll be pushing some changes to https://github.com/fanquake/core-review/tree/master/guix, to reflect this. ACKs for top commit: janb84: ACK bitcoin/bitcoin@1372eb0 laanwj: ACK 1372eb0 hebasto: ACK 1372eb0. Tree-SHA512: 45bb74d25a0faf7e5c3666d6897fb6b999144308c43cdf8a290d3a4210285b1e95286d27bb3d90bc50be4784c2242ad3f93794086f4634439a46a48ff68c7343
2 parents 6469752 + 1372eb0 commit 66c968b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

contrib/guix/INSTALL.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Otherwise, you may choose from one of the following options to install Guix:
1818
- Works on nearly all Linux distributions
1919
- Installs any release
2020
- Binary installation only, requires high level of trust
21-
3. Using fanquake's **Docker image** [↗︎ external instructions][install-fanquake-docker]
21+
3. Using fanquake's **container image** [↗︎ external instructions][install-fanquake-container]
2222
- Maintained by fanquake
2323
- Easy (automatically performs *some* setup)
24-
- Works wherever Docker images work
24+
- Works wherever container images work (Docker/Podman)
2525
- Installs any release
2626
- Binary installation only, requires high level of trust
2727
4. Using a **distribution-maintained package** [⤓ skip to section][install-distro-pkg]
@@ -57,7 +57,7 @@ Regardless of which installation option you chose, the changes to
5757
`/etc/profile.d` will not take effect until the next shell or desktop session,
5858
so you should log out and log back in.
5959

60-
## Option 3: Using fanquake's Docker image
60+
## Option 3: Using fanquake's container image
6161

6262
Please refer to fanquake's instructions
6363
[here](https://github.com/fanquake/core-review/tree/master/guix).
@@ -415,7 +415,7 @@ make it "what Guix intended", then read the next few subsections.
415415

416416
This section definitely does not apply to you if you installed Guix using:
417417
1. The shell installer script
418-
2. fanquake's Docker image
418+
2. fanquake's container image
419419
3. Debian's `guix` package
420420

421421
#### Background
@@ -766,7 +766,7 @@ Please see the following links for more details:
766766
767767
[install-script]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
768768
[install-bin-tarball]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
769-
[install-fanquake-docker]: #option-3-using-fanquakes-docker-image
769+
[install-fanquake-container]: #option-3-using-fanquakes-container-image
770770
[install-distro-pkg]: #option-4-using-a-distribution-maintained-package
771771
[install-source]: #option-5-building-from-source
772772

0 commit comments

Comments
 (0)