From 4034b1b85efaa0c5134497db51356d7467b01e55 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Wed, 22 Jul 2015 17:59:12 +0000
Subject: [PATCH] MFde:	Update information/download links for FreeBSD test
 version/s.

Obtained from:	The FreeBSD German Documentation Project
---
 de_DE.ISO8859-1/htdocs/where.xml           |  10 +-
 de_DE.ISO8859-1/share/xml/release.l10n.ent | 233 ++++++++++-----------
 2 files changed, 117 insertions(+), 126 deletions(-)
diff --git a/de_DE.ISO8859-1/htdocs/where.xml b/de_DE.ISO8859-1/htdocs/where.xml
index 57a402a17a..218673ddc3 100644
--- a/de_DE.ISO8859-1/htdocs/where.xml
+++ b/de_DE.ISO8859-1/htdocs/where.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r46526">
+<!ENTITY reference "basiert auf: r46949">
 <!ENTITY title "FreeBSD Bezugsquellen">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 <!ENTITY url.snapshot "ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots">
@@ -182,7 +182,7 @@
 
     <a name="download-snapshots"></a>
 
-    <h1>Snapshots</h1>
+    <h1>Entwickler-Snapshots</h1>
 
     <p>Sind Sie an primär für Entwickler und Alphatester gedachten
       und experimentellen <strong>Snapshot</strong>-Versionen
@@ -207,16 +207,18 @@
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel.head;/">amd64</a></li>
 	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.head;/">i386</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.head;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.head;/">powerpc64</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.head;/">sparc64</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/amd64/Latest/">amd64</a></li>
 	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/i386/Latest/">i386</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/aarch64/Latest/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -245,10 +247,10 @@
 	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel.current;/">amd64</a></li>
 	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.current;/">i386</a></li>
 	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&rel.current;/">ia64</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
 	    </ul>
 	  </td>
 	  <td>
diff --git a/de_DE.ISO8859-1/share/xml/release.l10n.ent b/de_DE.ISO8859-1/share/xml/release.l10n.ent
index 006ea7b606..f11c22b47f 100644
--- a/de_DE.ISO8859-1/share/xml/release.l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/release.l10n.ent
@@ -2,8 +2,9 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r42658
+     basiert auf: r46192
 -->
+
 <![%beta2.testing;[
 <!ENTITY beta.plural 'en'>
 ]]>
@@ -11,72 +12,102 @@
 
 <![%beta2.testing;[
 <!ENTITY beta.second '
-    <table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
-      <thead>
-        <tr style="text-align: center;">
-          <td colspan="2">Version &amp; Plattform</td>
-          <td>Distribution</td>
-          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
-
-          <!--<td>Statusseite</td>-->
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
-	  <td colspan="2"></td>
-	  <!--<td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td>-->
-	  <!--<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[Lesen]</a></td>-->
-        </tr>
-        <tr>
-          <td></td>
-          <td>amd64</td>
-          <td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>i386</td>
-          <td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>ia64</td>
-          <td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>powerpc</td>
-          <td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-	<!--
-        <tr>
-          <td></td>
-          <td>powerpc64</td>
-          <td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-	-->
-        <tr>
-          <td></td>
-          <td>sparc64</td>
-          <td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-      </tbody>
-    </table>
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
+  
+      <table class="tblbasic tblwide tbldownload">
+	<tbody>
+	  <tr>
+	    <th>Installations-Images</th>
+	    <th>Images für virtuelle Maschinen</th>
+	    <th>Dokumentation</th>
+	  </tr>
+	  <tr>
+	    <td>
+	      <ul class="txtdownloadlist">
+		<li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">amd64</a></li>
+		<li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&betarel2.current;/">i386</a></li>
+		<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&betarel2.current;/">armv6</a></li>
+		<li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">ia64</a></li>
+		<li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">powerpc</a></li>
+		<li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">powerpc64</a></li>
+		<li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">sparc64</a></li>
+	      </ul>
+	    </td>
+	    <td>
+	      <ul class="txtdownloadlist">
+		<li><a href="&url.snapshot;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/amd64/Latest/">amd64</a></li>
+		<li><a href="&url.snapshot;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/i386/Latest/">i386</a></li>
+	      </ul>
+	    </td>
+	    <td>
+	      <ul class="txtdocslist">
+		<li><a href="&enbase;/releases/&betarel2.current;R/todo.html">TODO-Liste</a></li>
+	      </ul>
+	    </td>
+	  </tr>
+	</tbody>
+      </table>
+      <br />
+    </div>
 '>
 ]]>
 <!ENTITY beta.second ''>
 
