Skip to content

Commit dcb0be8

Browse files
authored
Merge pull request #371 from SNiemann15/ibm_readd_outdated
readd outdated entries
2 parents c142151 + 3d313af commit dcb0be8

File tree

2 files changed

+45
-6
lines changed
  • supplementary_style_guide/glossary_terms_conventions/general_conventions

2 files changed

+45
-6
lines changed

supplementary_style_guide/glossary_terms_conventions/general_conventions/i.adoc

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,25 @@
88

99
*See also*: xref:paas[PaaS], xref:saas[SaaS]
1010

11+
[[ibm-eserver-system-p]]
12+
==== image:images/no.png[no] IBM eServer System p (noun)
13+
*Description*: This is a former product name; instead use the official product name "IBM Power".
14+
15+
*Use it*: no
16+
17+
*Incorrect forms*: pSeries
18+
19+
*See also*: xref:ibm-power[IBM Power]
20+
21+
[[ibm-linuxone]]
22+
==== image:images/yes.png[yes] IBM® LinuxONE (noun)
23+
*Description*: _IBM® LinuxONE_ represents the IBM® LinuxONE platform (`s390x` architecture) and its products. "IBM®" must always precede "LinuxONE" in any context.
24+
25+
*Use it*: yes
26+
27+
*Incorrect forms*: IBM LinuxONE, LinuxONE, linuxone
28+
29+
*See also*: xref:ibm-z[IBM Z], xref:s390x[s390x]
1130

1231
[[ibm-power]]
1332
==== image:images/yes.png[yes] IBM Power® (noun)
@@ -19,15 +38,15 @@
1938

2039
*See also*:
2140

22-
[[ibm-linuxone]]
23-
==== image:images/yes.png[yes] IBM® LinuxONE (noun)
24-
*Description*: _IBM® LinuxONE_ represents the IBM® LinuxONE platform (`s390x` architecture) and its products. "IBM®" must always precede "LinuxONE" in any context.
41+
[[ibm-s-390]]
42+
==== image:images/no.png[no] IBM S/390 (noun)
43+
*Description*: This is a former product name; instead use the official product name "IBM Z".
2544

26-
*Use it*: yes
45+
*Use it*: no
2746

28-
*Incorrect forms*: IBM LinuxONE, LinuxONE, linuxone
47+
*Incorrect forms*: S/390, S90
2948

30-
*See also*: xref:ibm-z[IBM Z], xref:s390x[s390x]
49+
*See also*: xref:ibm-linuxone[IBM® LinuxONE], xref:ibm-z[IBM Z], xref:s390x[s390x]
3150

3251
[[ibm-z]]
3352
==== image:images/yes.png[yes] IBM Z® (noun)
@@ -607,6 +626,16 @@ _This feature can run only on Intel 64 processors_
607626

608627
*See also*:
609628

629+
[[iseries]]
630+
==== image:images/no.png[no] ISeries (noun)
631+
*Description*: This is a former product name; instead use the official product name "IBM Power".
632+
633+
*Use it*: no
634+
635+
*Incorrect forms*: iSeries
636+
637+
*See also*: xref:ibm-power[IBM Power]
638+
610639
[[iso]]
611640
==== image:images/yes.png[yes] ISO (noun)
612641
*Description*: _ISO_ is an acronym for the "International Organization for Standardization", which is an international standard-setting body made up of representatives from multiple national standards organizations. Since its founding in February 1947, ISO has promoted worldwide proprietary, industrial, and commercial standards.

supplementary_style_guide/glossary_terms_conventions/general_conventions/p.adoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,16 @@ When combined with permissions, privileges define an agent's overall access to a
481481

482482
*See also*:
483483

484+
[[pseries]]
485+
==== image:images/no.png[no] pSeries (noun)
486+
*Description*: This is a former product name; instead use the official product name "IBM Power".
487+
488+
*Use it*: no
489+
490+
*Incorrect forms*:
491+
492+
*See also*: xref:ibm-power[IBM Power]
493+
484494
[[pseudoops]]
485495
==== image:images/yes.png[yes] pseudo-ops (noun)
486496
*Description*: "Pseudo-ops" is an abbreviation for "pseudo operations" and is sometimes called an assembler directive. These keywords do not directly translate to a machine instruction.

0 commit comments

Comments
 (0)