Permalink
Browse files

Make web pages non-LLNL-centric

Update web page header and footer to be generic (not LLNL-centric) and
add generic disclaimer web page.
  • Loading branch information...
1 parent 4647d54 commit c9c48859619f9cfba9a5b3d70bc969e16d62761d @jette jette committed Jun 27, 2011
Showing with 99 additions and 24 deletions.
  1. +4 −4 COPYING
  2. +1 −0 doc/html/Makefile.am
  3. +1 −0 doc/html/Makefile.in
  4. +90 −0 doc/html/disclaimer.shtml
  5. +3 −20 doc/html/footer.txt
  6. BIN doc/html/slurm_banner.gif
View
8 COPYING
@@ -45,7 +45,7 @@ advertising or product endorsement purposes.
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -211,7 +211,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -268,7 +268,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -321,7 +321,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
View
1 doc/html/Makefile.am
@@ -53,6 +53,7 @@ generated_html = \
cpu_management.html \
cray.html \
crypto_plugins.html \
+ disclaimer.html \
dist_plane.html \
documentation.html \
download.html \
View
1 doc/html/Makefile.in
@@ -352,6 +352,7 @@ generated_html = \
cpu_management.html \
cray.html \
crypto_plugins.html \
+ disclaimer.html \
dist_plane.html \
documentation.html \
download.html \
View
90 doc/html/disclaimer.shtml
@@ -0,0 +1,90 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Legal Notices</h1>
+
+<p>SLURM is free software; you can redistribute it and/or modify it under
+the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General
+Public License</a> as published by the <a href="http://fsf/org/">Free
+Software Foundation</a>; either version 2 of the License, or (at your option)
+any later version.</p>
+
+<p>SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the <a href="//www.gnu.org/licenses/gpl.html">
+GNU General Public License</a> for more details.</p>
+
+<h1>NO WARRANTY</h1>
+<p>The following is an excerpt from the GNU General Public License.</p>
+
+<p>BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.</p>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.</p>
+
+<h1>Copyrights</h1>
+
+<p>SLURM represents the collaborative efforts of roughly 100 people representing
+roughtly 40 different organizations world-wide. A current list of contributors
+can be found at the <a href="team.html">SLURM Team</a> web page.</p>
+
+<p>While many organizations contributed code and/or documentation without
+including a copyright notice, the following copyright notices are found in
+SLURM's code and documenation files:<br>
+Copyright (C) 2011 Trinity Centre for High Performance Computing<br>
+Copyright (C) 2010-2011 SchedMD LLC<br>
+Copyright (C) 2009 CEA/DAM/DIF<br>
+Copyright (C) 2009-2011 Centro Svizzero di Calcolo Scientifico (CSCS)<br>
+Copyright (C) 2008-2011 Lawrence Livermore National Security<br>
+Copyright (C) 2008 Vijay Ramasubramanian<br>
+Copyright (C) 2007-2008 Red Hat, Inc.<br>
+Copyright (C) 2007-2009 National University of Defense Technology, China<br>
+Copyright (C) 2007-2011 Bull<br>
+Copyright (C) 2005-2008 Hewlett-Packard Development Company, L.P.<br>
+Copyright (C) 2004-2009, Marcus Holland-Moritz<br>
+Copyright (C) 2002-2007 The Regents of the University of California<br>
+Copyright (C) 2002-2003 Linux NetworX<br>
+Copyright (C) 2002 University of Chicago<br>
+Copyright (C) 2001 Paul Marquess<br>
+Copyright (C) 2000 Markus Friedl<br>
+Copyright (C) 1999 Kenneth Albanowski<br>
+Copyright (C) 1998 Todd C. Miller <Todd.Miller@courtesan.com><br>
+Copyright (C) 1996-2003 Maximum Entropy Data Consultants Ltd,<br>
+Copyright (C) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland<br>
+Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.</p>
+
+<p>Much of the work was performed under the auspices of the U.S. Department of
+Energy by Lawrence Livermore National Laboratory under Contract DE-AC52-07NA27344.
+This work was sponsored by an agency of the United States government.
+Neither the United States Government nor Lawrence Livermore National
+Security, LLC, nor any of their employees, makes any warranty, express
+or implied, or assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or
+process disclosed, or represents that its use would not infringe privately
+owned rights. References herein to any specific commercial products, process,
+or services by trade names, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or the Lawrence Livermore National
+Security, LLC. The views and opinions of authors expressed herein do not
+necessarily state or reflect those of the United States government or
+Lawrence Livermore National Security, LLC, and shall not be used for
+advertising or product endorsement purposes.</p>
+
+<p style="text-align: center;">Last modified 27 June 2010</p>
+
+<!--#include virtual="footer.txt"-->
+
View
23 doc/html/footer.txt
@@ -1,32 +1,15 @@
</div> <!-- closes "content" -->
<div id="footer">
-<div id="left">&nbsp;&nbsp;<span class="ucrlnum">LLNL-WEB-411573 |</span> <a href="https://www.llnl.gov/disclaimer.html" target="_blank" class="privacy">Privacy &amp; Legal Notice</a></div>
-<div id="right"><span class="ucrlnum">18 July 2008&nbsp;&nbsp;</span></div>
+<div id="left">&nbsp;&nbsp;<a href="disclaimer.html" target="_blank" class="privacy">Legal Notices</a></div>
+<div id="right"><span class="ucrlnum">27 June 2011&nbsp;&nbsp;</span></div>
</div>
<div id="footer2">
-<div id="left2"><img src="sponsors.gif" width="129" height="30" border="0" usemap="#Map2"></div>
-<div id="center2"><a href="https://www.llnl.gov/" target="_blank" class="footer">Lawrence Livermore National Laboratory</a><br />
-<span class="smalltextblue">7000 East Avenue &#8226; Livermore, CA 94550</span></div>
-<div id="right2"><span class="smalltextblue">Operated by
-Lawrence Livermore National Security, LLC, for the</span>
-<a href="http://www.energy.gov/" target="_blank" class="footer">
-Department of Energy's</a><br />
-<a href="http://www.nnsa.doe.gov/" target="_blank" class="footer">
-National Nuclear Security Administration</a></div>
<div style="clear:both;"></div>
</div>
-</div> <!-- closes "container" -->
-
-<map name="Map">
-<area shape="rect" coords="571,1,799,15" href="https://www.llnl.gov/">
-</map>
-<map name="Map2">
-<area shape="rect" coords="1,1,92,30" href="http://www.nnsa.doe.gov/" target="_blank" alt="NNSA logo links to the NNSA Web site">
-<area shape="rect" coords="98,1,132,30" href="http://www.energy.gov/" target="_blank" alt="Department of Energy logo links to the DOE Web site">
-</map>
+</div>
</body>
</html>
View
BIN doc/html/slurm_banner.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c9c4885

Please sign in to comment.