+
 <![%beta.testing;[
 <!ENTITY beta.desc '
+  <div xmlns="http://www.w3.org/1999/xhtml">
+    &beta.helptest;
+
+    <h1>&os; &betarel.current;-&betarel.vers;</h1>
+
+    <table class="tblbasic tblwide tbldownload">
+      <tbody>
+	<tr>
+	  <th>Installations-Images</th>
+	  <th>Images für virtuelle Maschinen</th>
+	  <th>Dolumentation</th>
+	</tr>
+	<tr>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&betarel.current;/">amd64</a></li>
+	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&betarel.current;/">i386</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&betarel.current;/">armv6</a></li>
+	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&betarel.current;/">ia64</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">powerpc</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">powerpc64</a></li>
+	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.snapshot;/VM-IMAGES/&betarel.current;-&betarel.vers;/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&betarel.current;-&betarel.vers;/i386/Latest/">i386</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdocslist">
+	      <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO-Liste</a></li>
+	    </ul>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+    <br />
+
+    &beta.second;
+  </div>
+'>
+]]>
+
+<!ENTITY beta.desc ''>
+
+<!ENTITY beta.helptest '
   <div xmlns="http://www.w3.org/1999/xhtml">
     <a name="helptest"></a>
-    <h2>Beim Test der nächsten FreeBSD-Version&beta.plural; helfen</h2>
+    <h1>Beim Testen der nächsten FreeBSD-Version&beta.plural; helfen</h1>
 
     <p>Unsere Entwickler und Release-Ingenieure bereiten die
       Veröffentlichung der nächsten
@@ -86,70 +117,28 @@
       diese Versionen noch getestet werden müssen und daher für
       eine Produktivumgebung nicht geeignet sind.</p>
 
-    <table class="tblbasic">
-      <thead>
-        <tr style="text-align: center;">
-          <td colspan="2">Version &amp; Plattform</td>
-          <td>Distribution</td>
-          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
-          <!--<td>Statusseite</td>-->
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
-          <td colspan="2"></td>
-	  <!--<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/&betarel.current;TODO">[View]</a></td>-->
-        </tr>
-        <tr>
-          <td></td>
-          <td>amd64<br/>(x86-64, x64)</td>
-	  <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>i386</td>
-	  <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-	<tr>
-	  <td></td>
-	  <td>ia64</td>
-	  <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-	</tr>
-	<!--
-        <tr>
-          <td></td>
-          <td>pc98</td>
-	  <td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-	-->
-        <tr>
-	  <td></td>
-	  <td>powerpc</td>
-	  <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-	</tr>
-	<tr>
-          <td></td>
-          <td>powerpc64</td>
-	  <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>sparc64</td>
-	  <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-      </tbody>
-    </table>
+  </div>
+'>
 
-    &beta.second;
+<![%beta.local.where;[
+<!ENTITY beta.local.where '
+  <div xmlns="http://www.w3.org/1999/xhtml">
+    &beta.helptest;
+    <p>Verfügbare Installations-Images finden Sie auf der <a
+      href="&base;/where.html#helptest">Downloadseite</a>.</p>
   </div>
 '>
 ]]>
-<!ENTITY beta.desc ''>
+
+<![%beta2.local.where;[
+<!ENTITY beta2.local.where '
+  <div xmlns="http://www.w3.org/1999/xhtml">
+    &beta.helptest;
+    <p>Verfügbare Installations-Images finden Sie auf der <a
+      href="&base;/where.html#helptest">Downloadseite</a>.</p>
+  </div>
+'>
+]]>
+
+<!ENTITY beta.local.where ''>
+<!ENTITY beta2.local.where ''>

Version & Plattform		Distribution	ISO
FreeBSD &betarel.current;-&betarel.vers;
	amd64 (x86-64, x64)	[Distribution]	[ISO]
	i386	[Distribution]	[ISO]
	ia64	[Distribution]	[ISO]
	powerpc	[Distribution]	[ISO]
	powerpc64	[Distribution]	[ISO]
	sparc64	[Distribution]	[ISO]