58835e5811b01406cb79434d0a860b4f73419a30
donnak
  Fri Sep 20 16:46:06 2013 -0700
Made some changes to conditions.html per ref #8699. Also removed some duplicate info from indexInfo.html, but not all of it. This will improve once we revamp the static pages, but I think it's OK for now.
diff --git src/hg/htdocs/conditions.html src/hg/htdocs/conditions.html
index 1dd7abf..6912ffa 100755
--- src/hg/htdocs/conditions.html
+++ src/hg/htdocs/conditions.html
@@ -11,36 +11,59 @@
 	<img src="images/title.jpg" alt="UCSC Genome Bioinformatics">
 </div><!-- .header -->
 
 <div class="nav">
 <!--#include virtual="inc/topbar.html"-->
 </div><!-- .nav -->
 
 <div class="content">
 
 <div class="section">
 	
 	<h1>Conditions of Use</h1>
 	  
     <div class="sectionContent">
 
-	<p>The sequence and annotation data displayed in the Genome Browser are freely available for any use with the following conditions:</p>
-	
+	<p>The UCSC Genome Browser was created by the <a href="staff.html">Genome Bioinformatics 
+Group</a> of UC Santa Cruz. Software Copyright (c) The Regents of the University of California. All 
+rights reserved. The software is made available with the following conditions:</p>
 	<ul>
-		<li>Genome sequence data use restrictions are noted within the species sections on the <a href="goldenPath/credits.html">Credits</a> page.</li>
-		<li>Some annotation tracks contributed by external collaborators contain proprietary data that have specific use restrictions. To check for restrictions associated with a particular genome assembly, review the <em>database/README.txt</em> file in the assembly's <a href="http://hgdownload.cse.ucsc.edu/downloads.html">downloads</a> directory.</li>
+	    <li>The Genome Browser and Blat software are free for academic, nonprofit, and personal
+use. A <a href="license.html">license</a> is required for commercial use. 
+	    <li>Please <a href="cite.html">cite</a> us if you use the Genome Browser software or 
+data in a publication or web page.</li>
+            <li>Program-driven use of this software is limited to a maximum of one hit every 15 
+seconds and no more than 5,000 hits per day.</li>
         </ul>
 
-	<p>The UCSC, Ensembl, and NCBI browser and annotation groups have established a common set of minimum requirements for public display of genome data made available after Spring 2009, described in the <a target="_blank" href="http://www.ncbi.nlm.nih.gov/projects/mapview/static/app_help/Browser_Genome_Release_Agreement.html">Browser Genome Release Agreement</a>.</p>
-                    
-    <p>The Genome Browser and Blat software are free for academic, nonprofit, and personal use. A license is required for commercial use. See the <a href="license/">Licenses</a> page for more information.</p>
+	<p>The sequence and annotation data displayed in the Genome Browser are freely available for
+any use with the following conditions:</p>
+	<ul>
+	    <li>Usage restrictions for genome sequence data are noted within the species sections on
+the <a href="goldenPath/credits.html">Credits</a> page.</li>
+	    <li>Some annotation tracks contributed by external collaborators contain data that have 
+specific use restrictions. To check for restrictions associated with a particular annotation data 
+set, review the Genome Browser description page associated with the track. (To display the 
+description page, click on the track's name in the section below the Genome Browser tracks image.) 
+</li>
+	    <li>Please credit the data contributor when using Genome Browser data in a publication 
+or web page. In most cases, this information can be found on the 
+<a href="goldenPath/credits.html">Credits</a> page (for genome assemblies) or in the 
+&quot;Credits&quot; section on the track description page (for annotation tracks).</li>
+	</ul>
 	
-    <p>Program-driven use of this software is limited to a maximum of one hit every 15 seconds and no more than 5,000 hits per day.</p>
+<!-- This doesn't belong here...move to FAQ?
+	<p>The UCSC, Ensembl, and NCBI browser and annotation groups have established a common set 
+of minimum requirements for public display of genome data made available after Spring 2009, 
+described in the <a target="_blank" 
+href="http://www.ncbi.nlm.nih.gov/projects/mapview/static/app_help/Browser_Genome_Release_Agreement.html">Browser Genome Release Agreement</a>.</p>
+-->
 
-    <p>For assistance with questions or problems regarding the UCSC Genome Browser software, database, genome assemblies, or release cycles, see the <a href="FAQ/FAQmaillist.html">FAQ</a>.</p>
+        <p>For assistance with questions or problems regarding the UCSC Genome Browser software, 
+database, genome assemblies, or release cycles, click <a href="contacts.html">here</a>.</p>
       
     </div><!-- .sectionContent --> 
 </div><!-- .section -->
 
 </div><!-- .content -->
 </body>
 </html>