31e2d167afd4bfa660f42eff3a61d8366788554f
Merge parents e22c6fc c02c754
jcasper
  Wed Jun 26 14:57:53 2013 -0700
Resolved merge - edit conflicts between b0b and me
diff --cc src/hg/htdocs/indexNews.html
index f9bbba9,eadb883..088a870
--- src/hg/htdocs/indexNews.html
+++ src/hg/htdocs/indexNews.html
@@@ -1,87 -1,103 +1,87 @@@
  <!--News Section----------------------------------------------->  
-         <TABLE WIDTH="100%" BGCOLOR="#888888" BORDER="0" CELLSPACING="0" CELLPADDING="1">
-             <TR><TD>        
-             <TABLE BGCOLOR="#fffee8" WIDTH="100%"  BORDER="0" CELLSPACING="0" CELLPADDING="0">
-                 <TR><TD>        
-                 <TABLE BGCOLOR="#D9E4F8" BACKGROUND="images/hr.gif" WIDTH="100%" BORDER=0>
-                     <TR><TD>
-                     <!--cheap trick to get background on row to be continuous-->
-                     <TABLE CELLPADDING=0 CELLSPACING=0 WIDTH="100%">
-                         <TR><TD ALIGN="left">
-                          <font size="4"><a name="TOC"></a><b>&nbsp; News</b></font><a href="http://www.twitter.com/GenomeBrowser" target="_blank"><img src="http://twitter-badges.s3.amazonaws.com/t_small-a.png" alt="Follow GenomeBrowser on Twitter" style="vertical-align:text-bottom; margin-left: 15px;"></a></TD>
-                         <TD ALIGN="right"><A HREF="goldenPath/newsarch.html"><IMG 
-                         SRC="images/news.jpg" ALT="" ALIGN="right" BORDER=0></A>
-                     </TD></TR></TABLE>
-                 </TD></TR></TABLE>
-                 <TABLE BGCOLOR="#fffee8" WIDTH="100%" CELLPADDING=0>
-                   <TR><TH HEIGHT=3></TH></TR>
-                   <TR><TD WIDTH=10></TD>
-                   <TD>
-                   <P>
-                   To receive announcements of new genome 
-                   assembly releases, new software features, updates and 
-                   training seminars by email, subscribe to the
-                   <A HREF="http://groups.google.com/a/soe.ucsc.edu/group/genome-announce?hl=en"
-                   TARGET=_blank>genome-announce</A> mailing list.</P>
+ <TABLE WIDTH="100%" BGCOLOR="#888888" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+     <TR><TD>        
+     <TABLE BGCOLOR="#fffee8" WIDTH="100%"  BORDER="0" CELLSPACING="0" CELLPADDING="0">
+         <TR><TD>        
+         <TABLE BGCOLOR="#D9E4F8" BACKGROUND="images/hr.gif" WIDTH="100%" BORDER=0>
+             <TR><TD>
+             <!--cheap trick to get background on row to be continuous-->
+             <TABLE CELLPADDING=0 CELLSPACING=0 WIDTH="100%">
+                 <TR><TD ALIGN="left">
+                  <font size="4"><a name="TOC"></a><b>&nbsp; News</b></font><a href="http://www.twitter.com/GenomeBrowser" target="_blank"><img src="http://twitter-badges.s3.amazonaws.com/t_small-a.png" alt="Follow GenomeBrowser on Twitter" style="vertical-align:text-bottom; margin-left: 15px;"></a></TD>
+                 <TD ALIGN="right"><A HREF="goldenPath/newsarch.html"><IMG 
+                 SRC="images/news.jpg" ALT="" ALIGN="right" BORDER=0></A>
+             </TD></TR></TABLE>
+         </TD></TR></TABLE>
+         <TABLE BGCOLOR="#fffee8" WIDTH="100%" CELLPADDING=0>
+           <TR><TH HEIGHT=3></TH></TR>
+           <TR><TD WIDTH=10></TD>
+           <TD>
+           <P>
+           To receive announcements of new genome 
+           assembly releases, new software features, updates and 
+           training seminars by email, subscribe to the
+           <A HREF="http://groups.google.com/a/soe.ucsc.edu/group/genome-announce?hl=en"
+           TARGET=_blank>genome-announce</A> mailing list.</P>
  
