diff --git a/supplementary_style_guide/glossary_terms_conventions/general_conventions/e.adoc b/supplementary_style_guide/glossary_terms_conventions/general_conventions/e.adoc index 02e2972a..d2d68a2b 100644 --- a/supplementary_style_guide/glossary_terms_conventions/general_conventions/e.adoc +++ b/supplementary_style_guide/glossary_terms_conventions/general_conventions/e.adoc @@ -88,6 +88,17 @@ If referring to the program, use "Emacs", for example, "Source-Navigator support *See also*: +[[email]] +==== image:images/caution.png[with caution] email (noun) +*Description*: Use _email_ to refer to the communication system or service. To improve translation accuracy, distinguish between _email address_ (a specific address such as user@example.com) and _email message_ (a communication sent by using email). + +*Use it*: with caution + +[.vale-ignore] +*Incorrect forms*: + +*See also*: + [[emit]] ==== image:images/yes.png[yes] emit (verb) *Description*: _Emit_ means to send something out. Do not use "send out" because that is too informal and imprecise. Alternatively, use "issue". diff --git a/supplementary_style_guide/glossary_terms_conventions/general_conventions/m.adoc b/supplementary_style_guide/glossary_terms_conventions/general_conventions/m.adoc index 39fdbafb..b6ffe209 100644 --- a/supplementary_style_guide/glossary_terms_conventions/general_conventions/m.adoc +++ b/supplementary_style_guide/glossary_terms_conventions/general_conventions/m.adoc @@ -209,7 +209,7 @@ [[media]] ==== image:images/yes.png[yes] media (noun) -*Description*: (1) _Media_ are objects on which data can be stored. These objects include hard disks, diskettes, CDs, and tapes. (2) In computer networks, "media" refer to the cables linking workstations together. There are many different types of transmission media, the most popular being twisted-pair wire (normal electrical wire), coaxial cable (the type of cable used for cable television), and fiber optic cable (cables made out of glass). (3) "Media" can also mean the form and technology used to communicate information. Multimedia presentations, for example, combine sound, pictures, and videos, all of which are different types of media. +*Description*: (1) _Media_ are objects on which data can be stored. These objects include hard disks, floppy disks, CDs, and tapes. (2) In computer networks, "media" refer to the cables linking workstations together. There are many different types of transmission media, the most popular being twisted-pair wire (normal electrical wire), coaxial cable (the type of cable used for cable television), and fiber optic cable (cables made out of glass). (3) "Media" can also mean the form and technology used to communicate information. Multimedia presentations, for example, combine sound, pictures, and videos, all of which are different types of media. *Use it*: yes diff --git a/supplementary_style_guide/style_guidelines/links.adoc b/supplementary_style_guide/style_guidelines/links.adoc index 6e2a8922..0bd09f99 100644 --- a/supplementary_style_guide/style_guidelines/links.adoc +++ b/supplementary_style_guide/style_guidelines/links.adoc @@ -78,7 +78,7 @@ For a non-cloud environment, you can resize the disk and file system. For more i .Example: Running text -If your Apache web server configuration enables SSL security, verify that you enable only the TLSv1 protocol and disable SSLv2 and SSLv3. This is because of the link:https://access.redhat.com/solutions/1232413[POODLE SSL vulnerability (CVE-2014-3566)]. +If your Apache web server configuration enables SSL security, enable only the TLSv1 protocol. Disable SSLv2 and SSLv3 because they are vulnerable to the link:https://access.redhat.com/solutions/1232413[POODLE SSL vulnerability (CVE-2014-3566)]. .Example: Additional resources