58d111bf42c1080890de5f83affe37ca04ce6147
Merge parents b153dea 9e9782d
donnak
  Thu Feb 27 15:13:47 2014 -0800
Fixed merge conflict after making a few edits to training announcement at top of page.
diff --cc src/hg/htdocs/training.html
index 18e649d,3644985..297633b
--- src/hg/htdocs/training.html
+++ src/hg/htdocs/training.html
@@@ -16,45 -16,53 +16,45 @@@
  <TR><TD COLSPAN=2 HEIGHT=40><!--#include virtual="/inc/FAQ.topbar.html"--></TD></TR>
  <!--Content Tables------------------------------------------------------->
  <TR><TD COLSPAN=2 CELLPADDING=10>
  <!--outer table is for border purposes-->
    <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%>
        <TR><TD> <FONT SIZE="4"><b>&nbsp; Getting Help with the UCSC Genome Browser</b></FONT>
        </TD></TR></TABLE>
         <TABLE BGCOLOR="fffee8" WIDTH="100%" CELLPADDING=0><TR><TH HEIGHT=10></TH></TR>
         <TR><TD WIDTH=10>&nbsp;</TD><TD>
  
           <TABLE BGCOLOR="fffee8" WIDTH="100%" CELLPADDING=0><TR><TH HEIGHT=10></TH></TR>
           <TR><TD WIDTH=5>&nbsp;</TD><TD>
              <div class="warn-note" style="border: 2px solid #9e5900; padding: 5px 20px; background-color: #e8ebf7;">
 -              <p><span style="font-weight: bold; color: #c70000;"> <b>New! On-site workshops available:</b> </span><br> 
 +              <p><span style="font-weight: bold; color: #c70000;"> <b>New onsite workshops available!</b> </span><br> 
                <p>
 -              Explore the full power of the UCSC Genome Browser! Thanks to the NHGRI, 
 -              we are now offering trainings in the Genome Browser at your institution. 
 -              We will visit your location and conduct a hands-on tutorial 
 -              tailored to your audience's level of expertise.
 -              </p>
 -              <p>
 -              To participate, you would need to provide a round-trip plane ticket from 
 -              California (unless we can combine destinations), lodging, and 
 -              a modest flat fee to cover other costs. NHGRI is paying the salary of our 
 -              expert trainer.
 +              Explore the full power of the UCSC Genome Browser! Thanks to the funding support
 +              of NHGRI, we can now offer hands-on Genome Browser training onsite at your 
 +	      institution, tailored to your audience's level of expertise. Through this
 +	      program, the services of our expert trainer are provided for free, and
 +	      participating institutions cover only the transportation from UCSC, lodging, 
- 	      and a modest fee to cover other costs. 
++	      and a flat fee to cover other costs. 
                </p>
                <p>
                For more information or to submit a request for a workshop, please visit 
 -              this survey link:
 -              </p>
 -              <p>
 -              <a href="http://bit.ly/ucscTraining" target="_blank">bit.ly/ucscTraining</a>
 +              <a href="http://bit.ly/ucscTraining" target="_blank">our survey</a>.
                </p>
              </div>
 -            <P>
 -            </P>
 +            <br><br>
  
           <B>Online Training and Tutorials:</B>
            <UL>
             <LI><A HREF="http://www.openhelix.com/ucsc" TARGET=_blank>Open Helix tutorial and training materials</A>
  	   <li><a href="http://www.nature.com/scitable/ebooks/guide-to-the-ucsc-genome-browser-16569863"
  	          target="_blank">Guide to the UCSC Genome Browser</a>
             <li><a href="goldenPath/help/ucscGeneFishing.pdf" target="_blank">Fishing for genes in the UCSC Browser (pdf)</a>
  	   <li><a href="http://bib.oxfordjournals.org/content/14/2/144.full"
                    target = "_blank">The UCSC genome browser and associated tools</a>
  	   <li><a href="http://www.ncbi.nlm.nih.gov/pubmed/18514479"
                    target = "_blank">UCSC genome browser tutorial</a>
  	   <LI><A HREF="training/ashg2009" >Step-by-step tutorial presented at ASHG 2009 annual meeting</A> 
                - basic browser navigation and functionality in the context of interpreting clinical genetics
                reports. 
  	   <LI><A HREF="http://genomewiki.ucsc.edu/index.php/ABRF2010_Tutorial" >Step-by-step tutorial