-             <!-- start news -->
+     <!-- start news -->
 -    
 +           
- 		<p>
- 		<font face="courier" size="3"><b>26 June 2013
- 		- Suggestion Box Released</b></font>
- 		<p>
- 		Due to popular demand, we have created a suggestion box for track, assembly,
- 		tool, and other requests. All suggestions will be assigned a reference
- 		number so that you may follow up on their progress with our staff. Please
- 		limit the use of this form to requests for new features; questions and reports
- 		of problems about existing features and data should continue to be directed to
- 		our mailing lists. You may reach the suggestion box from the
- 		<a href="contacts.html">Contact Us</a> page or by
- 		<a href="cgi-bin/hgUserSuggestion">clicking here</a>.
- 		<p>
++	<p>
++	<font face="courier" size="3"><b>26 June 2013
++	- Suggestion Box Released</b></font>
++	<p>
++	Due to popular demand, we have created a suggestion box for track, assembly,
++	tool, and other requests. All suggestions will be assigned a reference
++	number so that you may follow up on their progress with our staff. Please
++	limit the use of this form to requests for new features; questions and reports
++	of problems about existing features and data should continue to be directed to
++	our mailing lists. You may reach the suggestion box from the
++	<a href="contacts.html">Contact Us</a> page or by
++	<a href="cgi-bin/hgUserSuggestion">clicking here</a>.
++	<p>
 + 
- 	    <!-- start archives -->
- 		<hr>
++        <!-- start archives -->
++	<hr>
 +
-                 <p>
-                 <font face="courier" size="3"><b>12 June 2013
-                 - Ferret Genome Browser Released:</b></font>
-                 A Genome Browser is now available for the Ferret
-                 (<em>Mustela putorius furo</em>) assembly released by the Ferret Genome Sequencing Consortium
-                 April  2011 (version MusPutFur1.0, UCSC version musFur1).
- 		<a href="goldenPath/newsarch.html#061213">Read more</a>.</p>
+         <p>
+         <font face="courier" size="3"><b>12 June 2013
 -        - Ferret Genome Browser Released</b></font>
 -        <p>
++        - Ferret Genome Browser Released:</b></font>
+         A Genome Browser is now available for the Ferret
+         (<em>Mustela putorius furo</em>) assembly released by the Ferret Genome Sequencing Consortium
+         April  2011 (version MusPutFur1.0, UCSC version musFur1).
 -        Please note the <a href="http://www.ncbi.nlm.nih.gov/Traces/wgs/?val=AEYP01"
 -        target="_blank">assembly construction details</a>.
 -        For more information and statistics about this assembly,
 -        see the NCBI assembly record for
 -        <a href="http://www.ncbi.nlm.nih.gov/assembly/286418/"
 -        target="_blank">MusPutFur1.0</a>.
 -        <p>
 -        Bulk downloads of the sequence and annotation data may be obtained from the Genome
 -        Browser <a href="ftp://hgdownload.cse.ucsc.edu/goldenPath/musFur1/" target="_blank">FTP server</a>
 -        or the
 -        <a href="http://hgdownload.cse.ucsc.edu/downloads.html#ferret" target="_blank">Downloads</a>
 -        page. Please observe the
 -        <a href="goldenPath/credits.html#ferret_use">conditions for use</a>
 -        when accessing and using these data sets. The annotation tracks for this browser
 -        were generated by UCSC and collaborators worldwide. See the
 -        <a href="goldenPath/credits.html#ferret_credits">Credits</a> page for a detailed
 -        list of the organizations and individuals who contributed to this release.  </p>
 -        <p>
 -
 -    <!-- start archives -->
 -        <hr>
