Skip to content

Commit

Permalink
Merge pull request #300 from chuanchang/fix_typos
Browse files Browse the repository at this point in the history
docs: fix typos
  • Loading branch information
cgwalters authored Feb 4, 2024
2 parents 8558c96 + 1831ab6 commit dbaf4ee
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default-run = "bootc"
# See https://github.com/coreos/cargo-vendor-filterer
[package.metadata.vendor-filter]
# This list of platforms is not intended to be exclusive, feel free
# to extend it. But missing a platfom will only matter for the case where
# to extend it. But missing a platform will only matter for the case where
# a dependent crate is *only* built on that platform.
platforms = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", "riscv64gc-unknown-linux-gnu"]

Expand Down
6 changes: 3 additions & 3 deletions docs/relationship-particles.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The "bootc vision" aligns with parts of this, but differs in emphasis and also s
The "particle" proposal mentions that the desktop case is most
interesting; the bootc belief is that servers are equally
important and interesting. In practice, this is not a real point
of differentation, because the systemd project has done an excellent
of differentiation, because the systemd project has done an excellent
job in catering to all use cases (desktop, embedded, server) etc.

An important aspect related to this is that the bootc project exists and must
Expand Down Expand Up @@ -52,7 +52,7 @@ bootc aims to support the same. And in practice, nothing in "particles" strictl
requires Secure Boot etc.

However, bootc has a stronger emphasis on continuing to support "unlocked"
systems into the forseeable future in which key (even root level) operating system
systems into the foreseeable future in which key (even root level) operating system
changes can be that are outside of an explicit signed state and feel
*equally* first class, not just "developer system extensions".

Expand Down Expand Up @@ -266,7 +266,7 @@ The bootc project will align with podman in general, and make it easy to impleme
a mechanism that chains keys stored alongside the operating system into composefs-signed
application containers.

Configuration (effectively starting from `/etc` and the kernel commandline) in a "sealed" system is a complex topic. Many operting system builds will want to disable the default "etc merge" and make `/etc` always lifecycle bound with the OS: commonly writable but ephemeral.
Configuration (effectively starting from `/etc` and the kernel commandline) in a "sealed" system is a complex topic. Many operating system builds will want to disable the default "etc merge" and make `/etc` always lifecycle bound with the OS: commonly writable but ephemeral.

This topic is covered more in the next section.

Expand Down
2 changes: 1 addition & 1 deletion docs/relationship.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ For example, `bootc status` at least will still function even if packages are la
### Future bootc <-> podman binding

All the above said, it is likely that at some point bootc will switch to [hard binding with podman](https://github.com/containers/bootc/pull/215).
This will reduce the role of ostree, and hence break compatibilty with rpm-ostree.
This will reduce the role of ostree, and hence break compatibility with rpm-ostree.
When such work lands, we will still support at least a "one way" transition from an
ostree backend. But once this happens there are no plans to teach rpm-ostree
to use podman too.
Expand Down
4 changes: 2 additions & 2 deletions manpages-md/bootc-install-to-disk.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ By default, all remaining space on the disk will be used.

By default, bootc install and install-to-filesystem assumes that it runs
in a podman container, and it takes the container image to install from
the podmans container registry. If \--source-imgref is given, bootc uses
the podman's container registry. If \--source-imgref is given, bootc uses
it as the installation source, instead of the behaviour explained in the
previous paragraph. See skopeo(1) for accepted formats.

Expand All @@ -77,7 +77,7 @@ previous paragraph. See skopeo(1) for accepted formats.

**\--skip-fetch-check**

: By default, the accessiblity of the target image will be verified
: By default, the accessibility of the target image will be verified
(just the manifest will be fetched). Specifying this option
suppresses the check; use this when you know the issues it might
find are addressed.
Expand Down
4 changes: 2 additions & 2 deletions manpages-md/bootc-install-to-filesystem.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ be used.

By default, bootc install and install-to-filesystem assumes that it runs
in a podman container, and it takes the container image to install from
the podmans container registry. If \--source-imgref is given, bootc uses
the podman's container registry. If \--source-imgref is given, bootc uses
it as the installation source, instead of the behaviour explained in the
previous paragraph. See skopeo(1) for accepted formats.

Expand All @@ -85,7 +85,7 @@ previous paragraph. See skopeo(1) for accepted formats.

**\--skip-fetch-check**

: By default, the accessiblity of the target image will be verified
: By default, the accessibility of the target image will be verified
(just the manifest will be fetched). Specifying this option
suppresses the check; use this when you know the issues it might
find are addressed.
Expand Down

0 comments on commit dbaf4ee

Please sign in to comment.