* [ptxdist] [PATCH] Fix some typos, grammar and duplicated words
@ 2025-01-03 16:57 Markus Heidelberg
2025-01-07 12:02 ` [ptxdist] [PATCH v2] " Markus Heidelberg
0 siblings, 1 reply; 3+ messages in thread
From: Markus Heidelberg @ 2025-01-03 16:57 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
config/setup/Kconfig | 6 +++---
doc/dev_dir_hierarchy.rst | 2 +-
doc/dev_licenses.rst | 2 +-
scripts/lib/ptxd_make_nested.sh | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/setup/Kconfig b/config/setup/Kconfig
index 4c51e865b..53177e727 100644
--- a/config/setup/Kconfig
+++ b/config/setup/Kconfig
@@ -440,7 +440,7 @@ choice
bool
prompt "podman"
help
- Use podman ad container provider. '--userns=keep-id' will be
+ Use podman as container provider. '--userns=keep-id' will be
used to map calling user into the container.
endchoice
@@ -455,7 +455,7 @@ config SETUP_CONTAINER_ARGS
string
prompt "extra args"
help
- Additional arguments for the container manager. The will be inserted
+ Additional arguments for the container manager. They will be inserted
directly before the container image in the docker/podman command-line.
config SETUP_CONTAINER_DEVELOP
@@ -463,7 +463,7 @@ config SETUP_CONTAINER_DEVELOP
prompt "developer mode"
help
In developer mode, additional directories will be mounted into the
- container, such at the user global ptxdistrc and sources symlinked in
+ container, such as the user global ptxdistrc and sources symlinked in
local_src/.
endif
diff --git a/doc/dev_dir_hierarchy.rst b/doc/dev_dir_hierarchy.rst
index bd1ad40d0..6d1c7e968 100644
--- a/doc/dev_dir_hierarchy.rst
+++ b/doc/dev_dir_hierarchy.rst
@@ -51,7 +51,7 @@ Patches are looked for at several locations:
1. the ``patches/`` folder in your BSP (``${PTXDIST_WORKSPACE}/patches``)
-2. the folder ``patches/`` folder relative to your selected platformconfig
+2. the ``patches/`` folder relative to your selected platformconfig
file (``${PTXDIST_PLATFORMCONFIGDIR}/patches``). If your platformconfig
file is at ``configs/|ptxdistPlatformConfigDir|/platformconfig``, this
patch folder will be ``configs/|ptxdistPlatformConfigDir|/patches/``.
diff --git a/doc/dev_licenses.rst b/doc/dev_licenses.rst
index 6aed9daac..b0814e782 100644
--- a/doc/dev_licenses.rst
+++ b/doc/dev_licenses.rst
@@ -221,7 +221,7 @@ For the example above, lines 1 to 16 of main.cc would be::
Always include the copyright statement ("Copyright YYYY (C) Some Person")
for the calculation of the checksum, even if it means that the checksum changes
on package updates when new years are added to the string.
-While it is not is needed for most licenses to be valid, some licenses require
+While it is not needed for most licenses to be valid, some licenses require
that it must not be removed (e.g. see GPLv2, section 1),
and it is proper etiquette to give attribution to the maintainers in the
license report document.
diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh
index 5062d2a5f..54535377f 100644
--- a/scripts/lib/ptxd_make_nested.sh
+++ b/scripts/lib/ptxd_make_nested.sh
@@ -79,7 +79,7 @@ ptxd_make_nested_ptxdist() {
ptxd_verbose "executing:" "${args[@]}"
- # run ptxdist but don't log it. It has it's on logfile
+ # run ptxdist but don't log it. It has its own logfile
(
if [ -n "${PTXDIST_FD_STDOUT}" ]; then
exec 1> >(sed "s/^/${pkg_label}: /" >&${PTXDIST_FD_STDOUT})
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH v2] Fix some typos, grammar and duplicated words
2025-01-03 16:57 [ptxdist] [PATCH] Fix some typos, grammar and duplicated words Markus Heidelberg
@ 2025-01-07 12:02 ` Markus Heidelberg
2025-01-07 14:11 ` Alexander Dahl
0 siblings, 1 reply; 3+ messages in thread
From: Markus Heidelberg @ 2025-01-07 12:02 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
v2:
Found another typo and a few build->built grammar issues.
config/setup/Kconfig | 6 +++---
doc/dev_dir_hierarchy.rst | 2 +-
doc/dev_licenses.rst | 2 +-
doc/ref_parameter.rst | 2 +-
rules/project-name.in | 6 +++---
scripts/lib/ptxd_make_nested.sh | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/config/setup/Kconfig b/config/setup/Kconfig
index 4c51e865b..53177e727 100644
--- a/config/setup/Kconfig
+++ b/config/setup/Kconfig
@@ -440,7 +440,7 @@ choice
bool
prompt "podman"
help
- Use podman ad container provider. '--userns=keep-id' will be
+ Use podman as container provider. '--userns=keep-id' will be
used to map calling user into the container.
endchoice
@@ -455,7 +455,7 @@ config SETUP_CONTAINER_ARGS
string
prompt "extra args"
help
- Additional arguments for the container manager. The will be inserted
+ Additional arguments for the container manager. They will be inserted
directly before the container image in the docker/podman command-line.
config SETUP_CONTAINER_DEVELOP
@@ -463,7 +463,7 @@ config SETUP_CONTAINER_DEVELOP
prompt "developer mode"
help
In developer mode, additional directories will be mounted into the
- container, such at the user global ptxdistrc and sources symlinked in
+ container, such as the user global ptxdistrc and sources symlinked in
local_src/.
endif
diff --git a/doc/dev_dir_hierarchy.rst b/doc/dev_dir_hierarchy.rst
index bd1ad40d0..6d1c7e968 100644
--- a/doc/dev_dir_hierarchy.rst
+++ b/doc/dev_dir_hierarchy.rst
@@ -51,7 +51,7 @@ Patches are looked for at several locations:
1. the ``patches/`` folder in your BSP (``${PTXDIST_WORKSPACE}/patches``)
-2. the folder ``patches/`` folder relative to your selected platformconfig
+2. the ``patches/`` folder relative to your selected platformconfig
file (``${PTXDIST_PLATFORMCONFIGDIR}/patches``). If your platformconfig
file is at ``configs/|ptxdistPlatformConfigDir|/platformconfig``, this
patch folder will be ``configs/|ptxdistPlatformConfigDir|/patches/``.
diff --git a/doc/dev_licenses.rst b/doc/dev_licenses.rst
index 6aed9daac..b0814e782 100644
--- a/doc/dev_licenses.rst
+++ b/doc/dev_licenses.rst
@@ -221,7 +221,7 @@ For the example above, lines 1 to 16 of main.cc would be::
Always include the copyright statement ("Copyright YYYY (C) Some Person")
for the calculation of the checksum, even if it means that the checksum changes
on package updates when new years are added to the string.
-While it is not is needed for most licenses to be valid, some licenses require
+While it is not needed for most licenses to be valid, some licenses require
that it must not be removed (e.g. see GPLv2, section 1),
and it is proper etiquette to give attribution to the maintainers in the
license report document.
diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
index de7b688a9..36cb65eb5 100644
--- a/doc/ref_parameter.rst
+++ b/doc/ref_parameter.rst
@@ -225,7 +225,7 @@ Misc Actions
``bsp-info``
show some basic information about the BSP. The currently used configs,
- all layers, the images that are build, etc.
+ all layers, the images that are built, etc.
``package-info <pkg>``
show some basic information about the package. This includes the version,
diff --git a/rules/project-name.in b/rules/project-name.in
index ff20d6fc5..be5f52a88 100644
--- a/rules/project-name.in
+++ b/rules/project-name.in
@@ -77,7 +77,7 @@ config PROJECT_CHECK_LICENSES
bool
prompt "check licenses during normal build"
help
- If this is enabled <pkg>.report is build during the normal build
+ If this is enabled <pkg>.report is built during the normal build
process. As a result all specified md5 sums for license files are
verified.
@@ -85,9 +85,9 @@ config PROJECT_GENERATE_REPORTS
bool
prompt "generate reports with all relevant images"
help
- If this es enabled <image>.reports is build before the
+ If this is enabled <image>.reports is built before the
corresponding image. This is only relevant for images that are
- build from packages since the document covers all packages that
+ built from packages since the document covers all packages that
are part of the image.
config PROJECT_STORE_SOURCE_GIT_COMMITS
diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh
index 5062d2a5f..54535377f 100644
--- a/scripts/lib/ptxd_make_nested.sh
+++ b/scripts/lib/ptxd_make_nested.sh
@@ -79,7 +79,7 @@ ptxd_make_nested_ptxdist() {
ptxd_verbose "executing:" "${args[@]}"
- # run ptxdist but don't log it. It has it's on logfile
+ # run ptxdist but don't log it. It has its own logfile
(
if [ -n "${PTXDIST_FD_STDOUT}" ]; then
exec 1> >(sed "s/^/${pkg_label}: /" >&${PTXDIST_FD_STDOUT})
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH v2] Fix some typos, grammar and duplicated words
2025-01-07 12:02 ` [ptxdist] [PATCH v2] " Markus Heidelberg
@ 2025-01-07 14:11 ` Alexander Dahl
0 siblings, 0 replies; 3+ messages in thread
From: Alexander Dahl @ 2025-01-07 14:11 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
Hello Markus,
Am Tue, Jan 07, 2025 at 01:02:42PM +0100 schrieb Markus Heidelberg:
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> ---
>
> v2:
> Found another typo and a few build->built grammar issues.
>
> config/setup/Kconfig | 6 +++---
> doc/dev_dir_hierarchy.rst | 2 +-
> doc/dev_licenses.rst | 2 +-
> doc/ref_parameter.rst | 2 +-
> rules/project-name.in | 6 +++---
> scripts/lib/ptxd_make_nested.sh | 2 +-
> 6 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/config/setup/Kconfig b/config/setup/Kconfig
> index 4c51e865b..53177e727 100644
> --- a/config/setup/Kconfig
> +++ b/config/setup/Kconfig
> @@ -440,7 +440,7 @@ choice
> bool
> prompt "podman"
> help
> - Use podman ad container provider. '--userns=keep-id' will be
> + Use podman as container provider. '--userns=keep-id' will be
> used to map calling user into the container.
>
> endchoice
> @@ -455,7 +455,7 @@ config SETUP_CONTAINER_ARGS
> string
> prompt "extra args"
> help
> - Additional arguments for the container manager. The will be inserted
> + Additional arguments for the container manager. They will be inserted
> directly before the container image in the docker/podman command-line.
>
> config SETUP_CONTAINER_DEVELOP
> @@ -463,7 +463,7 @@ config SETUP_CONTAINER_DEVELOP
> prompt "developer mode"
> help
> In developer mode, additional directories will be mounted into the
> - container, such at the user global ptxdistrc and sources symlinked in
> + container, such as the user global ptxdistrc and sources symlinked in
> local_src/.
>
> endif
> diff --git a/doc/dev_dir_hierarchy.rst b/doc/dev_dir_hierarchy.rst
> index bd1ad40d0..6d1c7e968 100644
> --- a/doc/dev_dir_hierarchy.rst
> +++ b/doc/dev_dir_hierarchy.rst
> @@ -51,7 +51,7 @@ Patches are looked for at several locations:
>
> 1. the ``patches/`` folder in your BSP (``${PTXDIST_WORKSPACE}/patches``)
>
> -2. the folder ``patches/`` folder relative to your selected platformconfig
> +2. the ``patches/`` folder relative to your selected platformconfig
> file (``${PTXDIST_PLATFORMCONFIGDIR}/patches``). If your platformconfig
> file is at ``configs/|ptxdistPlatformConfigDir|/platformconfig``, this
> patch folder will be ``configs/|ptxdistPlatformConfigDir|/patches/``.
> diff --git a/doc/dev_licenses.rst b/doc/dev_licenses.rst
> index 6aed9daac..b0814e782 100644
> --- a/doc/dev_licenses.rst
> +++ b/doc/dev_licenses.rst
> @@ -221,7 +221,7 @@ For the example above, lines 1 to 16 of main.cc would be::
> Always include the copyright statement ("Copyright YYYY (C) Some Person")
> for the calculation of the checksum, even if it means that the checksum changes
> on package updates when new years are added to the string.
> -While it is not is needed for most licenses to be valid, some licenses require
> +While it is not needed for most licenses to be valid, some licenses require
> that it must not be removed (e.g. see GPLv2, section 1),
> and it is proper etiquette to give attribution to the maintainers in the
> license report document.
> diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
> index de7b688a9..36cb65eb5 100644
> --- a/doc/ref_parameter.rst
> +++ b/doc/ref_parameter.rst
> @@ -225,7 +225,7 @@ Misc Actions
>
> ``bsp-info``
> show some basic information about the BSP. The currently used configs,
> - all layers, the images that are build, etc.
> + all layers, the images that are built, etc.
>
> ``package-info <pkg>``
> show some basic information about the package. This includes the version,
> diff --git a/rules/project-name.in b/rules/project-name.in
> index ff20d6fc5..be5f52a88 100644
> --- a/rules/project-name.in
> +++ b/rules/project-name.in
> @@ -77,7 +77,7 @@ config PROJECT_CHECK_LICENSES
> bool
> prompt "check licenses during normal build"
> help
> - If this is enabled <pkg>.report is build during the normal build
> + If this is enabled <pkg>.report is built during the normal build
> process. As a result all specified md5 sums for license files are
> verified.
>
> @@ -85,9 +85,9 @@ config PROJECT_GENERATE_REPORTS
> bool
> prompt "generate reports with all relevant images"
> help
> - If this es enabled <image>.reports is build before the
> + If this is enabled <image>.reports is built before the
> corresponding image. This is only relevant for images that are
> - build from packages since the document covers all packages that
> + built from packages since the document covers all packages that
> are part of the image.
>
> config PROJECT_STORE_SOURCE_GIT_COMMITS
> diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh
> index 5062d2a5f..54535377f 100644
> --- a/scripts/lib/ptxd_make_nested.sh
> +++ b/scripts/lib/ptxd_make_nested.sh
> @@ -79,7 +79,7 @@ ptxd_make_nested_ptxdist() {
>
> ptxd_verbose "executing:" "${args[@]}"
>
> - # run ptxdist but don't log it. It has it's on logfile
> + # run ptxdist but don't log it. It has its own logfile
> (
> if [ -n "${PTXDIST_FD_STDOUT}" ]; then
> exec 1> >(sed "s/^/${pkg_label}: /" >&${PTXDIST_FD_STDOUT})
Seem all valid fixes to me on a quick glance, so …
Acked-by: Alexander Dahl <ada@thorsis.com>
Greets
Alex
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-07 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-03 16:57 [ptxdist] [PATCH] Fix some typos, grammar and duplicated words Markus Heidelberg
2025-01-07 12:02 ` [ptxdist] [PATCH v2] " Markus Heidelberg
2025-01-07 14:11 ` Alexander Dahl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox