Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

item-23-147 #409

Merged
merged 1 commit into from
Oct 17, 2023
Merged

item-23-147 #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions supplementary_style_guide/glossary_terms_conventions/general_conventions/s.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:

Expand All @@ -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

Expand Down