svn commit: r40580 - in projects/entities/share: images/articles/releng images/books/corp-net-guide pgpkeys xml

Glen Barber gjb at FreeBSD.org
Sat Jan 12 19:14:35 UTC 2013


Author: gjb
Date: Sat Jan 12 19:14:31 2013
New Revision: 40580
URL: http://svnweb.freebsd.org/changeset/doc/40580

Log:
  Merged /head/share:r40371-40577

Added:
  projects/entities/share/pgpkeys/emaste.key
     - copied unchanged from r40577, head/share/pgpkeys/emaste.key
  projects/entities/share/pgpkeys/markj.key
     - copied unchanged from r40577, head/share/pgpkeys/markj.key
Deleted:
  projects/entities/share/images/books/corp-net-guide/
Modified:
  projects/entities/share/images/articles/releng/branches-releng7.pic
  projects/entities/share/images/articles/releng/branches-releng9.pic
  projects/entities/share/pgpkeys/pgpkeys-developers.xml
  projects/entities/share/pgpkeys/pgpkeys.ent
  projects/entities/share/xml/authors.ent
  projects/entities/share/xml/commercial.isp.xml
  projects/entities/share/xml/commercial.software.xml
  projects/entities/share/xml/events2013.xml
  projects/entities/share/xml/freebsd.ent
  projects/entities/share/xml/header.ent
  projects/entities/share/xml/man-refs.ent
  projects/entities/share/xml/mirrors.xml
  projects/entities/share/xml/news.dtd
  projects/entities/share/xml/news.xml
  projects/entities/share/xml/release.ent
  projects/entities/share/xml/templates.events.xsl
  projects/entities/share/xml/templates.pastevents.xsl
  projects/entities/share/xml/xhtml.xsl
Directory Properties:
  projects/entities/share/   (props changed)

Modified: projects/entities/share/images/articles/releng/branches-releng7.pic
==============================================================================
--- projects/entities/share/images/articles/releng/branches-releng7.pic	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/images/articles/releng/branches-releng7.pic	Sat Jan 12 19:14:31 2013	(r40580)
@@ -38,6 +38,14 @@ RELENG_7_3:
 	box width .9 "\s-3RELENG_7_3\s+3" dashed
 
 	line -> right from RELENG_7_3_0_RELEASE.e
+RELENG_7_4_0_RELEASE:
+	ellipse width .9 "\s-27.4-RELEASE\s+2"
+
+	line -> down from RELENG_7_4_0_RELEASE.s
+RELENG_7_4:
+	box width .9 "\s-3RELENG_7_4\s+3" dashed
+
+	line -> right from RELENG_7_4_0_RELEASE.e
 RELENG_7:box "\s-27-STABLE\s+2"
 
 .PE

Modified: projects/entities/share/images/articles/releng/branches-releng9.pic
==============================================================================
--- projects/entities/share/images/articles/releng/branches-releng9.pic	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/images/articles/releng/branches-releng9.pic	Sat Jan 12 19:14:31 2013	(r40580)
@@ -14,6 +14,14 @@ RELENG_9_0:
 	box width .9 "\s-3RELENG_9_0\s+3" dashed
 
 	line -> right from RELENG_9_0_0_RELEASE.e
+RELENG_9_1_0_RELEASE:
+	ellipse width .9 "\s-29.1-RELEASE\s+2"
+
+	line -> down from RELENG_9_1_0_RELEASE.s
+RELENG_9_1:
+	box width .9 "\s-3RELENG_9_1\s+3" dashed
+
+	line -> right from RELENG_9_1_0_RELEASE.e
 RELENG_9:box "\s-29-STABLE\s+2"
 
 .PE

