8143e55228a80d47bd229c02ccca5149a6878cdb
greg
  Tue Jul 3 16:59:22 2012 -0700
More changes.
diff --git src/hg/htdocs/conditions.html src/hg/htdocs/conditions.html
old mode 100644
new mode 100755
index c569f53..1dd7abf
--- src/hg/htdocs/conditions.html
+++ src/hg/htdocs/conditions.html
@@ -1,81 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 	<title>Conditions of Use - UCSC Genome Browser</title>
 	<link rel="stylesheet" href="style/HGStyle.css">
-	<style>
-	/* These styles should be added to HGStyle.css */
-	body.oldStaticPage {
-		padding: 5px;
-		background-color: rgb(255,249,210); /* #fff9d2 */
-	}
-	</style>
 </head>
 <body class="oldStaticPage">
-<div 
-
-<table border=0 cellpadding=0 cellspacing=0 width="100%">
-<tr>
-	<th colspan=2 align="left"><img src="images/title.jpg"></th>
-</tr>
-<tr>
-	<td colspan=2 height=40><!--#include virtual="../inc/topbar.html"--></td>
-</tr>
-<!-- Content Tables -----------------------------------------------------+ -->
-<tr>
-	<td colspan=2 cellpadding=10>	
-		<table bgcolor="#fffee8" width="100%" bordercolor="#888888" border=1>
-		<tr>
-			<td>
-				<table bgcolor="#D9E4F8" background="../images/hr.gif" width="100%">
-				<tr>
-					<td>
-					<font size="4"><b> &nbsp;UCSC Genome Browser Conditions of Use </b></font>
-					</td>
-				</tr>
-				</table>
-	
-				<table bgcolor="#fffee8" width="100%" cellpadding=0>
-				<th height=10></th>
-				<tr>
-					<td width=10></td>
-					<td>
-<!-- Start content -->
-
-Some content.
-
-<!-- End content -->
-	<br><br>		</td>
-					<td width=15></td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-</body>
-</html>
 
+<div class="header">
+	<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="section">
-	<div class="subheadingBar windowSize">
-	Sequences used to construct this feature
-	</div><!-- subheadingBar -->
-      <div class="subsection">
+    <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>
       
+	<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>
+	</ul>
       
-      </div><!-- class: subsection --> 
+	<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>
 
-</div>
+    <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>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>
 
+    <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>
 
+    </div><!-- .sectionContent --> 
+</div><!-- .section -->
 
+</div><!-- .content -->
+</body>
+</html>
\ No newline at end of file