svn commit: r50725 - in head: en_US.ISO8859-1/htdocs en_US.ISO8859-1/htdocs/releases/10.4R en_US.ISO8859-1/share/xml share/xml

Sat Aug 26 02:31:09 UTC 2017

Author: marius (src,ports committer)
Date: Sat Aug 26 02:31:07 2017
New Revision: 50725
URL: https://svnweb.freebsd.org/changeset/doc/50725

Log:
  - Belatedly mark the start of 10.4-BETA2 builds as done.
  - It seems that somehone has mislabeld one of the red buttons to read
    beta.second instead of beta2.desc, so give that knob a try and let's
    see whether it brings the betarel2 bits into where.html.
  - The 10.4-BETA2 set includes the RPI-B image again, so uncomment its
    betarel2 entry.
  - Announce 10.4-BETA2 and bump betarel2.vers to BETA2 accordingly.
  - Nuke some trailing spaces while at it.
  
  Approved by:	re (implict)

Modified:
  head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml
  head/en_US.ISO8859-1/htdocs/where.xml
  head/en_US.ISO8859-1/share/xml/release.l10n.ent
  head/share/xml/news.xml
  head/share/xml/release.ent

Modified: head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml
==============================================================================

--- head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml	Sat Aug 26 01:28:22 2017	(r50724)
+++ head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml	Sat Aug 26 02:31:07 2017	(r50725)
@@ -90,7 +90,7 @@
     <tr>
       <td>BETA2 builds begin</td>
       <td>25 August 2017</td>
-      <td>-</td>
+      <td>25 August 2017</td>
       <td>Second beta test snapshot.</td>
     </tr>
 

Modified: head/en_US.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/where.xml	Sat Aug 26 01:28:22 2017	(r50724)
+++ head/en_US.ISO8859-1/htdocs/where.xml	Sat Aug 26 02:31:07 2017	(r50725)
@@ -239,6 +239,7 @@
     <br />
 
     &beta.desc;
+    &beta.second;
 
     <a name="download-snapshots"></a>
 
@@ -419,7 +420,7 @@
 
     <a name="install"></a>
 
-    <h2>Install &os;</h2> 
+    <h2>Install &os;</h2>
 
     <p>There are many options for installing &os;, including
       installation from CD-ROM, DVD, USB Memory Stick or even directly
@@ -459,7 +460,7 @@
 	source storage platform based on &os; and supports sharing
 	across Windows, Apple, and UNIX-like systems.</p></li>
 
-      <li><p><a href="https://www.trueos.org">TrueOS</a> (formerly 
+      <li><p><a href="https://www.trueos.org">TrueOS</a> (formerly
 	<a href="https://pcbsd.org">PC-BSD</a>) is a &os;
 	derivative with a graphical installer.  The desktop option installs
 	<a href="https://lumina-desktop.org">The Lumina Desktop Environment</a>,

Modified: head/en_US.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/release.l10n.ent	Sat Aug 26 01:28:22 2017	(r50724)
+++ head/en_US.ISO8859-1/share/xml/release.l10n.ent	Sat Aug 26 02:31:07 2017	(r50725)
@@ -10,7 +10,7 @@
 <!ENTITY beta.second '
     <div xmlns="http://www.w3.org/1999/xhtml">
       <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
-  
+
       <table class="tblbasic tblwide tbldownload">
 	<tbody>
 	  <tr>
@@ -44,13 +44,15 @@
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.bz2">CUBOX-HUMMINGBOARD</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-GUMSTIX.img.bz2">GUMSTIX</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.bz2">PANDABOARD</a></li>
-		<!--<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.bz2">RPI-B</a></li>-->
+		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.bz2">RPI-B</a></li>
 		<!--<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-WANDBOARD.img.bz2">WANDBOARD</a></li>-->
 	      </ul>
 	    </td>
 	    <td>
 	      <ul class="txtdocslist">
+	        <?ignore
 		<li><a href="&enbase;/releases/&betarel2.current;R/todo.html">TODO List</a></li>
+	        ?>
 	      </ul>
 	    </td>
 	  </tr>

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Sat Aug 26 01:28:22 2017	(r50724)
+++ head/share/xml/news.xml	Sat Aug 26 02:31:07 2017	(r50725)
@@ -35,6 +35,22 @@
       <name>8</name>
 
       <day>
+	<name>26</name>
+
+	<event>
+	  <title>&os; 10.4-BETA2 Available</title>
+
+	  <p>The second BETA build for the &os; 10.4 release cycle
+	    is now available.  ISO images for the amd64, armv6, i386,
+	    ia64, powerpc, powerpc64 and sparc64 architectures are <a
+	      href="&lists.stable;/2017-August/087708.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>19</name>
 
 	<event>

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Sat Aug 26 01:28:22 2017	(r50724)
+++ head/share/xml/release.ent	Sat Aug 26 02:31:07 2017	(r50725)
@@ -55,7 +55,7 @@
 <!ENTITY beta2.testing "INCLUDE">
 <!ENTITY % beta2.testing "INCLUDE">
 <!ENTITY betarel2.current '10.4'>
-<!ENTITY betarel2.vers 'BETA1'>
+<!ENTITY betarel2.vers 'BETA2'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '11'>