Copied: projects/entities/share/pgpkeys/emaste.key (from r40577, head/share/pgpkeys/emaste.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/entities/share/pgpkeys/emaste.key	Sat Jan 12 19:14:31 2013	(r40580, copy of r40577, head/share/pgpkeys/emaste.key)
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh emaste 50A17BF4;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/50A17BF4 2012-12-18
+      Key fingerprint = 0C08 ECC9 3A0A 8500 AB95  B553 49C4 7851 50A1 7BF4
+uid                  Ed Maste <emaste at freebsd.org>
+sub   2048R/08FA5F72 2012-12-18
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFDQkJMBCADPPfZXZY16ONN40Z6afHF3hxGZsczwVUQ7qlNQzjfvUk5MJV7H
+VeKpLAN9pHLk9tg2xTXzcMbGe/baBQrw4kt23SwvQ1Q034nRcolio6rx4sq/E7EH
+vxRmwCgn4n/g1b/S8xzcXqFeDpdhY1RAbWdpQwscaj4hSCEAo2KrJ3tlsZqVRu35
+wKAW5eVlrPZghi3jTPQxzdz4QNqLFR5aQdp5MrxhKcm6rnC7JeyuLAFruWoHBoqg
+5P8dKjEMNPBzIJdWC2iEWqsiVOrJZ5YbCpZtbPlM82oGCUoC1QmW4kip3BJSBAJK
+wZlwRvHiMbjhjDGJaliHVx8G8NiJPrdDZlMdABEBAAG0HUVkIE1hc3RlIDxlbWFz
+dGVAZnJlZWJzZC5vcmc+iQE4BBMBAgAiBQJQ0JCTAhsDBgsJCAcDAgYVCAIJCgsE
+FgIDAQIeAQIXgAAKCRBJxHhRUKF79BotCADC09bvfZqcpiFH3HeQbH2SKeK6vNpI
+v1Uoib443EBajOKw19JkjOmPzwnFrKF1WSXrKYpp1iwUlvNgR1C+nMeGPOQCtLzU
+g49uuoC5q6FdMJIdYKjbVziga96UZme6kuSUUdv5/aumEuOfVvHewZQNWUdq1zbj
+RuBBesSKWULmUW4K7cBRGGvmAqIpWLL2lmZheT3WHzmLIwwqE4Xs8sgfijxxXrzz
+tAi7NVVEbOtDxlKZYINKXGXm4xfomuY4eAg+pCH58kEwgEudEspNQP+axJ0Bovh5
+yq7cVm7zHbmrxSWSzLjAfprs84m3XIoX9wzlit2tydUbQxlALqcqpDffuQENBFDQ
+kJMBCADODYSrW+MNgYsqOZpg7hQL+oWPak+DJW+mAe93D0T6iS7g7ZDX7XSSl+LE
+R/9bLa6alA7qXDJFf41yl9Gw7vP7k5SFAT0mukffR4wiXqsTKcdGj8LxV8JllAQT
+h3r38gNhZRDr4UQ1MZxWseeZx6myj8vskCiv4Rd0qEOlOE7AgiJdUdUoVLnjZkDE
+o+UbOhqSfSCWEQNItJ7dRGsmxGAUH4pIZcdu4NIYINt2yNIQCO/NTDFj80dpIWxt
+Q1BNqL45ZkWG0B3J1j4tsze7dGvWnXZfJQyvTeNeSg6WteyqQSQ98WgvFQkWceUv
+1ooA5bHG0xAtg2OI4L2ZvzLINfrRABEBAAGJAR8EGAECAAkFAlDQkJMCGwwACgkQ
+ScR4UVChe/RV3wf9F+TfpN7DC7m7+5aACXpDB86xCSGG4COtSyU8Gs0tgS84aE/b
+KUCdRZOwvz5dHAQUaPcgRNuNYscu2aAN4DYdPWrU59tn1s6+xYvWpgkzt+GGsni3
+gsz7vot3vUEzf7kOMV+NgdBEEIKgUT3TuIU5wQ/fevYGN1gdMeXiYSJ+PSfaZWnr
+Eee3zGU6TtR1WUgjQLoSdvDPzsFaNYSbCGYKXwSQOw7ysp1tY6Wai3teMb1Q9YNe
+BpQCsjEhGSuocr1R34+Nvmo6OcOpSeqEN3XRlz4PIGcXUY9Jp9gtGBSeFLasihfC
+SDQa/FThS6824wFQfaya638NZbjhCzrtxx4gdA==
+=aAkV
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Copied: projects/entities/share/pgpkeys/markj.key (from r40577, head/share/pgpkeys/markj.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/entities/share/pgpkeys/markj.key	Sat Jan 12 19:14:31 2013	(r40580, copy of r40577, head/share/pgpkeys/markj.key)
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh markj 80A62628;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/80A62628 2012-12-19
+      Key fingerprint = AFEF AD33 1C4E FFE5 141E  0157 05A4 DA8B 80A6 2628
+uid                  Mark Johnston <markj at freebsd.org>
+sub   2048R/47C7D3C2 2012-12-19
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFDRQycBCADMNjnbsXUOlvy35VnAJWE3zHAPqmXKqUTh0t0LWEtaD8KaNMHY
+egadQNWYwJAjzAI07+3grk8xcJLVjbbB+rC45tNPAxjAf9Jd5WZkZO7vKX0tIDLc
+Kteqp/5UB8SZ+XuhrtzLkObbEccwt66CF8vsUps5hWm1d+Nfxd798sjGmB8uzRJm
+gO2RrVtrOW7OQG+aFjBwlQvaiYavQ08z/xE2b83Y4Jp7c1FlqneFmK4xWSMO1qEE
+Qre8+iizDnPkGVabSLGJxE/EjTpHVBSawkXBgs9AOBoUR95fRr2Qc7GtP0NCHiNP
+FecGq5vCdIVyejUVzWmviYP7y0roG3yE+AppABEBAAG0IU1hcmsgSm9obnN0b24g
+PG1hcmtqQGZyZWVic2Qub3JnPokBOAQTAQIAIgUCUNFDJwIbAwYLCQgHAwIGFQgC
+CQoLBBYCAwECHgECF4AACgkQBaTai4CmJihAPwgAn9yH8EQiyS2x2qy5Zecl80Yz
+sLHSjc0uCBCNyzaLgGnMkqQDljyJzgY8DOL2vCWgSO0uJvb52Zl3nwxNoeMpwA3f
+rcaurFUUTCNmq4YfAHxjkbi5vQI0uJP7StFcFRPcnBOF/ddi+KUdc++xhqvcKBF9
+uHVLK+6MMp4I9ofXNdrenfqXaODDTIaSO3SnL690OFSAAkueDN5hjJRuuEprbZFP
+qyfzwHAot/Owy6Db7LA9MrE4GQFDszA+wvXrreMDdPIVV8dXXZvuS2oEVV9XoTUY
++VkcOdO+UlD1DWyEP1cZYhyzhwJo8G7ZZJO7JpLB6M6c5bdAyMtHW/aAinh+J7kB
+DQRQ0UMnAQgAxnBvgp1D8Ek07hhV89yhPkucEuxi5Gz8doYedzB6uOUGFdUK8y9B
+gwo8dSjIY3i4rVpJlarJNvd1XE2Pu3YlwvW1Gyo4pa1M5Q/QeQ8thW4k8F4r+RGN
+6qqk085diUKWSwyhjAULOYSWBEbRaPp9L3FNr3uYncrAFhKN3n/o3+18DG2tS++/
+DavKZdNgFKnoLEZeTSOAdvwkTjcWV6lRVcI8vsbi1bl5dA7qCbhfRmJJEaMqhCG8
+bEIJ6r5JtmDNwOzCnl2wS0UsmsMV2lj5BGiRmyw3xdxDGYTICm0j+YUce9lb2V6H
+PWcHCil+Jcg1pJ5oKai4uR1Oo97slmoiXQARAQABiQEfBBgBAgAJBQJQ0UMnAhsM
+AAoJEAWk2ouApiYoo+QH/RLaL2ouB/bxkED60YgdaiOHX+3ZUeXwh5SHapS2cFXU
+ySUcYmFe3fbsXoyeOi4E1AG2k2PyVk/cA/HDNr8eiqgFO91dQ6RnY+VnbN+DGRGl
+9oW7kqY/7kV0ExXpPGSmxdobpeCVkSO3WzY9XKC5VUosc/jCm3+6NqZaCnIIMUNA
+qUD25P9stIBvEv+QrkRn+9vnSHbyvnQvaHWMLrItMgyjrZdd4LevLQaCo3bc5+eI
+4ZhBjHErzC4PmeKgy0ancqWMNfgdZ3fzk8Tcwfy20S+b+TicU0xlQnx8bkPlksCJ
+h7pRVYuHo9VkueYsh5UoyrMJhYe7DQ4lGbv2fj9KHZ4=
+=b1OB
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- projects/entities/share/pgpkeys/pgpkeys-developers.xml	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/pgpkeys/pgpkeys-developers.xml	Sat Jan 12 19:14:31 2013	(r40580)
@@ -736,6 +736,11 @@
       &pgpkey.ahze;
     </sect2>
 
+    <sect2 id="pgpkey-markj">
+      <title>&a.markj;</title>
+      &pgpkey.markj;
+    </sect2>
+
     <sect2 id="pgpkey-trevor">
       <title>&a.trevor.email;</title>
       &pgpkey.trevor;
@@ -1101,6 +1106,11 @@
       &pgpkey.kwm;
     </sect2>
 
+    <sect2 id="pgpkey-emaste">
+      <title>&a.emaste;</title>
+      &pgpkey.emaste;
+    </sect2>
+
     <sect2 id="pgpkey-cherry">
       <title>&a.cherry.email;</title>
       &pgpkey.cherry;

Modified: projects/entities/share/pgpkeys/pgpkeys.ent
==============================================================================
--- projects/entities/share/pgpkeys/pgpkeys.ent	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/pgpkeys/pgpkeys.ent	Sat Jan 12 19:14:31 2013	(r40580)
@@ -109,6 +109,7 @@
 <!ENTITY pgpkey.ebrandi SYSTEM "ebrandi.key">
 <!ENTITY pgpkey.ed SYSTEM "ed.key">
 <!ENTITY pgpkey.ehaupt SYSTEM "ehaupt.key">
+<!ENTITY pgpkey.emaste SYSTEM "emaste.key">
 <!ENTITY pgpkey.emax SYSTEM "emax.key">
 <!ENTITY pgpkey.erwin SYSTEM "erwin.key">
 <!ENTITY pgpkey.fabient SYSTEM "fabient.key">
@@ -226,6 +227,7 @@
 <!ENTITY pgpkey.marck SYSTEM "marck.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.key">
 <!ENTITY pgpkey.marius SYSTEM "marius.key">
+<!ENTITY pgpkey.markj SYSTEM "markj.key">
 <!ENTITY pgpkey.markp SYSTEM "markp.key">
 <!ENTITY pgpkey.marks SYSTEM "marks.key">
 <!ENTITY pgpkey.markus SYSTEM "markus.key">

Modified: projects/entities/share/xml/authors.ent
==============================================================================
--- projects/entities/share/xml/authors.ent	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/authors.ent	Sat Jan 12 19:14:31 2013	(r40580)
@@ -1203,6 +1203,12 @@
 <!ENTITY a.maho "Maho Nakata">
 <!ENTITY a.maho.email "&a.maho; <email>maho at FreeBSD.org</email>">
 
+<!ENTITY a.markj "Mark Johnston">
+<!ENTITY a.markj.email "&markj; <email>markj at FreeBSD.org</email>">
+
+<!ENTITY a.markm "Mark Murray">
+<!ENTITY a.markm.email "&markm; <email>markm at FreeBSD.org</email>">
+
 <!ENTITY a.makc "Max Brazhnikov">
 <!ENTITY a.makc.email "&a.makc; <email>makc at FreeBSD.org</email>">
 

Modified: projects/entities/share/xml/commercial.isp.xml
==============================================================================
--- projects/entities/share/xml/commercial.isp.xml	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/commercial.isp.xml	Sat Jan 12 19:14:31 2013	(r40580)
@@ -127,17 +127,6 @@
     </description>
   </entry>
 
-  <entry id="bluegravity">
-    <name>Blue Gravity</name>
-    <url>http://www.bluegravity.com/index_bsd.php</url>
-    <description>
-      Providing FreeBSD based web/email/database hosting since 1997. Dedicated,
-      Semi-Dedicated, co-located, and virtual hosting solutions to fit any
-      needs. Unlike many hosts, we custom build servers in house with the highest
-      quality hardware to reduce costs and pass those savings on to you.
-    </description>
-  </entry>
-
   <entry id="bsdjails">
     <name>BSDjails.net</name>
     <url>http://bsdjails.net/</url>
@@ -157,24 +146,12 @@
     </description>
   </entry>
 
-  <entry id="bsdix">
-    <name>BSDiX</name>
-    <url>http://www.bsdix.com</url>
-    <description>
-      BSDiX is a hosting company specializing in FreeBSD hosting
-      including shared hosting, VPS (Virtual Private Servers), fully
-      managed dedicated servers, website hosting, e-mail hosting, dns
-      hosting and other hosting services exclusively on FreeBSD.
-      Our headquarters is in Oslo, Norway.
-    </description>
-  </entry>
-
   <entry id="dbi">
     <name>DBI Hosting</name>
     <url>http://www.dbihosting.com</url>
     <description>
       DBI Hosting offers a cost effective <a
-      href="http://www.dbihosting.com/bsdvps.html">BSD VPS</a> product
+	href="http://www.dbihosting.com/bsd-vps-hosting.html">BSD VPS</a> product
       based on the FreeBSD platform in a secure and stable environment.
       We guarantee our resources and our support team is second to none.
     </description>
@@ -389,18 +366,6 @@
     </description>
   </entry>
 
-  <entry id="k2">
-    <name>K2 Colocation</name>
-    <url>http://www.k2colocation.com/</url>
-    <description>
-      K2 Colocation is a BSD friendly colocation company.  Our
-      infrastructure resides on IBM xSeries servers running FreeBSD.
-      We can provide colocation solutions for small, medium and
-      enterprise level businesses.  We believe by focusing our efforts
-      to the colocation arena we can better serve our customers.
-     </description>
-  </entry>
-
   <entry id="Quonix">
     <name>Quonix Networks</name>
     <url>http://www.quonix.net/products/dia.html</url>
@@ -610,16 +575,6 @@
      </description>
   </entry>
 
-  <entry id="bsn">
-    <name>BSn.Com</name>
-    <url>http://bsn.com/</url>
-    <description>
-      BSn.Com is Munich, Germany based company providing ISP remote
-      hosting & net services on FreeBSD (i386 & Sparc
-      architectures).
-    </description>
-  </entry>
-
   <entry id="ServePath">
     <name>ServePath</name>
     <url>http://www.servepath.com/</url>
@@ -965,23 +920,6 @@
     </description>
   </entry>
 
-  <entry id="strategite">
-    <name>Strategite</name>
-    <url>http://www.strategite.fr</url>
-    <description>
-      Strategite is a company based in Paris, France.  We offer many
-      services: Support, installation, maintenance, administration,
-      configuration of servers like firewall, VPN, IDS, web server, mail
-      server, DNS or whatever you need.  Our services offerings include
-      a high-level of security using *BSD (like FreeBSD, OpenBSD, NetBSD),
-      Linux, MacOS and commercial Unix systems is wide and is
-      your guaranty.  For more information, visit our
-      <a href="http://www.strategite.fr" title="Strategite">website</a>,
-      <a href="mailto:a.lunot at strategite.fr">mail us</a> or phone us at
-      +33 (0) 140 337 130.
-    </description>
-  </entry>
-
   <entry id="hamburgnet">
     <name>Hamburgnet</name>
     <url>http://www.hamburgnet.de</url>
@@ -1092,22 +1030,6 @@
     </description>
   </entry>
 
-  <entry id="kuwaitnet">
-    <name>KuwaitNET Internet Services</name>
-    <url>http://www.kuwaitnet.net</url>
-    <description>
-      For the past 10 years, KuwaitNET has been providing
-      <a href="http://www.kuwaitnet.net/en/hosting.php">web hosting</a>,
-      <a href="http://www.kuwaitnet.net/en/server.php">managed dedicated
-	servers</a>, <a href="http://www.kuwaitnet.net/en/services.php">
-	domain registration</a>, IT consulting and IT project management
-      services across the Middle East on our secured FreeBSD and Linux
-      based infrastructure. As the only ICANN accredited registrar in
-      Kuwait; we are the premiere source for Internet related services
-      for customers from all industry verticals in the region.
-    </description>
-  </entry>
-
   <entry id="kwshell">
     <name>KwShell Internet Services</name>
     <url>http://www.kwshell.com</url>

Modified: projects/entities/share/xml/commercial.software.xml
==============================================================================
--- projects/entities/share/xml/commercial.software.xml	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/commercial.software.xml	Sat Jan 12 19:14:31 2013	(r40580)
@@ -764,7 +764,7 @@
 
   <entry id="NetBeans" category="DEV" >
     <name>NetBeans, Inc.</name>
-    <url>http://www.netbeans.com/</url>
+    <url>http://www.netbeans.org/</url>
     <description>
       NetBeans, Inc. make Java IDEs, written in Java, that run on FreeBSD.
       A complete set of Open APIs is available for extending the
@@ -783,22 +783,6 @@
     </description>
   </entry>
 
-  <entry id="NetCon" category="NETWORK">
-    <name>NetCon Corporation</name>
-    <url>http://www.netcon.com/</url>
-    <description>
-      NetCon Corporation, established in 1985 and with over 10,000
-      installed servers, is the leading supplier of NetWare-compatible
-      operating systems and Internet Gateways for standard UNIX platforms.
-      NetCon offers a complete line of systems for FreeBSD, SUN Solaris,
-      SCO UNIX/ODT and IBM AIX RS6000, serving from 5 to 1000 users.
-      Services include: Full Internet access from NetWare/WIN95/Windows
-      workstations over IPX/SPX, X Windows over IPX/SPX, NetWare file and
-      print services, NetWare Client services for UNIX, High-performance,
-      DOS/Windows Terminal Emulation.
-    </description>
-  </entry>
-
   <entry id="Netsville" category="SYSADMIN">
     <name>Netsville, Inc.</name>
     <url>http://www.netsville.com/</url>
@@ -894,7 +878,7 @@
     <url>http://www.perforce.com/</url>
     <description>
       Perforce Software produces <a
-      href="http://www.perforce.com/perforce.html"
+	href="http://www.perforce.com/product/perforce"
       >PERFORCE</a> -- the FAST Software Configuration
       Management System. Perforce SCM streamlines the
       software development process for organizations working with multiple
@@ -946,27 +930,6 @@
     </description>
   </entry>
 
-  <entry id="PolyServe" category="NETWORK">
-    <name>PolyServe</name>
-    <url>http://www.polyserve.com/</url>
-    <description>
-      PolyServe is a vendor of Understudy, a high-availability webserver
-      monitoring and failover utility for FreeBSD. Understudy resides on
-      two or more webservers and monitors the health and responsiveness of
-      websites. In the event that Understudy detects a failure, it
-      fails-over requests for the failed website to a backup server. Thus,
-      people browsing the website see no interruption or delay; from their
-      standpoint the website keeps right on working. <p> Understudy
-      monitors IP services including HTTP, SMTP, TCP and FTP. Upon
-      detection of a failure, Understudy removes the failed server from the
-      cluster and fails-over to the secondary backup host. Understudy then
-      generates a network-administrator notification via email and/or page
-      so that whatever problem caused the failover can be remedied. </p><p>
-      For more information, visit <a
-      href="http://www.polyserve.com/">www.polyserve.com</a>. </p>
-    </description>
-  </entry>
-
   <entry id="quadstor" category="SYSADMIN">
     <name>QUADStor Systems</name>
     <url>http://www.quadstor.com</url>
@@ -1033,32 +996,6 @@
     </description>
   </entry>
 
-  <entry id="RTD" category="SYSADMIN">
-    <name>RTD</name>
-    <url>http://www.rtd.com/</url>
-    <description>
-      RTD provides <a href="http://www.rtd.com/software/uta.html">UTA</a>,
-      an ISP billing package for FreeBSD-based ISPs.
-    </description>
-  </entry>
-
-  <entry id="SaneSolutions" category="SYSADMIN">
-    <name>Sane Solutions, LLC</name>
-    <url>http://www.sane.com/</url>
-    <description>
-      Sane Solutions, LLC offers <a
-      href="http://www.sane.com/products/NetTracker">NetTracker</a>, one of
-      the most powerful, yet easy to use Internet usage tracking programs
-      on the market today. NetTracker allows marketing professionals,
-      webmasters, and ISPs to get the essential information they need to
-      make informed decisions regarding their web sites. A demonstration of
-      NetTracker can be seen at <a
-      href="http://www.sane.com/demo/">www.sane.com/demo/</a> and a FREE,
-      30-day evaluation copy can be downloaded from <a
-      href="http://www.sane.com/eval/">www.sane.com/eval</a>.
-    </description>
-  </entry>
-
   <entry id="Sendmail" category="EMAIL">
     <name>Sendmail Inc</name>
     <url>http://www.sendmail.com/</url>
@@ -1201,7 +1138,7 @@
       of The Times Top 100 Companies use Sophos Anti-Virus to protect their
       networks from viruses. This endorsement of Sophos Anti-Virus
       protection is shared around the world. FREE evaluation copies may be
-      <a href="http://www.sophos.com/downloads/full/">downloaded</a>.
+      <a href="http://www.sophos.com/en-us/products/free-trials.aspx">downloaded</a>.
     </description>
   </entry>
 
@@ -1261,19 +1198,6 @@
     </description>
   </entry>
 
-  <entry id="VectorSystems" category="MISC">
-    <name>Vector Systems Limited</name>
-    <url>http://berklix.com/</url>
-    <description>
-      Vector Systems Limited sells FreeBSD conversions for the <a
-	href="http://berklix.com/scanjet/">HP Network Scanjet5</a>,
-      <a href="http://berklix.com/~jhs/vsl/products/cd/">Custom CD-ROMs</a>,
-      & <a href="http://berklix.com/~jhs/vsl/products/med/">
-	MED Screen Editor</a> (popular with German CAD users of PCS
-      Cadmus).
-    </description>
-  </entry>
-
   <entry id="Vembu" category="MISC">
     <name>Vembu StoreGrid</name>
     <url>http://www.vembu.com/</url>
@@ -1348,7 +1272,7 @@
 
   <entry id="XDesigner" category="DEV">
     <name>X-Designer</name>
-    <url>"http://www.ist-inc.com/xd/</url>
+    <url>http://www.ist-inc.com/xd/</url>
     <description>
       X-Designer from <a href="http://www.ist-inc.com/">Imperial Software Technology</a>
       is an advanced GUI Builder for FreeBSD.
@@ -1445,21 +1369,6 @@
     </description>
   </entry>
 
-  <entry id="swat" category="DEV">
-    <name>SWAT</name>
-    <url>http://www.coverity.com/products.html</url>
-    <description>
-      Coverity provides the <b>SWAT</b> platform for compile time defect
-      detection.  Coverity's products allow developers to detect a broad
-      class of disastrous run-time failures at compile time, including
-      buffer overruns, memory leaks, memory corruption, NULL pointer
-      dereferences and more.  SWAT analyzes C and C++ source code with
-      0 Makefile changes and 0 source code changes.  The SWAT tool is
-      available for both the production 4.X FreeBSD kernels and the
-      development 5.X kernel.
-    </description>
-  </entry>
-
   <entry id="ConnectDaily" category="NETWORK">
     <name>Connect Daily Web Calendar</name>
     <url>http://www.mhsoftware.com/connectdaily.htm</url>

Modified: projects/entities/share/xml/events2013.xml
==============================================================================
--- projects/entities/share/xml/events2013.xml	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/events2013.xml	Sat Jan 12 19:14:31 2013	(r40580)
@@ -98,4 +98,35 @@
       invites contributions from both free software developers and those
       from commercial vendors.</description>
   </event>
+
+  <event id="eurobsdcon-2013">
+    <name>EuroBSDcon 2013</name>
+    <url>http://2013.eurobsdcon.org/</url>
+    <startdate>
+      <year>2013</year>
+      <month>9</month>
+      <day>26</day>
+    </startdate>
+    <enddate>
+      <year>2013</year>
+      <month>9</month>
+      <day>29</day>
+    </enddate>
+    <location>
+      <country code="MT">Malta</country>
+      <city>TBA</city>
+      <site>St. Julians's area</site>
+    </location>
+    <description>We are happy to announce that the EuroBSDcon 2013
+      will be held on Saturday 28th and Sunday 29th of September 2013
+      (tutorials on Thursday 26th and Friday 27th) on Malta
+      (St. Julian's area).  The weather is great at about 26°C
+      during the day and 20°C at night.  The ocean is still warm
+      from summer.  Consider taking you family, wife, kids and spouse
+      with you for a long weekend.  The social event on Saturday
+      evening will be a BBQ at a beautiful sandy beach.  Family is
+      invited too and children attend for free.  A side program with
+      sight seeing and a tour of the island is being organized at
+      cost.</description>
+  </event>
 </events>

Modified: projects/entities/share/xml/freebsd.ent
==============================================================================
--- projects/entities/share/xml/freebsd.ent	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/freebsd.ent	Sat Jan 12 19:14:31 2013	(r40580)
@@ -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.0">
-<!ENTITY rel.current.date "January 2012">
+<!ENTITY rel.current "9.1">
+<!ENTITY rel.current.date "December 2012">
 <!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'>
@@ -95,7 +95,7 @@ used in both environments.
 <!ENTITY % not.published 	"IGNORE">
 
 <!-- Number of ports in the ports tree -->
-<!ENTITY os.numports "23,000">
+<!ENTITY os.numports "24,000">
 <!ENTITY ports.size "500 MB">
 
 <!-- Teams and Hats -->

Modified: projects/entities/share/xml/header.ent
==============================================================================
--- projects/entities/share/xml/header.ent	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/header.ent	Sat Jan 12 19:14:31 2013	(r40580)
@@ -11,13 +11,13 @@
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                      -->
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">Site Map</a> |
-  <a href="&base;/copyright/">Legal Notices</a> | © 1995–2012 The FreeBSD Project.
+  <a href="&base;/copyright/">Legal Notices</a> | © 1995–2013 The FreeBSD Project.
   All rights reserved.</span>'>
 <!ENTITY email 'freebsd-questions'>
 <!ENTITY author '<a href="&base;/index.html">home</a>   |   <a href="&base;/mailto.html">contact</a>   |   <a href="&base;/copyright/index.html">legal</a>   |   ©right;'>
 <!ENTITY home '<a href="&base;/index.html"><img src"&enbase;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20060509'>
+<!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20130112'>
 
 <!-- Standard headers and footers -->
 
@@ -194,4 +194,4 @@
 <!-- macro for webbuild paper -->
 <!ENTITY webbuild '
 <p xmlns="http://www.w3.org/1999/xhtml">This document describes how to build and update
-the FreeBSD Web pages from the CVS repository by hand.</p>'>
+the FreeBSD Web pages from the Subversion repository by hand.</p>'>

Modified: projects/entities/share/xml/man-refs.ent
==============================================================================
--- projects/entities/share/xml/man-refs.ent	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/man-refs.ent	Sat Jan 12 19:14:31 2013	(r40580)
@@ -396,6 +396,7 @@
 <!ENTITY man.notify.1 "<citerefentry><refentrytitle>notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.nroff.1 "<citerefentry><refentrytitle>nroff</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.nsgmls.1 "<citerefentry vendor='ports'><refentrytitle>nsgmls</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.nsupdate.1 "<citerefentry><refentrytitle>nsupdate</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.nvi.1 "<citerefentry><refentrytitle>nvi</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.nview.1 "<citerefentry><refentrytitle>nview</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.objcopy.1 "<citerefentry><refentrytitle>objcopy</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
@@ -574,6 +575,7 @@
 <!ENTITY man.send-pr.1 "<citerefentry><refentrytitle>send-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sendbug.1 "<citerefentry><refentrytitle>sendbug</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.set.1 "<citerefentry><refentrytitle>set</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.setbuf.1 "<citerefentry><refentrytitle>setbuf</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.setenv.1 "<citerefentry><refentrytitle>setenv</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.setfacl.1 "<citerefentry><refentrytitle>setfacl</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.setfib.1 "<citerefentry><refentrytitle>setfib</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
@@ -1700,6 +1702,7 @@
 <!ENTITY man.fabsf.3 "<citerefentry><refentrytitle>fabsf</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.fclose.3 "<citerefentry><refentrytitle>fclose</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.fcloseall.3 "<citerefentry><refentrytitle>fcloseall</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
+<!ENTITY man.fdlopen.3 "<citerefentry><refentrytitle>fdlopen</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.fdopen.3 "<citerefentry><refentrytitle>fdopen</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.fdopendir.3 "<citerefentry><refentrytitle>fdopendir</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.feature.present.3 "<citerefentry><refentrytitle>feature_present</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
@@ -2656,6 +2659,7 @@
 <!ENTITY man.remainderf.3 "<citerefentry><refentrytitle>remainderf</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.remove.3 "<citerefentry><refentrytitle>remove</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.remque.3 "<citerefentry><refentrytitle>remque</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
+<!ENTITY man.remquo.3 "<citerefentry><refentrytitle>remquo</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.replace.panel.3 "<citerefentry><refentrytitle>replace_panel</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.res.init.3 "<citerefentry><refentrytitle>res_init</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.res.mkquery.3 "<citerefentry><refentrytitle>res_mkquery</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
@@ -3266,6 +3270,7 @@
 <!ENTITY man.xdrrec.eof.3 "<citerefentry><refentrytitle>xdrrec_eof</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.xdrrec.skiprecord.3 "<citerefentry><refentrytitle>xdrrec_skiprecord</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.xdrstdio.create.3 "<citerefentry><refentrytitle>xdrstdio_create</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
+<!ENTITY man.xlocale.3 "<citerefentry><refentrytitle>xlocale</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.xprt.register.3 "<citerefentry><refentrytitle>xprt_register</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.xprt.unregister.3 "<citerefentry><refentrytitle>xprt_unregister</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
 <!ENTITY man.y0.3 "<citerefentry><refentrytitle>y0</refentrytitle><manvolnum>3</manvolnum></citerefentry>">
@@ -3282,6 +3287,7 @@
 <!ENTITY man.SMP.4 "<citerefentry><refentrytitle>SMP</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.YP.4 "<citerefentry><refentrytitle>YP</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.aac.4 "<citerefentry><refentrytitle>aac</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.abtn.4 "<citerefentry><refentrytitle>abtn</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.acd.4 "<citerefentry><refentrytitle>acd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.acpi.4 "<citerefentry><refentrytitle>acpi</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.acpi.aiboost.4 "<citerefentry><refentrytitle>acpi_aiboost</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3294,6 +3300,7 @@
 <!ENTITY man.acpi.thermal.4 "<citerefentry><refentrytitle>acpi_thermal</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.acpi.toshiba.4 "<citerefentry><refentrytitle>acpi_toshiba</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.acpi.video.4 "<citerefentry><refentrytitle>acpi_video</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.acpi.wmi.4 "<citerefentry><refentrytitle>acpi_wmi</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.ad.4 "<citerefentry><refentrytitle>ad</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.ada.4 "<citerefentry><refentrytitle>ada</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.adv.4 "<citerefentry><refentrytitle>adv</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3435,6 +3442,7 @@
 <!ENTITY man.fea.4 "<citerefentry><refentrytitle>fea</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.fhc.4 "<citerefentry><refentrytitle>fhc</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.firewire.4 "<citerefentry><refentrytitle>firewire</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.filemon.4 "<citerefentry><refentrytitle>filemon</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.fla.4 "<citerefentry><refentrytitle>fla</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.fpa.4 "<citerefentry><refentrytitle>fpa</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.fwe.4 "<citerefentry><refentrytitle>fwe</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3486,7 +3494,7 @@
 <!ENTITY man.ifmib.4 "<citerefentry><refentrytitle>ifmib</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.ifpi.4 "<citerefentry><refentrytitle>ifpi</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.ifpi2.4 "<citerefentry><refentrytitle>ifpi2</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
-<!ENTITY man.igb.4 "<citerefentry><refentrytitle>ifpnp</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.igb.4 "<citerefentry><refentrytitle>igb</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.ihfc.4 "<citerefentry><refentrytitle>ihfc</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.iic.4 "<citerefentry><refentrytitle>iic</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.iicbb.4 "<citerefentry><refentrytitle>iicbb</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3719,6 +3727,7 @@
 <!ENTITY man.rue.4 "<citerefentry><refentrytitle>rue</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.rum.4 "<citerefentry><refentrytitle>rum</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.run.4 "<citerefentry><refentrytitle>run</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.runfw.4 "<citerefentry><refentrytitle>runfw</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.sa.4 "<citerefentry><refentrytitle>sa</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.sab.4 "<citerefentry><refentrytitle>sab</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.safe.4 "<citerefentry><refentrytitle>safe</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3882,6 +3891,7 @@
 <!ENTITY man.vga.4 "<citerefentry><refentrytitle>vga</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.vge.4 "<citerefentry><refentrytitle>vge</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.viapm.4 "<citerefentry><refentrytitle>viapm</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.viawd.4 "<citerefentry><refentrytitle>viawd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.vinum.4 "<citerefentry><refentrytitle>vinum</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.vkbd.4 "<citerefentry><refentrytitle>vkbd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.vlan.4 "<citerefentry><refentrytitle>vlan</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3895,6 +3905,7 @@
 <!ENTITY man.vxge.4 "<citerefentry><refentrytitle>vxge</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.watchdog.4 "<citerefentry><refentrytitle>watchdog</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.wb.4 "<citerefentry><refentrytitle>wb</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.wbwd.4 "<citerefentry><refentrytitle>wbwd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.wd.4 "<citerefentry><refentrytitle>wd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.wfd.4 "<citerefentry><refentrytitle>wfd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.wi.4 "<citerefentry><refentrytitle>wi</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -3915,6 +3926,7 @@
 <!ENTITY man.xen.4 "<citerefentry><refentrytitle>xen</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.xhci.4 "<citerefentry><refentrytitle>xhci</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.xl.4 "<citerefentry><refentrytitle>xl</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.xnb.4 "<citerefentry><refentrytitle>xnb</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.xpt.4 "<citerefentry><refentrytitle>xpt</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.zero.4 "<citerefentry><refentrytitle>zero</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.zyd.4 "<citerefentry><refentrytitle>zyd</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
@@ -4010,6 +4022,7 @@
 <!ENTITY man.isdnd.acct.5 "<citerefentry><refentrytitle>isdnd.acct</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.isdnd.rates.5 "<citerefentry><refentrytitle>isdnd.rates</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.isdnd.rc.5 "<citerefentry><refentrytitle>isdnd.rc</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.jail.conf.5 "<citerefentry><refentrytitle>jail.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.kbdmap.5 "<citerefentry><refentrytitle>kbdmap</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.kernfs.5 "<citerefentry><refentrytitle>kernfs</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.keycap.5 "<citerefentry><refentrytitle>keycap</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
@@ -4041,6 +4054,7 @@
 <!ENTITY man.nsswitch.conf.5 "<citerefentry><refentrytitle>nsswitch.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.ntp.conf.5 "<citerefentry><refentrytitle>ntp.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.ntp.keys.5 "<citerefentry><refentrytitle>ntp.keys</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.nullfs.5 "<citerefentry vendor='current'><refentrytitle>nullfs</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.opieaccess.5 "<citerefentry><refentrytitle>opieaccess</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.opiekeys.5 "<citerefentry><refentrytitle>opiekeys</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pam.conf.5 "<citerefentry><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
@@ -4270,6 +4284,7 @@
 <!ENTITY man.crash.8 "<citerefentry><refentrytitle>crash</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.crashinfo.8 "<citerefentry><refentrytitle>crashinfo</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.cron.8 "<citerefentry><refentrytitle>cron</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.ctladm.8 "<citerefentry><refentrytitle>ctladm</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.cvsbug.8 "<citerefentry><refentrytitle>cvsbug</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.cvsupd.8 "<citerefentry><refentrytitle>cvsupd</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.cxconfig.8 "<citerefentry><refentrytitle>cxconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
@@ -4446,6 +4461,7 @@
 <!ENTITY man.mknetid.8 "<citerefentry><refentrytitle>mknetid</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.mknod.8 "<citerefentry><refentrytitle>mknod</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.mksnap.ffs.8 "<citerefentry><refentrytitle>mksnap_ffs</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.mkulzma.8 "<citerefentry><refentrytitle>mkulzma</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.mkuzip.8 "<citerefentry><refentrytitle>mkuzip</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.mld6query.8 "<citerefentry><refentrytitle>mld6query</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.mlxcontrol.8 "<citerefentry><refentrytitle>mlxcontrol</refentrytitle><manvolnum>8</manvolnum></citerefentry>">

Modified: projects/entities/share/xml/mirrors.xml
==============================================================================
--- projects/entities/share/xml/mirrors.xml	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/mirrors.xml	Sat Jan 12 19:14:31 2013	(r40580)
@@ -1965,10 +1965,6 @@
     </host>
 
     <host type="cvsup">
-      <name>cvsup2.ua.FreeBSD.org</name>
-    </host>
-
-    <host type="cvsup">
       <name>cvsup3.ua.FreeBSD.org</name>
     </host>
 
@@ -1980,10 +1976,6 @@
       <name>cvsup6.ua.FreeBSD.org</name>
     </host>
 
-    <host type="cvsup">
-      <name>cvsup7.ua.FreeBSD.org</name>
-    </host>
-
   </entry>
 
   <entry id="mirrors-uk">

Modified: projects/entities/share/xml/news.dtd
==============================================================================
--- projects/entities/share/xml/news.dtd	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/news.dtd	Sat Jan 12 19:14:31 2013	(r40580)
@@ -3,6 +3,7 @@
 <!ENTITY lists 'http://lists.freebsd.org/pipermail'>
 <!ENTITY lists.announce '&lists;/freebsd-announce'>
 <!ENTITY lists.stable '&lists;/freebsd-stable'>
+<!ENTITY lists.ports-announce '&lists;/freebsd-ports-announce'>
 
 <!ELEMENT news (cvs:keyword?, year)+>
 

Modified: projects/entities/share/xml/news.xml
==============================================================================
--- projects/entities/share/xml/news.xml	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/news.xml	Sat Jan 12 19:14:31 2013	(r40580)
@@ -28,11 +28,148 @@
     </cvs:keyword>
 
   <year>
+    <name>2013</name>
+
+    <month>
+      <name>1</name>
+
+      <day>
+	<name>10</name>
+	<event>
+	  <title>Ports CVS End of Life on February 28th 2013</title>
+
+	  <p>The development of &os; ports is done in Subversion
+	    nowadays.  By February 28th 2013, the &os; ports tree will
+	    no longer be exported to CVS.  Therefore ports tree updates
+	    via CVS, CVSup or csup(1) will no longer be available after
+	    that date.  All users who use CVS, CVSup or csup(1) to
+	    update the ports tree are encouraged to switch to
+	    portsnap(8) or for users which need more control over their
+	    ports collection checkout, use Subversion directly.  More
+	    information are available in the announcement mail on the <a
+	      href="&lists.ports-announce;/2012-September/000026.html">&os; ports announce mailing list</a>.</p>
+
+	  <p>A migration guide from CVSup or csup(1) to portsnap(8) is
+	    also available in <a
+	      href="&url.doc.base-en;/books/handbook/ports-using.html#cvsup-migration">the &os; Handbook</a>.</p>
+	</event>
+      </day>
+
+      <day>
+	<name>8</name>
+
+	<event>
+	  <title>Faces of &os; ‐ Thomas Abthorpe</title>
+
+	  <p>We are excited to share our next story for our Faces of
+	    &os; Series.  This is a chance for us to spotlight
+	    different people who contribute to &os; and have received
+	    funding from us to work on development projects, run
+	    conferences, travel to conferences, and advocate for
+	    &os;.</p>
+
+	  <p>Let us introduce you to Thomas Abthorpe.  We helped him
+	    attend BSDCan 2009, 2011, and 2012 by helping with his
+	    travel expenses.  Read his story <a
+	      href="http://freebsdfoundation.blogspot.com/2013/01/faces-of-freebsd-thomas-abthorpe.html">here.</a></p>
+	</event>
+      </day>
+    </month>
+  </year>
+
+  <year>
     <name>2012</name>
 
     <month>
+      <name>12</name>
+
+      <day>
+	<name>31</name>
+
+	<event>
+	  <title>&os; 9.1-RELEASE Available</title>
+
+	  <p><a href="&enbase;/releases/9.1R/announce.html">FreeBSD
+	      9.1-RELEASE</a> is now available.  Please be sure to
+	      check the <a
+	      href="&enbase;/releases/9.1R/relnotes.html">Release
+	      Notes</a> (<a
+	      href="&enbase;/releases/9.1R/relnotes-detailed.html">detailed
+	      version</a>) and <a
+	      href="&enbase;/releases/9.1R/errata.html">Release
+	      Errata</a> before installation for any late-breaking
+	      news and/or issues with 9.1.  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>20</name>
+
+	<event>
+	  <title>The &os; Foundation End-of-Year Newsletter is
+	    Now Available.</title>
+
+	  <p>We are pleased to announce the publication of The
+	    &os; Foundation's 2012 <a
+	      href="http://www.freebsdfoundation.org/press/2012Dec-newsletter.shtml">End-of-Year Newsletter.</a></p>
+	</event>
+      </day>
+
+      <day>
+	<name>18</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:markj at FreeBSD.org">Mark Johnston</a> (src)</p>
+	</event>
+
+	<event>
+	  <title>PC-BSD 9.1 is Released</title>
+
+	  <p>The PC-BSD Team <a
+	      href="http://blog.pcbsd.org/2012/12/pc-bsd-9-1-now-available/">announces</a>
+	    the availablilty of PC-BSD 9.1.</p>
+	</event>
+      </day>
+
+      <day>
+	<name>17</name>
+
+	<event>
+	  <title>Faces of &os; ‐ Dan Langille</title>
+
+	  <p>We are excited to share our next story for our Faces of
+	    &os; Series.  This is a chance for us to spotlight
+	    different people who contribute to &os; and have received
+	    funding from us to work on development projects, run
+	    conferences, travel to conferences, and advocate for
+	    &os;.</p>
+
+	  <p>Let us introduce you to Dan Langille.  We helped him by
+	    sponsoring BSDCan since 2006.  Read his story <a
+	      href="http://freebsdfoundation.blogspot.com/2012/12/faces-of-freebsd-dan-langille_17.html">here.</a></p>
+	</event>
+      </day>
+
+      <day>
 	<name>12</name>
 
+	<event>
+	  <title>Stunning News Website Fundraising
+	    Contribution: Over
+	    650 new donations raise $43,200 in three days!</title>
+
+	  <p>Astute readers of our blog know that The
+	    &os; Foundation's annual year-end fundraising  drive
+	    began last week.  Every year over 50% of our donations
+	    arrive during this campaign.  <a
+		href="http://freebsdfoundation.blogspot.com/2012/12/stunning-news-website-fundraising.html">Read more...</a></p>
+	</event>
+      </day>
+
       <day>
 	<name>10</name>
 
@@ -68,8 +205,6 @@
 	      more...</a></p>
 	</event>
 
-	<name>5</name>
-
 	<event>
 	  <title>&os; Project Website is Using Google
 	    Analytics</title>

Modified: projects/entities/share/xml/release.ent
==============================================================================
--- projects/entities/share/xml/release.ent	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/release.ent	Sat Jan 12 19:14:31 2013	(r40580)
@@ -29,8 +29,8 @@
       don't have something in BETAn or RCn), then change %beta.testing
       below to "IGNORE".  If we do, use "INCLUDE". -->
 
-<!ENTITY beta.testing "INCLUDE">
-<!ENTITY % beta.testing "INCLUDE">
+<!ENTITY beta.testing "IGNORE">
+<!ENTITY % beta.testing "IGNORE">
 <!ENTITY betarel.current '9.1'>
 <!ENTITY betarel.vers 'RC3'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
@@ -44,8 +44,8 @@
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '9'>
-<!ENTITY rel.current '&rel.current.major;.0'>
-<!ENTITY rel.current.date 'January 2012'>
+<!ENTITY rel.current '&rel.current.major;.1'>
+<!ENTITY rel.current.date 'December 2012'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>

Modified: projects/entities/share/xml/templates.events.xsl
==============================================================================
--- projects/entities/share/xml/templates.events.xsl	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/templates.events.xsl	Sat Jan 12 19:14:31 2013	(r40580)
@@ -51,12 +51,12 @@
   <xsl:key name="event-by-country" match="event"
     use="location/country" />
 
-  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) > number($curdate.year)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) > number($curdate.month)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) = number($curdate.month) and
-	     enddate/day >= $curdate.day))]"
+  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) > number(date:year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) > number(date:month-in-year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) = number(date:month-in-year()) and
+	     enddate/day >= date:day-in-month()))]"
     use="location/country" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9'" />

