- Merge new layout.

Submitted by:	Emily Boyd <emilyboyd@emilyboyd.com>
Sponsored by:	Google Summer of Code 2005
This commit is contained in:
Simon L. B. Nielsen 2005-10-04 16:14:41 +00:00
parent 81ea7b4201
commit 76d5303646
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=25831
2 changed files with 7 additions and 5 deletions

View file

@ -1,7 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/security/charter.sgml,v 1.2 2004/04/13 18:09:53 trhodes Exp $">
<!ENTITY date "$FreeBSD: www/en/security/charter.sgml,v 1.3 2004/04/15 20:05:19 trhodes Exp $">
<!ENTITY title "FreeBSD Security Officer Charter">
<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
]>

View file

@ -1,11 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.176 2005/08/18 14:52:32 cperciva Exp $">
<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.177 2005/08/30 20:12:31 cperciva Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
<!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
]>
<!-- $FreeBSD: www/en/security/security.sgml,v 1.176 2005/08/18 14:52:32 cperciva Exp $ -->
<!-- $FreeBSD: www/en/security/security.sgml,v 1.177 2005/08/30 20:12:31 cperciva Exp $ -->
<html>
&header;
@ -139,7 +140,7 @@ severity.</p>
<p>The FreeBSD Security Officer has close working relationships
with a number of other organizations, including third-party vendors
that share code with FreeBSD (the OpenBSD, NetBSD and
that share code with FreeBSD (the OpenBSD, NetBSD and
DragonFlyBSD projects,
Apple, and other vendors deriving software from FreeBSD, as well
as the Linux vendor security list), as well as organizations
@ -227,7 +228,7 @@ branch's support being dropped earlier than the date listed.</P>
Please also update www/en/releng/index.sgml when updating this
list of supported branches.
-->
<TABLE BORDER="3" CELLSPACING="0" CELLPADDING="2">
<TABLE class="tblbasic">
<TR>
<TH>Branch</TH>
<TH>Release</TH>