diff --git a/en/security/advisories.xml b/en/security/advisories.xml
index dc7a87e5e2..1e4c0b3461 100644
--- a/en/security/advisories.xml
+++ b/en/security/advisories.xml
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.92 2002/05/13 15:47:45 jedgar Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.93 2002/05/14 20:14:18 dannyboy Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.92 2002/05/13 15:47:45 jedgar Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.93 2002/05/14 20:14:18 dannyboy Exp $ -->
<html>
&header;
@@ -12,20 +12,20 @@
<H2>Introduction</H2>
<P>This web page is designed to assist both new and experienced users
-in the area of security for the FreeBSD Operating System. The FreeBSD
-Development team takes security very seriously and is constantly working
+in the area of FreeBSD security. FreeBSD
+takes security very seriously and is constantly working
on making the OS as secure as possible.</P>
<P>Here you will find additional information, or links to information,
-on how to protect your system against various types of outside attack,
-whom to contact if you find a security related bug, etc. There is
+on how to protect your system against various types of attack,
+on whom to contact if you find a security-related bug, and so on. There is
also a section on the various ways that the systems programmer can
-become more security conscious so he or she is less likely to
-introduce security holes in the first place.</P>
+become more security conscious so that he is less likely to
+introduce vulnerabilities.</P>
<H2>Table of Contents</H2>
<UL>
-<LI><A HREF="#sec">Information about the FreeBSD Security Officer</A></LI>
+<LI><A HREF="#sec">Information about the FreeBSD Security Officer Team</A></LI>
<LI><A HREF="#adv">FreeBSD Security Advisories</A></LI>
<LI><A HREF="#ml">FreeBSD Security Mailing Lists Information</A></LI>
<LI><A HREF="#tat">FreeBSD Security Tips and Tricks</A></LI>
@@ -34,27 +34,27 @@ introduce security holes in the first place.</P>
</UL>
<A NAME=sec></A>
-<H2>The FreeBSD Security Officer</H2>
+<H2>The FreeBSD Security Officer Team</H2>
<P>To better coordinate information exchange with others in the security
community, FreeBSD has a focal point for security related communications:
-The FreeBSD <a href="mailto:security-officer@FreeBSD.org">security officer</a>.
-The position is actually staffed by a team of dedicated security officers,
-their main tasks being to send out advisories when there are known security
+the FreeBSD <a href="mailto:security-officer@FreeBSD.org">Security Officer team</a>.
+The position is staffed by a team of dedicated security officers,
+whose main tasks are to send out advisories when there are known security
holes and to act on reports of possible security problems with FreeBSD.</P>
-<P>If you need to contact someone from the FreeBSD team about a
-possible security bug, you should therefore please <A
-HREF="mailto:security-officer@FreeBSD.org">send mail to the Security Officer</A>
-with a description of what you've found and the type of vulnerability it
-represents. The Security Officers also communicate with the various
+<P>If you need to contact someone from FreeBSD about a
+possible security bug, you should therefore <A
+HREF="mailto:security-officer@FreeBSD.org">send mail to the Security Officer team</A>
+with a description of what you have found and the type of vulnerability it
+represents. The Security Officer team also communicates with the various
<A HREF="http://www.cert.org">CERT </A>and <A
HREF="http://www.first.org/"> FIRST</A> teams around the world,
sharing information about possible vulnerabilities in FreeBSD or
-utilities commonly used by FreeBSD. The Security Officers are also
+utilities commonly used with FreeBSD. The Security Officers are also
active members of those organizations.</P>
-<P>If you do need to contact the Security Officer about a particularly
+<P>If you do need to contact the Security Officer team about a particularly
sensitive matter, please use their <A
HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
</A> to encrypt your message before sending it.</P>
@@ -62,7 +62,7 @@ HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
<A NAME=adv></A>
<H2>FreeBSD Security Advisories</H2>
-<P>The FreeBSD Security Officers provide security advisories for the
+<P>The FreeBSD Security Officer Team provides security advisories for the
following releases of FreeBSD:</P>
<UL>
@@ -85,7 +85,7 @@ to upgrade to one of the supported releases mentioned above.</P>
<P>Like all development efforts, security fixes are first brought into
the <A HREF="../handbook/cutting-edge.html#CURRENT">FreeBSD-current</A> branch.
After a couple of days and some testing, the fix is retrofitted into
-the supported FreeBSD-stable branch(es) and an advisory then sent
+the supported FreeBSD-stable branch(es) and an advisory is then sent
out.</P>
<P>Some statistics about advisories released during 2000:</P>
diff --git a/en/security/security.sgml b/en/security/security.sgml
index dc7a87e5e2..1e4c0b3461 100644
--- a/en/security/security.sgml
+++ b/en/security/security.sgml
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.92 2002/05/13 15:47:45 jedgar Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.93 2002/05/14 20:14:18 dannyboy Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.92 2002/05/13 15:47:45 jedgar Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.93 2002/05/14 20:14:18 dannyboy Exp $ -->
<html>
&header;
@@ -12,20 +12,20 @@
<H2>Introduction</H2>
<P>This web page is designed to assist both new and experienced users
-in the area of security for the FreeBSD Operating System. The FreeBSD
-Development team takes security very seriously and is constantly working
+in the area of FreeBSD security. FreeBSD
+takes security very seriously and is constantly working
on making the OS as secure as possible.</P>
<P>Here you will find additional information, or links to information,
-on how to protect your system against various types of outside attack,
-whom to contact if you find a security related bug, etc. There is
+on how to protect your system against various types of attack,
+on whom to contact if you find a security-related bug, and so on. There is
also a section on the various ways that the systems programmer can
-become more security conscious so he or she is less likely to
-introduce security holes in the first place.</P>
+become more security conscious so that he is less likely to
+introduce vulnerabilities.</P>
<H2>Table of Contents</H2>
<UL>
-<LI><A HREF="#sec">Information about the FreeBSD Security Officer</A></LI>
+<LI><A HREF="#sec">Information about the FreeBSD Security Officer Team</A></LI>
<LI><A HREF="#adv">FreeBSD Security Advisories</A></LI>
<LI><A HREF="#ml">FreeBSD Security Mailing Lists Information</A></LI>
<LI><A HREF="#tat">FreeBSD Security Tips and Tricks</A></LI>
@@ -34,27 +34,27 @@ introduce security holes in the first place.</P>
</UL>
<A NAME=sec></A>
-<H2>The FreeBSD Security Officer</H2>
+<H2>The FreeBSD Security Officer Team</H2>
<P>To better coordinate information exchange with others in the security
community, FreeBSD has a focal point for security related communications:
-The FreeBSD <a href="mailto:security-officer@FreeBSD.org">security officer</a>.
-The position is actually staffed by a team of dedicated security officers,
-their main tasks being to send out advisories when there are known security
+the FreeBSD <a href="mailto:security-officer@FreeBSD.org">Security Officer team</a>.
+The position is staffed by a team of dedicated security officers,
+whose main tasks are to send out advisories when there are known security
holes and to act on reports of possible security problems with FreeBSD.</P>
-<P>If you need to contact someone from the FreeBSD team about a
-possible security bug, you should therefore please <A
-HREF="mailto:security-officer@FreeBSD.org">send mail to the Security Officer</A>
-with a description of what you've found and the type of vulnerability it
-represents. The Security Officers also communicate with the various
+<P>If you need to contact someone from FreeBSD about a
+possible security bug, you should therefore <A
+HREF="mailto:security-officer@FreeBSD.org">send mail to the Security Officer team</A>
+with a description of what you have found and the type of vulnerability it
+represents. The Security Officer team also communicates with the various
<A HREF="http://www.cert.org">CERT </A>and <A
HREF="http://www.first.org/"> FIRST</A> teams around the world,
sharing information about possible vulnerabilities in FreeBSD or
-utilities commonly used by FreeBSD. The Security Officers are also
+utilities commonly used with FreeBSD. The Security Officers are also
active members of those organizations.</P>
-<P>If you do need to contact the Security Officer about a particularly
+<P>If you do need to contact the Security Officer team about a particularly
sensitive matter, please use their <A
HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
</A> to encrypt your message before sending it.</P>
@@ -62,7 +62,7 @@ HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
<A NAME=adv></A>
<H2>FreeBSD Security Advisories</H2>
-<P>The FreeBSD Security Officers provide security advisories for the
+<P>The FreeBSD Security Officer Team provides security advisories for the
following releases of FreeBSD:</P>
<UL>
@@ -85,7 +85,7 @@ to upgrade to one of the supported releases mentioned above.</P>
<P>Like all development efforts, security fixes are first brought into
the <A HREF="../handbook/cutting-edge.html#CURRENT">FreeBSD-current</A> branch.
After a couple of days and some testing, the fix is retrofitted into
-the supported FreeBSD-stable branch(es) and an advisory then sent
+the supported FreeBSD-stable branch(es) and an advisory is then sent
out.</P>
<P>Some statistics about advisories released during 2000:</P>
diff --git a/share/sgml/advisories.xml b/share/sgml/advisories.xml
index dc7a87e5e2..1e4c0b3461 100644
--- a/share/sgml/advisories.xml
+++ b/share/sgml/advisories.xml
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.92 2002/05/13 15:47:45 jedgar Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.93 2002/05/14 20:14:18 dannyboy Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.92 2002/05/13 15:47:45 jedgar Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.93 2002/05/14 20:14:18 dannyboy Exp $ -->
<html>
&header;
@@ -12,20 +12,20 @@
<H2>Introduction</H2>
<P>This web page is designed to assist both new and experienced users
-in the area of security for the FreeBSD Operating System. The FreeBSD
-Development team takes security very seriously and is constantly working
+in the area of FreeBSD security. FreeBSD
+takes security very seriously and is constantly working
on making the OS as secure as possible.</P>
<P>Here you will find additional information, or links to information,
-on how to protect your system against various types of outside attack,
-whom to contact if you find a security related bug, etc. There is
+on how to protect your system against various types of attack,
+on whom to contact if you find a security-related bug, and so on. There is
also a section on the various ways that the systems programmer can
-become more security conscious so he or she is less likely to
-introduce security holes in the first place.</P>
+become more security conscious so that he is less likely to
+introduce vulnerabilities.</P>
<H2>Table of Contents</H2>
<UL>
-<LI><A HREF="#sec">Information about the FreeBSD Security Officer</A></LI>
+<LI><A HREF="#sec">Information about the FreeBSD Security Officer Team</A></LI>
<LI><A HREF="#adv">FreeBSD Security Advisories</A></LI>
<LI><A HREF="#ml">FreeBSD Security Mailing Lists Information</A></LI>
<LI><A HREF="#tat">FreeBSD Security Tips and Tricks</A></LI>
@@ -34,27 +34,27 @@ introduce security holes in the first place.</P>
</UL>
<A NAME=sec></A>
-<H2>The FreeBSD Security Officer</H2>
+<H2>The FreeBSD Security Officer Team</H2>
<P>To better coordinate information exchange with others in the security
community, FreeBSD has a focal point for security related communications:
-The FreeBSD <a href="mailto:security-officer@FreeBSD.org">security officer</a>.
-The position is actually staffed by a team of dedicated security officers,
-their main tasks being to send out advisories when there are known security
+the FreeBSD <a href="mailto:security-officer@FreeBSD.org">Security Officer team</a>.
+The position is staffed by a team of dedicated security officers,
+whose main tasks are to send out advisories when there are known security
holes and to act on reports of possible security problems with FreeBSD.</P>
-<P>If you need to contact someone from the FreeBSD team about a
-possible security bug, you should therefore please <A
-HREF="mailto:security-officer@FreeBSD.org">send mail to the Security Officer</A>
-with a description of what you've found and the type of vulnerability it
-represents. The Security Officers also communicate with the various
+<P>If you need to contact someone from FreeBSD about a
+possible security bug, you should therefore <A
+HREF="mailto:security-officer@FreeBSD.org">send mail to the Security Officer team</A>
+with a description of what you have found and the type of vulnerability it
+represents. The Security Officer team also communicates with the various
<A HREF="http://www.cert.org">CERT </A>and <A
HREF="http://www.first.org/"> FIRST</A> teams around the world,
sharing information about possible vulnerabilities in FreeBSD or
-utilities commonly used by FreeBSD. The Security Officers are also
+utilities commonly used with FreeBSD. The Security Officers are also
active members of those organizations.</P>
-<P>If you do need to contact the Security Officer about a particularly
+<P>If you do need to contact the Security Officer team about a particularly
sensitive matter, please use their <A
HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
</A> to encrypt your message before sending it.</P>
@@ -62,7 +62,7 @@ HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
<A NAME=adv></A>
<H2>FreeBSD Security Advisories</H2>
-<P>The FreeBSD Security Officers provide security advisories for the
+<P>The FreeBSD Security Officer Team provides security advisories for the
following releases of FreeBSD:</P>
<UL>
@@ -85,7 +85,7 @@ to upgrade to one of the supported releases mentioned above.</P>
<P>Like all development efforts, security fixes are first brought into
the <A HREF="../handbook/cutting-edge.html#CURRENT">FreeBSD-current</A> branch.
After a couple of days and some testing, the fix is retrofitted into
-the supported FreeBSD-stable branch(es) and an advisory then sent
+the supported FreeBSD-stable branch(es) and an advisory is then sent
out.</P>
<P>Some statistics about advisories released during 2000:</P>