++	<a href="goldenPath/newsarch.html#061213">Read more</a>.</p>
  
  
- 	    <!-- staged for archive use
-  		<p>
-                 <font face="courier" size="3"><b>12 June 2013
-                 - Ferret Genome Browser Released</b></font>
- 		A Genome Browser is now available for the Ferret 
- 		(<em>Mustela putorius furo<em>) assembly released by the Ferret Genome Sequencing Consortium
-                 April  2011 (version MusPutFur1.0, UCSC version musFur1).
-                 <a href="goldenPath/newsarch.html#061213">Read more</a>.</p>
-             -->
+     <!-- staged for archive use
+         <p>
+         <font face="courier" size="3"><b>12 June 2013
+         - Ferret Genome Browser Released</b></font>
+         A Genome Browser is now available for the Ferret 
+         (<em>Mustela putorius furo<em>) assembly released by the Ferret Genome Sequencing Consortium
+         April  2011 (version MusPutFur1.0, UCSC version musFur1).
+         <a href="goldenPath/newsarch.html#061213">Read more</a>.</p>
+     -->
   		<p>
-                 <font face="courier" size="3"><b>22 May 2013
-                 - Gibbon Genome Browser Released:</b></font>
- 		A Genome Browser is now available for the Gibbon
- 		(<em>Nomascus leucogenys</em>) assembly released by the Gibbon Genome Sequencing Consortium
+         <font face="courier" size="3"><b>22 May 2013
 -        - Gibbon Genome Browser Released</b></font>
++        - Gibbon Genome Browser Released:</b></font>
+         A Genome Browser is now available for the Gibbon
+         (<em>Nomascus leucogenys</em>) assembly released by the Gibbon Genome Sequencing Consortium
  		October 2012 (version Nleu_3.0, UCSC version nomLeu3).
-                 <a href="goldenPath/newsarch.html#052213">Read more</a>.</p>
+         <a href="goldenPath/newsarch.html#052213">Read more</a>.</p>
  
   		<p>
-                 <font face="courier" size="3"><b>09 April 2013
-                 - The UCSC Cancer Genomics Browser Has a New Look:</b></font>
- 		The UCSC Cancer Genomics group has recently remodeled the interface of the
- 		<a href="https://genome-cancer.ucsc.edu/" target="blank">Cancer Genomics Browser</a>
- 		to make it easier to navigate and more intuitive to display, investigate, and
- 		analyze cancer genomics data and 
- 		associated clinical information.
-                 <a href="goldenPath/newsarch.html#040913">Read more</a>.</p>
+         <font face="courier" size="3"><b>09 April 2013
 -        - The UCSC Cancer Genomics Browser Has a New Look!</b></font>
++        - The UCSC Cancer Genomics Browser Has a New Look:</b></font>
+         The UCSC Cancer Genomics group has recently remodeled the interface of the
+         <a href="https://genome-cancer.ucsc.edu/" target="blank">Cancer Genomics Browser</a>
+         to make it easier to navigate and more intuitive to display, investigate, and
+         analyze cancer genomics data and 
+         associated clinical information.
+         <a href="goldenPath/newsarch.html#040913">Read more</a>.</p>
  
 - 		<p>
 -        <font face="courier" size="3"><b>05 March 2013
 -        - dbSNP 137 Available for mm10: </b></font>
 -        We are pleased to announce the release of three tracks derived
 -        from dbSNP build 137, available on the mouse assembly (GRCm38/mm10).
 -        dbSNP build 137 is available at NCBI. The new tracks contain
 -        additional annotation data not included in previous dbSNP tracks,
 -        with corresponding coloring and filtering options in the Genome
 -        Browser. 
 - 		<a href="goldenPath/newsarch.html#030513">Read more</a>.
 -        </p>
 -
  ==> <a href="goldenPath/newsarch.html">News Archives</a>
  
-                     </TD><TD WIDTH=15>
-                  </TD></TR></TABLE>
-             <BR></TD></TR></TABLE>
-         </TD></TR></TABLE>
+             </TD><TD WIDTH=15>
+          </TD></TR></TABLE>
+     <BR></TD></TR></TABLE>
+ </TD></TR></TABLE>