[ptxdist] [PATCH 1/2] Fix superfluous/duplicated words, grammar and typos

[ptxdist] [PATCH 1/2] Fix superfluous/duplicated words, grammar and typos

[Markus Heidelberg via ptxdist]

Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
 doc/daily_work.inc                      | 4 ++--
 doc/ref_make_variables.rst              | 4 ++--
 doc/ref_rule_file_layout.rst            | 2 +-
 scripts/lib/ptxd_make_image_archive.sh  | 2 +-
 scripts/lib/ptxd_make_image_genimage.sh | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/daily_work.inc b/doc/daily_work.inc
index b335b2e6b..f16cd490c 100644
--- a/doc/daily_work.inc
+++ b/doc/daily_work.inc
@@ -98,7 +98,7 @@ config file**).
 Work Flow
 ~~~~~~~~~
 
-Now its up to ourself working on the GIT based kernel source tree and
+Now it's up to ourself working on the GIT based kernel source tree and
 using PTXdist to include the kernel into the root filesystem.
 
 To configure the kernel source tree, we simply run:
@@ -1479,7 +1479,7 @@ be built at the same time but should contain a different packages list each
 (refer :ref:`multi_image_individual_root_filesystems` for details).
 
 Marking a menu file based dependency with ``if BUILDTIME`` limits the dependency
-to compile-time only. In this case its possible to have the package in one
+to compile-time only. In this case it's possible to have the package in one
 image's list, but not its dependency.
 
 Run-Time only Dependency
diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst
index e89c0e56c..807ed5db0 100644
--- a/doc/ref_make_variables.rst
+++ b/doc/ref_make_variables.rst
@@ -376,7 +376,7 @@ Build Environment for all Stages
   wrappers. The specified flags are added to the command line when
   appropriate. In most cases this it the preferred way to add additional
   flags. Adding them via environment variables or ``make`` arguments can
-  have unexpected side effects, such as as overwriting existing defaults.
+  have unexpected side effects, such as overwriting existing defaults.
 
 ``<PKG>_FLAGS_BLACKLIST``
   A list of arbitrary flags. If any one of these flags is found as an
@@ -536,7 +536,7 @@ different.
   ptxdist packages (the lowercase name of the packages). PTXdist will add
   the necessary dependencies.
 
-  Note that this will not ensure that the packages are enabled or that all
+  Note that this will not ensure that the packages are enabled or that
   all package dependencies are satisfied. ``$(PTX_PACKAGES_INSTALL)`` can
   be used to specify all enabled packages. Or ``$(call ptx/collection,
   $(PTXDIST_WORKSPACE)/configs/<collection-file-name>)`` can be used to
diff --git a/doc/ref_rule_file_layout.rst b/doc/ref_rule_file_layout.rst
index 222ee46a7..19b8dae52 100644
--- a/doc/ref_rule_file_layout.rst
+++ b/doc/ref_rule_file_layout.rst
@@ -117,7 +117,7 @@ which looks like this:
 What ``world/prepare`` does depends on some variable settings.
 
 If the package’s rule file defines ``<PKG>_CONF_TOOL`` to ``NO``,
-this stage is simply does nothing.
+this stage simply does nothing.
 
 All rules files can create the ``<PKG>_CONF_ENV`` variable and should
 define it at least to ``$(CROSS_ENV)`` (the default) if the prepare stage
diff --git a/scripts/lib/ptxd_make_image_archive.sh b/scripts/lib/ptxd_make_image_archive.sh
index 053020fa4..f4c689d58 100644
--- a/scripts/lib/ptxd_make_image_archive.sh
+++ b/scripts/lib/ptxd_make_image_archive.sh
@@ -7,7 +7,7 @@
 #
 
 #
