From bded9ec800f2df2eabc1ce5bf0927bdfafe8ac74 Mon Sep 17 00:00:00 2001 From: dfitzmau Date: Thu, 28 Sep 2023 17:12:13 +0100 Subject: [PATCH] item-23-147 --- .../glossary_terms_conventions/general_conventions/b.adoc | 4 ++-- .../glossary_terms_conventions/general_conventions/s.adoc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc b/supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc index 1a8e139b..101f2bc2 100644 --- a/supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc +++ b/supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc @@ -158,8 +158,8 @@ The practice of having both modes together is often referred to as _hybrid_, _ag *See also*: [[binary-rpm]] -==== image:images/yes.png[yes] binary RPM (noun) -*Description*: A _binary RPM_ is an RPM package that contains the binaries built from sources and patches. +==== image:images/yes.png[yes] binary RPM file (noun) +*Description*: A _binary RPM_ file is an RPM package that contains the binaries built from sources and patches. *Use it*: yes diff --git a/supplementary_style_guide/glossary_terms_conventions/general_conventions/s.adoc b/supplementary_style_guide/glossary_terms_conventions/general_conventions/s.adoc index cc9651e4..477eb4be 100644 --- a/supplementary_style_guide/glossary_terms_conventions/general_conventions/s.adoc +++ b/supplementary_style_guide/glossary_terms_conventions/general_conventions/s.adoc @@ -644,7 +644,7 @@ Therefore, if you need to use the indefinite article before "sosreport", use _an [[source-rpm]] ==== image:images/yes.png[yes] Source RPM (noun) -*Description*: _Source RPM_, or SRPM, is an RPM package that contains the complete source code, including any patches, and a SPEC file that describes how to build the source code into a binary RPM. +*Description*: _Source RPM_, or SRPM, is an RPM package that contains the complete source code, including any patches, and a SPEC file that describes how to build the source code into a binary RPM file. *Use it*: yes @@ -720,7 +720,7 @@ Therefore, if you need to use the indefinite article before "sosreport", use _an // OCP: Added "In Red Hat OpenShift," [[spec]] ==== image:images/yes.png[yes] spec (noun) -*Description*: In Red Hat OpenShift, in addition to "spec file", which is permitted when it relates to RPM spec files, you can also use "spec" for general usage when you describe Kubernetes or OpenShift Container Platform object specs, manifests, or definitions. +*Description*: In Red Hat OpenShift, use "spec and "spec file" when you want to describe an RPM spec file. You can also use "spec" for general usage when you describe Kubernetes or OpenShift Container Platform object specs, manifests, or definitions. Example of correct usage: @@ -734,7 +734,7 @@ _Update the `Pod` spec to reflect the changes._ [[spec-file]] ==== image:images/yes.png[yes] spec file (noun) -*Description*: _Spec files_ are used as part of rebuilding RPMs. The spec file outlines how to configure and compile the RPM as well as how to install the files later. +*Description*: The `rpmbuild` tool uses a _spec file_ to build an RPM package. A spec file defines instructions in a series of sections. *Use it*: yes