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/indexInfo.html src/hg/htdocs/indexInfo.html index 49e68bb..42ed214 100755 --- src/hg/htdocs/indexInfo.html +++ src/hg/htdocs/indexInfo.html @@ -1,78 +1,36 @@ <!-- Conditions of Use 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%"><TR><TD> <A NAME="Conditions"></A><FONT SIZE="4"><B> Conditions of Use</B></FONT> </TD></TR></TABLE> <TABLE BGCOLOR="#fffee8" WIDTH="100%" CELLPADDING=0> <TR><TH HEIGHT=3></TH></TR> <TR><TD WIDTH=10></TD><TD> <P> - The sequence and annotation data displayed in the Genome Browser - are freely available for any use - with the following conditions: - <UL> - <LI>Genome sequence data use restrictions are noted within the - species sections on the <A HREF="goldenPath/credits.html">Credits</A> - page. - <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 - downloads directory. - </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 - <A HREF ="http://www.ncbi.nlm.nih.gov/projects/mapview/static/app_help/Browser_Genome_Release_Agreement.html" - TARGET=_blank>here</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. + The Genome Browser software, sequence and annotation data are freely available + for use with <a href="conditions.html">these conditions</a>. + A <a href="license">license</a> is required for commercial use of the software. + 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> 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> - 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>. + 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. </TD><TD WIDTH=15> </TD></TR></TABLE> <BR></TD></TR></TABLE> </TD></TR></TABLE> <BR> -<!-- Technical Information 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%"> - <TR><TD> - - <FONT SIZE="4" ><A name="Tech"></A><B> Technical Information About the Assembled Sequence</B></FONT> - </TD></TR></TABLE> - <TABLE BGCOLOR="#fffee8" WIDTH="100%" CELLPADDING=0> - <TR><TH HEIGHT=3></TH></TR> - <TR><TD> - <UL> - <LI><A HREF="goldenPath/gbdDescriptions.html"><FONT SIZE="4">Description of the annotation database</FONT></A> - <LI><A HREF="goldenPath/datorg.html"><FONT SIZE="4">Data organization and format</FONT></A> - <LI><A HREF="goldenPath/term.html"><FONT SIZE="4">Terminology</FONT></A> - </UL> - </TD> - <TD WIDTH=15> </TD> - </TR></TABLE> ---> <BR></TD></TR></TABLE> </TD></TR></TABLE>