-# extract ipkg an generate a tgz image
+# extract ipkg and generate a tgz image
 #
 ptxd_make_image_archive_impl() {
     ptxd_make_image_init &&
diff --git a/scripts/lib/ptxd_make_image_genimage.sh b/scripts/lib/ptxd_make_image_genimage.sh
index cd7058bfc..58804a743 100644
--- a/scripts/lib/ptxd_make_image_genimage.sh
+++ b/scripts/lib/ptxd_make_image_genimage.sh
@@ -48,7 +48,7 @@ ptxd_make_image_genimage_config() {
 export -f ptxd_make_image_genimage_config
 
 #
-# extract ipkg an generate a tgz image
+# extract ipkg and generate a tgz image
 #
 ptxd_make_image_genimage_impl() {
     local tmpdir configdir file
-- 
2.43.0

[ptxdist] [PATCH 2/2] doc: use correct spelling for Git/GitHub instead of all uppercase

[Markus Heidelberg via ptxdist]

Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
 doc/daily_work.inc | 8 ++++----
 doc/titlepage.inc  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/daily_work.inc b/doc/daily_work.inc
index f16cd490c..7071a0f15 100644
--- a/doc/daily_work.inc
+++ b/doc/daily_work.inc
@@ -5,7 +5,7 @@ Using an External Kernel Source Tree
 
 This application note describes how to use an external kernel source
 tree within a PTXdist project. In this case the external kernel source
-tree is managed by GIT.
+tree is managed by Git.
 
 Cloning the Linux Kernel Source Tree
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,7 +74,7 @@ enter it, and:
    configuration**.
 
    -  If no patches should be used on top of the selected kernel source
-      tree, we keep the **patch series file** entry empty. As GIT should
+      tree, we keep the **patch series file** entry empty. As Git should
       help us to create these patches for deployment, it should be kept
       empty on default in this first step.
 
@@ -98,7 +98,7 @@ config file**).
 Work Flow
 ~~~~~~~~~
 
-Now it's up to ourself working on the GIT based kernel source tree and
+Now it's up to ourself working on the Git based kernel source tree and
 using PTXdist to include the kernel into the root filesystem.
 
 To configure the kernel source tree, we simply run:
@@ -594,7 +594,7 @@ Setting-Up the Distributed Compiler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 How to setup the distributed compiler can be found on the project’s
-homepage at GITHUB:
+homepage at GitHub:
 
 https://github.com/icecc/icecream.
 
diff --git a/doc/titlepage.inc b/doc/titlepage.inc
index 2422291e7..af1812783 100644
--- a/doc/titlepage.inc
+++ b/doc/titlepage.inc
@@ -41,7 +41,7 @@
   +49\,(0)51\,21\,/\,20\,69\,17\,--\,0 (Fon)\\
   +49\,(0)51\,21\,/\,20\,69\,17\,--\,55\,55 (Fax)\\[1ex]
   info@pengutronix.de\\[2.5ex]
-  {\footnotesize \copyright \, \number \year \ Pengutronix, Hildesheim -- GIT Rev.\ |ptxdistBSPRevision| \negthinspace}
+  {\footnotesize \copyright \, \number \year \ Pengutronix, Hildesheim -- Git Rev.\ |ptxdistBSPRevision| \negthinspace}
 \end{textblock}
 
 \end{titlepage}
-- 
2.43.0

Re: [ptxdist] [PATCH 1/2] Fix superfluous/duplicated words, grammar and typos

[Alexander Dahl via ptxdist]

Hello Markus,

Am Tue, May 20, 2025 at 01:43:18PM +0200 schrieb Markus Heidelberg via ptxdist:
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> ---
>  doc/daily_work.inc                      | 4 ++--
>  doc/ref_make_variables.rst              | 4 ++--
>  doc/ref_rule_file_layout.rst            | 2 +-
>  scripts/lib/ptxd_make_image_archive.sh  | 2 +-
>  scripts/lib/ptxd_make_image_genimage.sh | 2 +-
>  5 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/doc/daily_work.inc b/doc/daily_work.inc
> index b335b2e6b..f16cd490c 100644
> --- a/doc/daily_work.inc
> +++ b/doc/daily_work.inc
> @@ -98,7 +98,7 @@ config file**).
>  Work Flow
>  ~~~~~~~~~
>  
> -Now its up to ourself working on the GIT based kernel source tree and
> +Now it's up to ourself working on the GIT based kernel source tree and
>  using PTXdist to include the kernel into the root filesystem.
>  
>  To configure the kernel source tree, we simply run:
> @@ -1479,7 +1479,7 @@ be built at the same time but should contain a different packages list each
>  (refer :ref:`multi_image_individual_root_filesystems` for details).
>  
>  Marking a menu file based dependency with ``if BUILDTIME`` limits the dependency
> -to compile-time only. In this case its possible to have the package in one
> +to compile-time only. In this case it's possible to have the package in one
>  image's list, but not its dependency.
>  
>  Run-Time only Dependency
> diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst
> index e89c0e56c..807ed5db0 100644
> --- a/doc/ref_make_variables.rst
> +++ b/doc/ref_make_variables.rst
> @@ -376,7 +376,7 @@ Build Environment for all Stages
>    wrappers. The specified flags are added to the command line when
>    appropriate. In most cases this it the preferred way to add additional
>    flags. Adding them via environment variables or ``make`` arguments can
> -  have unexpected side effects, such as as overwriting existing defaults.
> +  have unexpected side effects, such as overwriting existing defaults.
>  
>  ``<PKG>_FLAGS_BLACKLIST``
>    A list of arbitrary flags. If any one of these flags is found as an
> @@ -536,7 +536,7 @@ different.
>    ptxdist packages (the lowercase name of the packages). PTXdist will add
>    the necessary dependencies.
>  
> -  Note that this will not ensure that the packages are enabled or that all
> +  Note that this will not ensure that the packages are enabled or that
>    all package dependencies are satisfied. ``$(PTX_PACKAGES_INSTALL)`` can
>    be used to specify all enabled packages. Or ``$(call ptx/collection,
>    $(PTXDIST_WORKSPACE)/configs/<collection-file-name>)`` can be used to
> diff --git a/doc/ref_rule_file_layout.rst b/doc/ref_rule_file_layout.rst
> index 222ee46a7..19b8dae52 100644
> --- a/doc/ref_rule_file_layout.rst
> +++ b/doc/ref_rule_file_layout.rst
> @@ -117,7 +117,7 @@ which looks like this:
>  What ``world/prepare`` does depends on some variable settings.
>  
>  If the package’s rule file defines ``<PKG>_CONF_TOOL`` to ``NO``,
> -this stage is simply does nothing.
> +this stage simply does nothing.
>  
>  All rules files can create the ``<PKG>_CONF_ENV`` variable and should
>  define it at least to ``$(CROSS_ENV)`` (the default) if the prepare stage
> diff --git a/scripts/lib/ptxd_make_image_archive.sh b/scripts/lib/ptxd_make_image_archive.sh
> index 053020fa4..f4c689d58 100644
> --- a/scripts/lib/ptxd_make_image_archive.sh
> +++ b/scripts/lib/ptxd_make_image_archive.sh
> @@ -7,7 +7,7 @@
>  #
>  
>  #
> -# extract ipkg an generate a tgz image
> +# extract ipkg and generate a tgz image
>  #
>  ptxd_make_image_archive_impl() {
>      ptxd_make_image_init &&
> diff --git a/scripts/lib/ptxd_make_image_genimage.sh b/scripts/lib/ptxd_make_image_genimage.sh
> index cd7058bfc..58804a743 100644
> --- a/scripts/lib/ptxd_make_image_genimage.sh
> +++ b/scripts/lib/ptxd_make_image_genimage.sh
> @@ -48,7 +48,7 @@ ptxd_make_image_genimage_config() {
>  export -f ptxd_make_image_genimage_config
>  
>  #
> -# extract ipkg an generate a tgz image
> +# extract ipkg and generate a tgz image
>  #
>  ptxd_make_image_genimage_impl() {
>      local tmpdir configdir file

Reviewed-by: Alexander Dahl <ada@thorsis.com>

Greets
Alex

Re: [ptxdist] [APPLIED] Fix superfluous/duplicated words, grammar and typos

[Michael Olbrich]

Thanks, applied as 945f720225974b71819a7a940886e7d23ef29b1d.

Michael

[sent from post-receive hook]

On Tue, 03 Jun 2025 12:38:48 +0200, Markus Heidelberg <m.heidelberg@cab.de> wrote:
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> Reviewed-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20250520114620.166168-1-m.heidelberg@cab.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/doc/daily_work.inc b/doc/daily_work.inc
> index b335b2e6b174..f16cd490c614 100644
> --- a/doc/daily_work.inc
> +++ b/doc/daily_work.inc
> @@ -98,7 +98,7 @@ config file**).
>  Work Flow
>  ~~~~~~~~~
>  
> -Now its up to ourself working on the GIT based kernel source tree and
> +Now it's up to ourself working on the GIT based kernel source tree and
>  using PTXdist to include the kernel into the root filesystem.
>  
>  To configure the kernel source tree, we simply run:
> @@ -1479,7 +1479,7 @@ be built at the same time but should contain a different packages list each
>  (refer :ref:`multi_image_individual_root_filesystems` for details).
>  
>  Marking a menu file based dependency with ``if BUILDTIME`` limits the dependency
> -to compile-time only. In this case its possible to have the package in one
> +to compile-time only. In this case it's possible to have the package in one
>  image's list, but not its dependency.
>  
>  Run-Time only Dependency
> diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst
> index e89c0e56c5fb..807ed5db051d 100644
> --- a/doc/ref_make_variables.rst
> +++ b/doc/ref_make_variables.rst
> @@ -376,7 +376,7 @@ Build Environment for all Stages
>    wrappers. The specified flags are added to the command line when
>    appropriate. In most cases this it the preferred way to add additional
>    flags. Adding them via environment variables or ``make`` arguments can
> -  have unexpected side effects, such as as overwriting existing defaults.
> +  have unexpected side effects, such as overwriting existing defaults.
>  
>  ``<PKG>_FLAGS_BLACKLIST``
>    A list of arbitrary flags. If any one of these flags is found as an
> @@ -536,7 +536,7 @@ different.
>    ptxdist packages (the lowercase name of the packages). PTXdist will add
>    the necessary dependencies.
>  
> -  Note that this will not ensure that the packages are enabled or that all
> +  Note that this will not ensure that the packages are enabled or that
>    all package dependencies are satisfied. ``$(PTX_PACKAGES_INSTALL)`` can
>    be used to specify all enabled packages. Or ``$(call ptx/collection,
>    $(PTXDIST_WORKSPACE)/configs/<collection-file-name>)`` can be used to
> diff --git a/doc/ref_rule_file_layout.rst b/doc/ref_rule_file_layout.rst
> index 222ee46a7b29..19b8dae52b22 100644
> --- a/doc/ref_rule_file_layout.rst
> +++ b/doc/ref_rule_file_layout.rst
> @@ -117,7 +117,7 @@ which looks like this:
>  What ``world/prepare`` does depends on some variable settings.
>  
>  If the package’s rule file defines ``<PKG>_CONF_TOOL`` to ``NO``,
> -this stage is simply does nothing.
> +this stage simply does nothing.
>  
>  All rules files can create the ``<PKG>_CONF_ENV`` variable and should
>  define it at least to ``$(CROSS_ENV)`` (the default) if the prepare stage
> diff --git a/scripts/lib/ptxd_make_image_archive.sh b/scripts/lib/ptxd_make_image_archive.sh
> index 053020fa4859..f4c689d58964 100644
> --- a/scripts/lib/ptxd_make_image_archive.sh
> +++ b/scripts/lib/ptxd_make_image_archive.sh
> @@ -7,7 +7,7 @@
>  #
>  
>  #
> -# extract ipkg an generate a tgz image
> +# extract ipkg and generate a tgz image
>  #
>  ptxd_make_image_archive_impl() {
>      ptxd_make_image_init &&
> diff --git a/scripts/lib/ptxd_make_image_genimage.sh b/scripts/lib/ptxd_make_image_genimage.sh
> index cd7058bfcb96..58804a743fe0 100644
> --- a/scripts/lib/ptxd_make_image_genimage.sh
> +++ b/scripts/lib/ptxd_make_image_genimage.sh
> @@ -48,7 +48,7 @@ ptxd_make_image_genimage_config() {
>  export -f ptxd_make_image_genimage_config
>  
>  #
> -# extract ipkg an generate a tgz image
> +# extract ipkg and generate a tgz image
>  #
>  ptxd_make_image_genimage_impl() {
>      local tmpdir configdir file

Re: [ptxdist] [APPLIED] doc: use correct spelling for Git/GitHub instead of all uppercase

[Michael Olbrich]

Thanks, applied as 28f4845ead5fd90acdfb445a3acc78158a72f142.

Michael

[sent from post-receive hook]

On Tue, 03 Jun 2025 12:38:49 +0200, Markus Heidelberg <m.heidelberg@cab.de> wrote:
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> Message-Id: <20250520114620.166168-2-m.heidelberg@cab.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/doc/daily_work.inc b/doc/daily_work.inc
> index f16cd490c614..7071a0f1577b 100644
> --- a/doc/daily_work.inc
> +++ b/doc/daily_work.inc
> @@ -5,7 +5,7 @@ Using an External Kernel Source Tree
>  
>  This application note describes how to use an external kernel source
>  tree within a PTXdist project. In this case the external kernel source
> -tree is managed by GIT.
> +tree is managed by Git.
>  
>  Cloning the Linux Kernel Source Tree
>  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> @@ -74,7 +74,7 @@ enter it, and:
>     configuration**.
>  
>     -  If no patches should be used on top of the selected kernel source
> -      tree, we keep the **patch series file** entry empty. As GIT should
> +      tree, we keep the **patch series file** entry empty. As Git should
>        help us to create these patches for deployment, it should be kept
>        empty on default in this first step.
>  
> @@ -98,7 +98,7 @@ config file**).
>  Work Flow
>  ~~~~~~~~~
>  
> -Now it's up to ourself working on the GIT based kernel source tree and
> +Now it's up to ourself working on the Git based kernel source tree and
>  using PTXdist to include the kernel into the root filesystem.
>  
>  To configure the kernel source tree, we simply run:
> @@ -594,7 +594,7 @@ Setting-Up the Distributed Compiler
>  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>  
>  How to setup the distributed compiler can be found on the project’s
> -homepage at GITHUB:
> +homepage at GitHub:
>  
>  https://github.com/icecc/icecream.
>  
> diff --git a/doc/titlepage.inc b/doc/titlepage.inc
> index 2422291e7ebd..af18127832c1 100644
> --- a/doc/titlepage.inc
> +++ b/doc/titlepage.inc
> @@ -41,7 +41,7 @@
>    +49\,(0)51\,21\,/\,20\,69\,17\,--\,0 (Fon)\\
>    +49\,(0)51\,21\,/\,20\,69\,17\,--\,55\,55 (Fax)\\[1ex]
>    info@pengutronix.de\\[2.5ex]
> -  {\footnotesize \copyright \, \number \year \ Pengutronix, Hildesheim -- GIT Rev.\ |ptxdistBSPRevision| \negthinspace}
> +  {\footnotesize \copyright \, \number \year \ Pengutronix, Hildesheim -- Git Rev.\ |ptxdistBSPRevision| \negthinspace}
>  \end{textblock}
>  
>  \end{titlepage}