Skip to content

Commit 4e9a51a

Browse files
authored
Merge pull request #409 from dfitzmau/item-23-147
item-23-147
2 parents 53d142e + e1c3085 commit 4e9a51a

File tree

2 files changed

+5
-5
lines changed
  • supplementary_style_guide/glossary_terms_conventions/general_conventions

2 files changed

+5
-5
lines changed

supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ The practice of having both modes together is often referred to as _hybrid_, _ag
149149
*See also*:
150150

151151
[[binary-rpm]]
152-
==== image:images/yes.png[yes] binary RPM (noun)
153-
*Description*: A _binary RPM_ is an RPM package that contains the binaries built from sources and patches.
152+
==== image:images/yes.png[yes] binary RPM file (noun)
153+
*Description*: A _binary RPM file_ is an RPM package that contains the binaries built from sources and patches.
154154

155155
*Use it*: yes
156156

supplementary_style_guide/glossary_terms_conventions/general_conventions/s.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ Therefore, if you need to use the indefinite article before "sosreport", use _an
644644

645645
[[source-rpm]]
646646
==== image:images/yes.png[yes] Source RPM (noun)
647-
*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.
647+
*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.
648648

649649
*Use it*: yes
650650

@@ -720,7 +720,7 @@ Therefore, if you need to use the indefinite article before "sosreport", use _an
720720
// OCP: Added "In Red Hat OpenShift,"
721721
[[spec]]
722722
==== image:images/yes.png[yes] spec (noun)
723-
*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.
723+
*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.
724724

725725
Example of correct usage:
726726

@@ -734,7 +734,7 @@ _Update the `Pod` spec to reflect the changes._
734734

735735
[[spec-file]]
736736
==== image:images/yes.png[yes] spec file (noun)
737-
*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.
737+
*Description*: The `rpmbuild` tool uses a _spec file_ to build an RPM package. A spec file defines instructions in a series of sections.
738738

739739
*Use it*: yes
740740

0 commit comments

Comments
 (0)