Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions entities/generic-attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,13 @@ include::./network-attributes.adoc[]
:huaweireg: {huawei}{thrdmrk}
:kunpeng: Kunpeng
:kunpengreg: {kunpeng}{thrdmrk}
// https://www.intel.com/content/www/us/en/legal/trademarks.html
:intel: Intel
:intelreg: {intel}{thrdmrk}
:optane: {intel}{nbsp}Optane
:optanereg: {intelreg}{nbsp}Optane{thrdmrk}
:optanemem: {optane} Memory
:optanememreg: {optanereg} Memory
// Khronos
:openmax: OpenMAX
:openmaxreg: {openmax}{thrdmrk}
Expand Down
7 changes: 7 additions & 0 deletions entities/generic-entities.ent
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,13 @@ use &deng;! -->
<!ENTITY huaweireg "&huawei;&thrdmrk;">
<!ENTITY kunpeng "Kunpeng">
<!ENTITY kunpengreg "&kunpeng;&thrdmrk;">
<!-- https://www.intel.com/content/www/us/en/legal/trademarks.html -->
<!ENTITY intel "Intel">
<!ENTITY intelreg "&intel;&thrdmrk;">
<!ENTITY optane "&intel;&nbsp;Optane">
<!ENTITY optanereg "&intelreg;&nbsp;Optane&thrdmrk;">
<!ENTITY optanemem "&optane; Memory">
<!ENTITY optanememreg "&optanereg; Memory">
<!-- Khronos -->
<!ENTITY openmax "OpenMAX">
<!ENTITY openmaxreg "&openmax;&thrdmrk;">
Expand Down