Merge branch 'master' into current

www/doc/topo.html

 <!--
-   Copyright (c) 2005-2015 University of Utah and the Flux Group.
+   Copyright (c) 2005-2016 University of Utah and the Flux Group.
    
    {{{EMULAB-LICENSE
    
@@ -49,19 +49,16 @@
 </tr>
 <tr></tr>
 <tr>
-  <td>pc211 - pc240</td><td>cisco8</td><td>4 x Gb</td>
+  <td>pc201 - pc205<br>pc228 - pc240</td><td>cisco8</td><td>4 x Gb</td>
 </tr>
 <tr>
-  <td>pc241 - pc260</td><td>cisco5/cisco8</td><td>1 x 100Mb, 3 x Gb</td>
+  <td>pc206, pc210<br>pc241 - pc251<br>pc254, pc255</td><td>cisco8, cisco5</td><td>3 x Gb, 1 x 100Mb</td>
 </tr>
 <tr>
-  <td>pc261 - pc280</td><td>cisco5/cisco8</td><td>3 x 100Mb, 1 x Gb</td>
+  <td>pc207 - pc209<br>pc211 - pc220<br>pc222 - pc227<br>pc252, pc253<br>pc256 - pc259<br>pc281 - pc320</td><td>cisco8, cisco5</td><td>2 x Gb, 2 x 100Mb</td>
 </tr>
 <tr>
-  <td>pc281 - pc320</td><td>cisco5/cisco8</td><td>2 x 100Mb, 2 x Gb</td>
-</tr>
-<tr>
-  <td>pc321 - pc360</td><td>cisco5/cisco8</td><td>3 x 100Mb, 1 x Gb</td>
+  <td>pc260<br>pc263 - pc280<br>pc321 - pc360</td><td>cisco8, cisco5</td><td>1 x Gb, 3 x 100Mb</td>
 </tr>
 <tr>
   <td>pc401 - pc520</td><td>procurve3-5</td><td>4 x 1Gb</td>
@@ -70,7 +67,31 @@
   <td>pc521 - pc560</td><td>procurve3-5</td><td>5 x 1Gb</td>
 </tr>
 <tr>
-  <td>pc601 - pc616</td><td>arista1</td><td>3 x 10Gb</td>
+  <td>pc601 - pc616</td><td>arista1</td><td>4 x 10Gb</td>
+</tr>
+<tr>
+  <td>pc701 - pc716</td><td>z9500, dellexpt1-3</td><td>4 x 10Gb, 2 x Gb</td>
+</tr>
+<tr>
+  <td>pc717 - pc740</td><td>z9500, dellexpt1-3</td><td>2 x 10Gb, 4 x Gb</td>
+</tr>
+<tr>
+  <td>pc741 - pc756</td><td>z9500, dellexpt4-6</td><td>4 x 10Gb, 2 x Gb</td>
+</tr>
+<tr>
+  <td>pc757 - pc780</td><td>z9500, dellexpt4-6</td><td>2 x 10Gb, 4 x Gb</td>
+</tr>
+<tr>
+  <td>pc781 - pc796</td><td>z9500, dellexpt7-9</td><td>4 x 10Gb, 2 x Gb</td>
+</tr>
+<tr>
+  <td>pc797 - pc820</td><td>z9500, dellexpt7-9</td><td>2 x 10Gb, 4 x Gb</td>
+</tr>
+<tr>
+  <td>pc821 - pc836</td><td>z9500, dellexpt10-12</td><td>4 x 10Gb, 2 x Gb</td>
+</tr>
+<tr>
+  <td>pc837 - pc860</td><td>z9500, dellexpt10-12</td><td>2 x 10Gb, 4 x Gb</td>
 </tr>
 </table>
 </center>