os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Reword a paragraph to be politically neutral [1]

Browse source 
- Reword a part with the word poignant so that non-native English speakers
  can understand it without a dictionary [2]
- Remove the non-offensive list as everything belongs to this category which
  does not meet the conditions of offensitivity [2]
- s/will/may/
- Whitespace

PR:		www/118284 [1]
Submitted by:	bsam [1], wilko [2]
Reviewed by:	wes
Approved by:	core
This commit is contained in:
Gabor Kovesdan 2008-01-06 20:08:06 +00:00
parent 871b965ef9
commit 1c12fdf659
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=31230
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
en/internal/fortunes.sgml
View file

@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/internal/fortunes.sgml,v 1.4 2006/02/22 13:28:14 joel Exp $">
<!ENTITY date "$FreeBSD: www/en/internal/fortunes.sgml,v 1.5 2006/08/19 21:20:35 hrs Exp $">
<!ENTITY title "Fortune File Commit Policy">
<!ENTITY % navinclude.docs "INCLUDE">
]>
@ -17,8 +17,9 @@
in what you are prepared to accept."</p>
<p>If an entry offends more than a couple of FreeBSD committers and
does not contain any objective poignant historical reference, the
entry should be in the offensive file.</p>
does not contain any reasonable historical reference, the entry should
be in the offensive file. The speaker of the quote is not to be the
basis for categorizing the quote as offensive.</p>
<p>Examples of offensive entries:</p>
@ -28,23 +29,13 @@
<li>Profanity, "adult" content.</li>
</ul>
<p>Examples of entries that should not usually be declared
'offensive':</p>
<ul>
<li>Hitler quotes.</li>
<li>Jokes about emacs/vi or your favorite technology, as long as
they stay in good fun and don't cross the line of a being a
vicious personal attack on the designer.</li>
</ul>
<p> If you add new material to the fortunes collection, please be
<p>If you add new material to the fortunes collection, please be
extra-diligent about unforeseen objections, and give plenty of
time for it to settle before MFCing.</p>
<p>Additional examples will be added to the offensive and
unoffensive lists above, as guidelines, whenever core@ is required
to settle a dispute on this issue.</p>
<p>Additional examples may be added to the offensive list above, as
guidelines, whenever core@ is required to settle a dispute on this
issue.</p>
&footer;