Modified: projects/entities/share/xml/templates.pastevents.xsl
==============================================================================
--- projects/entities/share/xml/templates.pastevents.xsl	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/templates.pastevents.xsl	Sat Jan 12 19:14:31 2013	(r40580)
@@ -53,12 +53,12 @@
   <xsl:key name="event-by-country" match="event"
     use="location/country" />
 
-  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) > number($curdate.year)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) > number($curdate.month)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) = number($curdate.month) and
-	     enddate/day >= $curdate.day))]"
+  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) > number(date:year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) > number(date:month-in-year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) = number(date:month-in-year()) and
+	     enddate/day >= date:day-in-month()))]"
     use="location/country" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9'" />

Modified: projects/entities/share/xml/xhtml.xsl
==============================================================================
--- projects/entities/share/xml/xhtml.xsl	Sat Jan 12 19:14:05 2013	(r40579)
+++ projects/entities/share/xml/xhtml.xsl	Sat Jan 12 19:14:31 2013	(r40580)
@@ -37,6 +37,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml">
       <head>
 	<title><xsl:value-of select="$title" /></title>
+	<xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:base" />
 	<meta http-equiv="Content-Type" content="text/html; charset=&xml.encoding;" />
 	<meta name="MSSmartTagsPreventParsing" content="TRUE" />
 	<xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:meta"/>


More information about the svn-doc-projects mailing list