aboutsummaryrefslogtreecommitdiff
path: root/share/xml
diff options
context:
space:
mode:
Diffstat (limited to 'share/xml')
-rw-r--r--share/xml/advisories.xml36
-rw-r--r--share/xml/authors.ent18
-rw-r--r--share/xml/commercial.consult.xml27
-rw-r--r--share/xml/commercial.hardware.xml60
-rw-r--r--share/xml/events.xml4
-rw-r--r--share/xml/events2013.xml57
-rw-r--r--share/xml/events2014.xml98
-rw-r--r--share/xml/freebsd.ent4
-rw-r--r--share/xml/mirrors.xml32
-rw-r--r--share/xml/navibar.ent1
-rw-r--r--share/xml/news.dtd2
-rw-r--r--share/xml/news.xml247
-rw-r--r--share/xml/notices.xml24
-rw-r--r--share/xml/release.ent16
-rw-r--r--share/xml/trademarks.ent13
15 files changed, 531 insertions, 108 deletions
diff --git a/share/xml/advisories.xml b/share/xml/advisories.xml
index 6ff2b8c55d..81448abf1f 100644
--- a/share/xml/advisories.xml
+++ b/share/xml/advisories.xml
@@ -8,6 +8,42 @@
<name>2013</name>
<month>
+ <name>9</name>
+
+ <day>
+ <name>10</name>
+
+ <advisory>
+ <name>FreeBSD-SA-13:13.nullfs</name>
+ </advisory>
+
+ <advisory>
+ <name>FreeBSD-SA-13:12.ifioctl</name>
+ </advisory>
+
+ <advisory>
+ <name>FreeBSD-SA-13:11.sendfile</name>
+ </advisory>
+ </day>
+ </month>
+
+ <month>
+ <name>8</name>
+
+ <day>
+ <name>22</name>
+
+ <advisory>
+ <name>FreeBSD-SA-13:10.sctp</name>
+ </advisory>
+
+ <advisory>
+ <name>FreeBSD-SA-13:09.ip_multicast</name>
+ </advisory>
+ </day>
+ </month>
+
+ <month>
<name>7</name>
<day>
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index c467e97c0b..2626972da2 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -282,6 +282,9 @@
<!ENTITY a.bp "Boris Popov">
<!ENTITY a.bp.email "&a.bp; <email xmlns='http://docbook.org/ns/docbook'>bp@FreeBSD.org</email>">
+<!ENTITY a.br "Ruslan Bukin">
+<!ENTITY a.br.email "&a.br; <email xmlns=''>br@FreeBSD.org</email>">
+
<!ENTITY a.brandon "Brandon Gillespie">
<!ENTITY a.brandon.email "&a.brandon; <email xmlns='http://docbook.org/ns/docbook'>brandon@FreeBSD.org</email>">
@@ -447,6 +450,9 @@
<!ENTITY a.danger "Daniel Ger&#382;o">
<!ENTITY a.danger.email "&a.danger; <email xmlns='http://docbook.org/ns/docbook'>danger@FreeBSD.org</email>">
+<!ENTITY a.danilo "Danilo Eg&ecirc;a Gondolfo">
+<!ENTITY a.danilo.email "&a.danilo; <email xmlns=''>danilo@FreeBSD.org</email>">
+
<!ENTITY a.danny "Daniel O'Callaghan">
<!ENTITY a.danny.email "&a.danny; <email xmlns='http://docbook.org/ns/docbook'>danny@FreeBSD.org</email>">
@@ -615,6 +621,9 @@
<!ENTITY a.ed "Ed Schouten">
<!ENTITY a.ed.email "&a.ed; <email xmlns='http://docbook.org/ns/docbook'>ed@FreeBSD.org</email>">
+<!ENTITY a.edavis "Eric Davis">
+<!ENTITY a.edavis.email "&a.edavis; <email xmlns=''>edavis@FreeBSD.org</email>">
+
<!ENTITY a.edwin "Edwin Groothuis">
<!ENTITY a.edwin.email "&a.edwin; <email xmlns='http://docbook.org/ns/docbook'>edwin@FreeBSD.org</email>">
@@ -1032,6 +1041,9 @@
<!ENTITY a.jmg "John-Mark Gurney">
<!ENTITY a.jmg.email "&a.jmg; <email xmlns='http://docbook.org/ns/docbook'>jmg@FreeBSD.org</email>">
+<!ENTITY a.jmmv "Julio Merino">
+<!ENTITY a.jmmv.email "&a.jmmv; <email xmlns=''>jmmv@FreeBSD.org</email>">
+
<!ENTITY a.jmz "Jean-Marc Zucconi">
<!ENTITY a.jmz.email "&a.jmz; <email xmlns='http://docbook.org/ns/docbook' role='nolink'>jmz@FreeBSD.org</email>">
@@ -1710,6 +1722,9 @@
<!ENTITY a.rm "Ruslan Makhmatkhanov">
<!ENTITY a.rm.email "&a.rm; <email xmlns='http://docbook.org/ns/docbook'>rm@FreeBSD.org</email>">
+<!ENTITY a.nemysis "Rusmir Dusko">
+<!ENTITY a.nemysis.email "&a.nemysis; <email xmlns=''>nemysis@FreeBSD.org</email>">
+
<!ENTITY a.rmacklem "Rick Macklem">
<!ENTITY a.rmacklem.email "&a.rmacklem; <email xmlns='http://docbook.org/ns/docbook'>rmacklem@FreeBSD.org</email>">
@@ -2214,6 +2229,9 @@
<!ENTITY a.zarzycki "Dave Zarzycki">
<!ENTITY a.zarzycki.email "&a.zarzycki; <email xmlns='http://docbook.org/ns/docbook'>zarzycki@FreeBSD.org</email>">
+<!ENTITY a.zbb "Zbigniew Bodek">
+<!ENTITY a.zbb.email "&a.zbb; <email xmlns=''>zbb@FreeBSD.org</email>">
+
<!ENTITY a.zec "Marko Zec">
<!ENTITY a.zec.email "&a.zec; <email xmlns='http://docbook.org/ns/docbook'>zec@FreeBSD.org</email>">
diff --git a/share/xml/commercial.consult.xml b/share/xml/commercial.consult.xml
index 111e445e40..eab6b8f850 100644
--- a/share/xml/commercial.consult.xml
+++ b/share/xml/commercial.consult.xml
@@ -489,6 +489,21 @@
mail: <a href="mailto:info@gnun.net">info@gnun.net</a>
</description>
</entry>
+
+ <entry id="GreenIT" category="australia">
+ <name>Green IT Consulting</name>
+ <url>http://www.greenitc.com.au/</url>
+ <description>
+ Based in Brisbane, Australia, Green IT Consulting are focused
+ on BSD/Linux and Open Source consultancy and support. Whether
+ your business already runs Linux/FreeBSD/NetBSD/OpenBSD or you
+ are considering the introduction of Open Source technology,
+ Green IT Consulting can help you every step of the way. For
+ more information please visit our <a
+ href="http://www.greenitc.com.au">website</a> or send us an
+ <a href="mailto:sales@greenitc.com.au">email</a>.
+ </description>
+ </entry>
<entry id="GurixWebProfessionals" category="namerica">
<name>Gurix Web Professionals</name>
@@ -502,6 +517,18 @@
</description>
</entry>
+ <entry id="Hermetek" category="namerica">
+ <name>HermeTek Network Solutions</name>
+ <url>https://www.hermetek.com/</url>
+ <description>
+ HermeTek Network Solutions is a comprehensive network solutions
+ provider with a strong focus on FreeBSD. HermeTek also offers
+ support for other BSD and Linux operating systems, as well as
+ fully managed hosting packages. Please visit <a
+ href="https://www.hermetek.com/">our web site</a> for more information.
+ </description>
+ </entry>
+
<entry id="HerrinSoftware" category="namerica">
<name>Herrin Software Development</name>
<url>http://www.hsdi.com/</url>
diff --git a/share/xml/commercial.hardware.xml b/share/xml/commercial.hardware.xml
index 2d1f68e4e6..be0a08bb48 100644
--- a/share/xml/commercial.hardware.xml
+++ b/share/xml/commercial.hardware.xml
@@ -68,34 +68,6 @@
</description>
</entry>
- <entry id="ADCOMTEC">
- <name>ADCOMTEC</name>
- <url>http://www.adcomtec.com</url>
- <description>
- ADCOMTEC specializes in providing high-performance, advanced
- communications and networking solutions. FreeBSD driver support is
- provided for a range of high-performance WAN adapters for ADSL, T1,
- E1, and Synchronous Serial (RS-232/V.35/X.21/EIA530) connectivity
- that support a number of downloadable protocol modules including ATM,
- Frame Relay, X.25, HDLC, SDLC, PPP, and SS7. For more information,
- contact <a href="mailto:info@adcomtec.com">info@adcomtec.com</a> or
- visit <a href="http://www.adcomtec.com">http://www.adcomtec.com</a>.
- </description>
- </entry>
-
- <entry id="AdvancedComputer">
- <name>Advanced Computer and Network Management Corporation</name>
- <url>http://www.acnc.com/</url>
- <description>
- Advanced Computer and Network Corporation Our site, dedicated to RAID
- (Redundant Array of Independent Disks) technology, features, an
- excellent, easy-to-understand, graphical RAID tutorial. We are a
- one-stop source for cost-effective, high-performance RAID arrays,
- SCSI switches, boosters, cables, fiber-optic extenders, and
- high-availability solutions.
- </description>
- </entry>
-
<entry id="ASA">
<name>ASA Computers</name>
<url>http://www.asacomputers.com/</url>
@@ -181,16 +153,6 @@
</description>
</entry>
- <entry id="CycladesCorporation">
- <name>Cyclades Corporation</name>
- <url>http://www.cyclades.com/</url>
- <description>
- Cyclades Corporation sells a variety of high performance, multiport
- serial cards which FreeBSD supports directly in its standard
- releases.
- </description>
- </entry>
-
<entry id="DAVICOM">
<name>DAVICOM Semiconductor, Inc.</name>
<url>http://www.davicom.com.tw/</url>
@@ -262,28 +224,6 @@
</description>
</entry>
- <entry id="FreeBSDSystems">
- <name>FreeBSD Systems</name>
- <url>http://www.freebsdsystems.com</url>
- <description>
- Since 1999 FreeBSD Systems manufactures fast and reliable
- Rackmount, Tower Servers and RAID Systems. Our Servers
- comprise of AMD Opteron Single-Core and Dual-Core, Intel Xeon and
- Pentium Processors in SCSI and SATA configurations. All of our
- Servers and RAID Systems have built-in Remote Hardware Management
- functionality to prevent needless downtime due to a malfunctioning
- component. Our build/burn-in has proven very successful in
- preventing our clients with Servers and RAID Systems becoming
- problematic. We provide On-Site Hardware Warranty Support in many
- countries.<br />We ship world wide and offer complete customization
- on a per order basis. We can be reached by calling our toll-free
- number 1.877.963.1900 in North America. For Toll-Free Outside
- North America please <a
- href="http://www.freebsdsystems.com/contact.php">see here</a>
- or by <a href="mailto:info@freebsdsystems.com">email</a>
- </description>
- </entry>
-
<entry id="FreedomTechnologies">
<name>Freedom Technologies</name>
<url>http://www.freedomtc.com</url>
diff --git a/share/xml/events.xml b/share/xml/events.xml
index 9c7e35456a..276e7a11f9 100644
--- a/share/xml/events.xml
+++ b/share/xml/events.xml
@@ -13,6 +13,10 @@
</cvs:keyword>
<xi:include
+ href="http://www.FreeBSD.org/XML/www/share/xml/events2014.xml"
+ xpointer="xpointer(//event)" />
+
+ <xi:include
href="http://www.FreeBSD.org/XML/www/share/xml/events2013.xml"
xpointer="xpointer(//event)" />
diff --git a/share/xml/events2013.xml b/share/xml/events2013.xml
index 6d30321f7b..2616068fae 100644
--- a/share/xml/events2013.xml
+++ b/share/xml/events2013.xml
@@ -31,8 +31,8 @@
<site>Tokyo University of Science</site>
</location>
<description>AsiaBSDCon is a conference for users and developers
- on BSD based systems. The conference is for anyone developing,
- deploying and using systems based on FreeBSD, NetBSD, OpenBSD,
+ on BSD based systems. The conference is for anyone developing,
+ deploying and using systems based on &os;, NetBSD, OpenBSD,
DragonFlyBSD, Darwin and MacOS X. AsiaBSDCon is a technical
conference and aims to collect the best technical papers and
presentations available to ensure that the latest developments
@@ -158,4 +158,57 @@
sight seeing and a tour of the island is being organized at
cost.</description>
</event>
+
+ <event id="vbsdcon-2013">
+ <name>vBSDCon 2013</name>
+ <url>http://www.vbsdcon.com/</url>
+ <startdate>
+ <year>2013</year>
+ <month>10</month>
+ <day>25</day>
+ </startdate>
+ <enddate>
+ <year>2013</year>
+ <month>10</month>
+ <day>27</day>
+ </enddate>
+ <location>
+ <country code="US">United States</country>
+ <city>Dulles</city>
+ <site>Dulles Hyatt</site>
+ </location>
+ <description>This exciting weekend will bring together members of
+ the BSD community for a series of roundtable discussions,
+ educational sessions, best practice conversations, and exclusive
+ networking opportunities.</description>
+ </event>
+
+ <event id="freebsd20th-2013">
+ <name>FreeBSD 20th Anniversary Party</name>
+ <url>http://rsvp.ixsystems.com/</url>
+ <startdate>
+ <year>2013</year>
+ <month>11</month>
+ <day>02</day>
+ </startdate>
+ <enddate>
+ <year>2013</year>
+ <month>11</month>
+ <day>02</day>
+ </enddate>
+ <location>
+ <country code="US">United States</country>
+ <city>San Francisco</city>
+ <site>DNA Lounge</site>
+ </location>
+ <description>A one day event in honor of the users,
+ administrators, developers, and advocates, of &os;. The
+ 20th Anniversary Celebration will feature great company,
+ drinks, music and notable figures from the past, present and
+ future of FreeBSD. Festivities will begin at 6 pm, will open
+ to the public at 9 pm, and will continue into the wee hours
+ of the morning. There will also be giveaways of books and
+ other goodies plus the new &os; 20th Anniversary T-shirt.
+ </description>
+ </event>
</events>
diff --git a/share/xml/events2014.xml b/share/xml/events2014.xml
new file mode 100644
index 0000000000..be6a6f9164
--- /dev/null
+++ b/share/xml/events2014.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
+ "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+<!--
+ Events which might be interesting for FreeBSD users.
+
+ Please sort the events by start date, with recent events earlier in the file.
+-->
+
+<events>
+ <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+ $FreeBSD$
+ </cvs:keyword>
+
+ <event id="nycbsdcon-2014">
+ <name>NYCBSDCon 2014</name>
+ <url>http://www.nycbsdcon.org/2014/</url>
+ <startdate>
+ <year>2014</year>
+ <month>2</month>
+ <day>1</day>
+ </startdate>
+ <enddate>
+ <year>2014</year>
+ <month>2</month>
+ <day>1</day>
+ </enddate>
+ <location>
+ <country code="US">United States</country>
+ <city>New York City</city>
+ <site>Suspender Bar &amp; Restaurant, Manhattan</site>
+ </location>
+ <description>A day-long event with a theme of &quot;The BSDs in
+ Production.&quot; With increased focus on the critical roles
+ the BSDs do and can play in infrastructures, NYCBSDCon
+ promises to be an important event for the technical community
+ in the New York metropolitan area. Hosted by the New York City
+ *BSD User Group.</description>
+ </event>
+
+ <event id="asiabsdcon-2014">
+ <name>AsiaBSDCon 2014</name>
+ <url>http://2014.asiabsdcon.org/</url>
+ <startdate>
+ <year>2014</year>
+ <month>3</month>
+ <day>13</day>
+ </startdate>
+ <enddate>
+ <year>2014</year>
+ <month>3</month>
+ <day>16</day>
+ </enddate>
+ <location>
+ <country code="JP">Japan</country>
+ <city>Tokyo</city>
+ <site>Tokyo University of Science</site>
+ </location>
+ <description>AsiaBSDCon is a conference for users and developers
+ on BSD based systems. The conference is for anyone developing,
+ deploying and using systems based on &os;, NetBSD, OpenBSD,
+ DragonFlyBSD, Darwin and MacOS X. AsiaBSDCon is a technical
+ conference and aims to collect the best technical papers and
+ presentations available to ensure that the latest developments
+ in our open source community are shared with the widest
+ possible audience.
+ </description>
+ </event>
+
+ <event id="bsdcan-2014">
+ <name>BSDCan 2014</name>
+ <url>http://www.bsdcan.org/</url>
+ <startdate>
+ <year>2014</year>
+ <month>5</month>
+ <day>14</day>
+ </startdate>
+ <enddate>
+ <year>2014</year>
+ <month>5</month>
+ <day>17</day>
+ </enddate>
+ <location>
+ <country code="CA">Canada</country>
+ <city>Ottawa</city>
+ <site>University of Ottawa</site>
+ </location>
+ <description>BSDCan is a technical conference for people working
+ on and with BSD operating systems and related projects. It is
+ a developers conference with a strong focus on emerging
+ technologies, research projects, and works in progress. It
+ also features Userland infrastructure projects and invites
+ contributions from both free software developers and those
+ from commercial vendors. Features tracks on System
+ Administration, Security, Hacking and Embedded. Followed
+ immediately by PGCon at the same location.</description>
+ </event>
+</events>
diff --git a/share/xml/freebsd.ent b/share/xml/freebsd.ent
index b82a2ac824..0a0e169bca 100644
--- a/share/xml/freebsd.ent
+++ b/share/xml/freebsd.ent
@@ -64,8 +64,8 @@ used in both environments.
<!-- The currently released version of FreeBSD. This value is used to
create some links on web sites and such, so do NOT change it until
it's really release time -->
-<!ENTITY rel.current "9.1">
-<!ENTITY rel.current.date "December 2012">
+<!ENTITY rel.current "9.2">
+<!ENTITY rel.current.date "September 2013">
<!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
<!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
<!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>
diff --git a/share/xml/mirrors.xml b/share/xml/mirrors.xml
index c6e007a0fc..bb6a6fe12a 100644
--- a/share/xml/mirrors.xml
+++ b/share/xml/mirrors.xml
@@ -548,22 +548,6 @@
</entry>
- <entry id="mirrors-is">
- <country>Iceland</country>
- <host type="www">
- <name>www.is.FreeBSD.org</name>
- <url proto="http">http://www.is.FreeBSD.org/</url>
- </host>
-
- <host type="ftp">
- <name>ftp.is.FreeBSD.org</name>
- <url proto="ftp">ftp://ftp.is.FreeBSD.org/pub/FreeBSD/</url>
- <url proto="rsync"></url>
- </host>
-
- <email>hostmaster@is.FreeBSD.org</email>
- </entry>
-
<entry id="mirrors-ie">
<country>Ireland</country>
<host type="www">
@@ -1029,11 +1013,6 @@
<url proto="http">http://www.se.FreeBSD.org/</url>
</host>
- <host type="www">
- <name>www2.se.FreeBSD.org</name>
- <url proto="http">http://www2.se.FreeBSD.org/</url>
- </host>
-
<host type="ftp">
<name>ftp.se.FreeBSD.org</name>
<url proto="ftp">ftp://ftp.se.FreeBSD.org/pub/FreeBSD/</url>
@@ -1061,13 +1040,6 @@
</host>
<host type="ftp">
- <name>ftp5.se.FreeBSD.org</name>
- <url proto="ftp">ftp://ftp5.se.FreeBSD.org/pub/FreeBSD/</url>
- <url proto="http">http://ftp5.se.FreeBSD.org/</url>
- <url proto="rsync">rsync://ftp5.se.FreeBSD.org/freebsd/</url>
- </host>
-
- <host type="ftp">
<name>ftp6.se.FreeBSD.org</name>
<url proto="ftp">ftp://ftp6.se.FreeBSD.org/pub/FreeBSD</url>
<url proto="http">http://ftp6.se.FreeBSD.org/pub/FreeBSD</url>
@@ -1077,10 +1049,6 @@
<name>cvsup.se.FreeBSD.org</name>
</host>
- <host type="cvsup">
- <name>cvsup2.se.FreeBSD.org</name>
- </host>
-
<email>hostmaster@se.FreeBSD.org</email>
</entry>
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index ae0ec1d01b..571b63c765 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -37,7 +37,6 @@
<li><a href="&base;/usergroups.html">User Groups</a></li>
<li><a href="&base;/events/events.html">Events</a></li>
<li><a href="&base;/community/webresources.html">Web Resources</a></li>
- <li><a href="&base;/community/social.html">Social Networks</a></li>
<li><a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (external)</a></li>
</ul>
</div> <!-- SIDENAV -->'>
diff --git a/share/xml/news.dtd b/share/xml/news.dtd
index 0a4f1f5918..66e8a98766 100644
--- a/share/xml/news.dtd
+++ b/share/xml/news.dtd
@@ -2,8 +2,10 @@
<!ENTITY lists 'http://lists.freebsd.org/pipermail'>
<!ENTITY lists.announce '&lists;/freebsd-announce'>
+<!ENTITY lists.current '&lists;/freebsd-current'>
<!ENTITY lists.stable '&lists;/freebsd-stable'>
<!ENTITY lists.ports-announce '&lists;/freebsd-ports-announce'>
+<!ENTITY lists.pkg '&lists;/freebsd-pkg'>
<!ELEMENT news (cvs:keyword?, year)+>
diff --git a/share/xml/news.xml b/share/xml/news.xml
index a7a482beff..ebb747f5f2 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -31,9 +31,248 @@
<name>2013</name>
<month>
+ <name>11</name>
+
+ <day>
+ <name>2</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:jmmv@FreeBSD.org">Julio Merino</a> (src)</p>
+ </event>
+ </day>
+
+ </month>
+
+ <month>
+ <name>10</name>
+
+ <day>
+ <name>30</name>
+
+ <event>
+ <title>Official Binary Packages for Pkg Available</title>
+
+ <p>Official binary packages are now available for Pkg for &os;
+ 8.3, 8.4, 9.1, 9.2, 10.0 and head. See the <a
+ href="&lists.pkg;/2013-October/000107.html">announcement</a>
+ for more information.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>28</name>
+
+ <event>
+ <title>&os;&nbsp;10.0-BETA2 Available</title>
+
+ <p>The second BETA build for the &os;-10.0 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.stable;/2013-October/075591.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>20</name>
+
+ <event>
+ <title>July-September, 2013 Status Report</title>
+
+ <p>The <a
+ href="&enbase;/news/status/report-2013-07-2013-09.html">July-September, 2013 Status Report</a>
+ is now available with 30 entries.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>14</name>
+
+ <event>
+ <title>&os;&nbsp;10.0-BETA1 Available</title>
+
+ <p>The first BETA build for the &os;-10.0 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.stable;/2013-October/075504.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>9</name>
+ <event>
+ <p>New committer:
+ <a href="mailto:edavis@FreeBSD.org">Eric Davis</a> (src)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>7</name>
+
+ <event>
+ <title>&os;&nbsp;10.0-ALPHA5 Available</title>
+
+ <p>The fifth ALPHA build for the &os;-10.0 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.current;/2013-October/045097.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+ </month>
+
+ <month>
+ <name>9</name>
+
+ <day>
+ <name>30</name>
+
+ <event>
+ <title>&os; 9.2-RELEASE Available</title>
+
+ <p><a href="&enbase;/releases/9.2R/announce.html">FreeBSD
+ 9.2-RELEASE</a> is now available. Please be sure to
+ check the <a
+ href="&enbase;/releases/9.2R/relnotes.html">Release
+ Notes</a> <a
+ href="&enbase;/releases/9.2R/errata.html">Release
+ Errata</a> before installation for any late-breaking
+ news and/or issues with 9.2. More information about
+ FreeBSD releases can be found on the <a
+ href="&enbase;/releases/index.html">Release
+ Information</a> page.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>29</name>
+
+ <event>
+ <title>&os;&nbsp;10.0-ALPHA4 Available</title>
+
+ <p>The fourth ALPHA build for the &os;-10.0 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.current;/2013-September/044951.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>23</name>
+ <event>
+ <p>New committer:
+ <a href="mailto:danilo@FreeBSD.org">Danilo Eg&ecirc;a Gondolfo</a> (ports)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>18</name>
+
+ <event>
+ <title>&os;&nbsp;10.0-ALPHA2 Available</title>
+
+ <p>The second ALPHA build for the &os;-10.0 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.current;/2013-September/044676.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>13</name>
+
+ <event>
+ <title>&os;&nbsp;10.0-ALPHA1 Available</title>
+
+ <p>The first ALPHA build for the &os;-10.0 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc and sparc64 architectures are <a
+ href="&lists.current;/2013-September/044522.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>12</name>
+
+ <event>
+ <title>&os;&nbsp;9.2-RC4 Available</title>
+
+ <p>The fourth RC build for the &os;-9.2 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.stable;/2013-September/075163.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>2</name>
+ <event>
+ <p>New committer:
+ <a href="mailto:br@FreeBSD.org">Ruslan Bukin</a> (src)</p>
+ </event>
+ <event>
+ <p>New committer:
+ <a href="mailto:zbb@FreeBSD.org">Zbigniew Bodek</a> (src)</p>
+ </event>
+ </day>
+ </month>
+
+ <month>
<name>8</name>
<day>
+ <name>26</name>
+
+ <event>
+ <title>&os;&nbsp;9.2-RC3 Available</title>
+
+ <p>The third RC build for the &os;-9.2 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.stable;/2013-August/074920.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>16</name>
+
+ <event>
+ <title>&os;&nbsp;9.2-RC2 Available</title>
+
+ <p>The second RC build for the &os;-9.2 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.stable;/2013-August/074756.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
<name>6</name>
<event>
@@ -76,6 +315,14 @@
<name>7</name>
<day>
+ <name>31</name>
+ <event>
+ <p>New committer:
+ <a href="mailto:nemysis@FreeBSD.org">Rusmir Dusko</a> (ports)</p>
+ </event>
+ </day>
+
+ <day>
<name>29</name>
<event>
diff --git a/share/xml/notices.xml b/share/xml/notices.xml
index b6fa79adb6..76433dad6b 100644
--- a/share/xml/notices.xml
+++ b/share/xml/notices.xml
@@ -8,6 +8,30 @@
<name>2013</name>
<month>
+ <name>10</name>
+
+ <day>
+ <name>26</name>
+
+ <notice>
+ <name>FreeBSD-EN-13:04.freebsd-update</name>
+ </notice>
+ </day>
+ </month>
+
+ <month>
+ <name>8</name>
+
+ <day>
+ <name>22</name>
+
+ <notice>
+ <name>FreeBSD-EN-13:03.mfi</name>
+ </notice>
+ </day>
+ </month>
+
+ <month>
<name>6</name>
<day>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index f68f3e7762..f5daf3e225 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -22,7 +22,7 @@
rel2.* and u.rel2.* for the "conservative users" version.
-->
-<!ENTITY rel.head.major '10'>
+<!ENTITY rel.head.major '11'>
<!ENTITY rel.head '&rel.head.major;.0'>
<!-- If there is no release currently in the release cycle (i.e. we
@@ -31,21 +31,21 @@
<!ENTITY beta.testing "INCLUDE">
<!ENTITY % beta.testing "INCLUDE">
-<!ENTITY betarel.current '9.2'>
-<!ENTITY betarel.vers 'RC1'>
+<!ENTITY betarel.current '10.0'>
+<!ENTITY betarel.vers 'BETA3'>
<!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
<!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
are having release candidates at the same time), do the same here. -->
<!ENTITY beta2.testing "IGNORE">
<!ENTITY % beta2.testing "IGNORE">
-<!ENTITY betarel2.current '7.4'>
-<!ENTITY betarel2.vers 'RC3'>
+<!ENTITY betarel2.current '9.2'>
+<!ENTITY betarel2.vers 'RC4'>
<!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
<!ENTITY rel.current.major '9'>
-<!ENTITY rel.current '&rel.current.major;.1'>
-<!ENTITY rel.current.date 'December 2012'>
+<!ENTITY rel.current '&rel.current.major;.2'>
+<!ENTITY rel.current.date 'September 2013'>
<!-- URLs to information on the latest release -->
<!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
@@ -83,4 +83,4 @@
<!ENTITY gnomeoldver '2.30'>
<!ENTITY gnomever '2.32'>
-<!ENTITY gnomedevelver '2.90'>
+<!ENTITY gnomedevelver '3.6'>
diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent
index b5749505f1..69438b3b0f 100644
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@@ -25,13 +25,14 @@
Adaptec, Inc.</para>">
<!ENTITY adaptec "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Adaptec</trademark>">
-<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe, Acrobat, Acrobat Reader, and
+<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe, Acrobat, Acrobat Reader, Flash and
PostScript are either registered trademarks or trademarks of Adobe
Systems Incorporated in the United States and/or other
countries.</para>">
<!ENTITY acrobat "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Acrobat</trademark>">
<!ENTITY acrobat.reader "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Acrobat&nbsp;Reader</trademark>">
<!ENTITY adobe "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Adobe</trademark>">
+<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Flash</trademark>">
<!ENTITY postscript "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PostScript</trademark>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
@@ -175,10 +176,11 @@ Coverity, Inc.</para>">
<!ENTITY megaraid "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>MegaRAID</trademark>">
<!ENTITY mylex "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mylex</trademark>">
+<!-- These two are no longer used in the en_US documentation, but need
+ leaving until translations stop using them -->
<!ENTITY tm-attrib.macromedia "<para xmlns='http://docbook.org/ns/docbook'>Macromedia, Flash, and Shockwave are
trademarks or registered trademarks of Macromedia, Inc. in the
United States and/or other countries.</para>">
-<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook'>Flash</trademark>">
<!ENTITY macromedia "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Macromedia</trademark>">
<!ENTITY tm-attrib.microsoft "<para xmlns='http://docbook.org/ns/docbook'>Microsoft, IntelliMouse, MS-DOS,
@@ -220,6 +222,8 @@ Coverity, Inc.</para>">
<!ENTITY netscape "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Netscape</trademark>">
<!ENTITY netscape.navigator "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!-- These two are no longer used in the en_US documentation, but need
+ leaving until translations stop using them -->
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para xmlns='http://docbook.org/ns/docbook'>GateD and NextHop are registered and
unregistered trademarks of NextHop in the U.S. and other
@@ -264,6 +268,8 @@ Coverity, Inc.</para>">
registered trademarks of Red Hat, Inc. in the United States and
other countries.</para>">
+<!-- These four are no longer used in the en_US documentation, but need
+ leaving until translations stop using them -->
<!ENTITY tm-attrib.sap "<para xmlns='http://docbook.org/ns/docbook'>SAP, R/3, and mySAP are trademarks or
registered trademarks of SAP AG in Germany and in several other
countries all over the world.</para>">
@@ -287,7 +293,6 @@ Coverity, Inc.</para>">
<!ENTITY ultrasparc "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>UltraSPARC</trademark>">
<!-- http://www.sun.com/suntrademarks/ -->
-
<!ENTITY tm-attrib.sun "<para xmlns='http://docbook.org/ns/docbook'>Sun, Sun Microsystems, Java, Java
Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
Solaris, StarOffice, SunOS
@@ -402,6 +407,8 @@ Coverity, Inc.</para>">
</legalnotice>
'>
+<!-- This is no longer used in the en_US documentation, but needs
+ leaving until translations stop using it -->
<!ENTITY trademarks '
<legalnotice xmlns="http://docbook.org/ns/docbook" xml:id="trademarks" role="trademarks">
<title>Legal Notice</title>