Skip to content

Commit 180aeb8

Browse files
authored
Merge pull request #106 from atsansone/DOCSP-15750
(DOCSP-15750) Add offensive language to SG glossary
2 parents 42e25b8 + b66e78b commit 180aeb8

File tree

4 files changed

+54
-4
lines changed

4 files changed

+54
-4
lines changed

source/style-guide/includes/terms/b.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,28 @@ B
172172
*every two weeks*, *every two months*, *twice a week*, and *twice
173173
a month*.
174174

175+
blacklist
176+
:icon-fa4:`times-circle` Don't use. Use *access list* as a noun
177+
and *remove from an access list* as a verb. Use *blocked* as an
178+
adjective.
179+
180+
.. list-table::
181+
:widths: 50 50
182+
:header-rows: 1
183+
184+
* - Recommended
185+
- Not Recommended
186+
187+
* - To remove an entry to the access list, click
188+
**Go to Global Access List**.
189+
- To add a blacklist entry, click
190+
**Go to Global Blacklist**.
191+
* - You can search for an access list entry, add entries to the
192+
access list, and edit or remove existing entries in the
193+
access list.
194+
- You can search for a blacklist entry, add blacklist
195+
entries, and edit or delete existing blacklist entries.
196+
175197
Boolean
176198
Always use with an initial capital letter.
177199

source/style-guide/includes/terms/m.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ M
4343
providers. Capitalize when referring to it as a MongoDB
4444
offering.
4545

46+
master
47+
:icon-fa4:`times-circle` Don't use. Use *primary* as an adjective
48+
or noun.
49+
4650
matrixes
4751
As the plural of *matrix*, use *matrixes* rather than
4852
*matrices*.

source/style-guide/includes/terms/s.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ S
151151
:icon-fa5:`trash-alt` Use *slash* to refer to the / character,
152152
and use *backslash* to refer to \\ the character.
153153

154+
slave
155+
:icon-fa4:`times-circle` Don't use. Use *secondary* as an
156+
adjective or noun.
157+
154158
software as a service (SaaS)
155159
Note the capitalization of the spelled-out term and the
156160
abbreviation. On first occurrence, use the spelled-out term and

source/style-guide/includes/terms/w.rst

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,26 @@ W
9595
setup.
9696
-
9797

98+
whitelist
99+
:icon-fa4:`times-circle` Don't use. Use *access list* as a noun and *add to an access list* as a verb.
100+
101+
.. list-table::
102+
:widths: 50 50
103+
:header-rows: 1
104+
105+
* - Recommended
106+
- Not Recommended
107+
108+
* - To add an entry to the access list, click
109+
**Go to Global Access List**.
110+
- To add a whitelist entry, click
111+
**Go to Global Whitelist**.
112+
* - You can search for an access list entry, add entries to the
113+
access list, and edit or remove existing entries in the
114+
access list.
115+
- You can search for a whitelist entry, add whitelist
116+
entries, and edit or delete existing whitelist entries.
117+
98118
white paper
99119
Use as two words.
100120

@@ -134,11 +154,11 @@ W
134154
* - Recommended
135155
- Not Recommended
136156

137-
* - On the Rule Type page of the New Inbound Rule Wizard, select
138-
**Port** and then click **Next**.
157+
* - On the Rule Type page of the New Inbound Rule Wizard,
158+
select **Port** and then click **Next**.
139159

140-
Use the OSCommerce installation wizard to update any required
141-
permissions on the site's files.
160+
Use the OSCommerce installation wizard to update any
161+
required permissions on the site's files.
142162
-
143163

144164
work around

0 commit comments

Comments
 (0)