Index: /issm/trunk/doc/index.html
===================================================================
--- /issm/trunk/doc/index.html	(revision 179)
+++ /issm/trunk/doc/index.html	(revision 180)
@@ -1,38 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>ISSM: ISSM Documentation</title>
-<link href="developerguide/chtml/tabs.css" rel="stylesheet" type="text/css">
-<link href="developerguide/chtml/doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.8 -->
-<div class="navigation" id="top">
-  <div class="tabs">
-    <ul>
-      <li class="current"><a href="developerguide/chtml/index.html"><span>Main&nbsp;Page</span></a></li>
-      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-      <li><a href="developerguide/chtml/annotated.html"><span>Data&nbsp;Structures</span></a></li>
-      <li><a href="developerguide/chtml/files.html"><span>Files</span></a></li>
-    </ul>
-  </div>
-</div>
-<div class="contents">
-<h1>ISSM Documentation</h1>
-<p>
-<h3 align="center">1.0 </h3>You can find several documentations of the Ice Sheet System Model (ISSM) code:<h2><a class="anchor" name="user">
-User Guide</a></h2>
-<ul>
-<li>You can download a <a href="userguide.pdf"><b>pdf</b></a> documentation to get you started.</li></ul>
-<h2><a class="anchor" name="theory">
-Theory guide:</a></h2>
-<ul>
-<li>You can download a theory guide <a href="theoryguide.pdf"><b>here</b></a> if you want to know more about the theory of ice sheet modeling and finite element.</li></ul>
-<h2><a class="anchor" name="api">
-Developer guide:</a></h2>
-You have also a documentation for the Matlab file <a href="developerguide/matlabhtml/index.html"><b>here</b></a><p>
-<dl class="author" compact><dt><b>Authors:</b></dt><dd>Eric Larour, Helene Seroussi and Mathieu Morlighem. </dd></dl>
-</div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Mon Mar 30 16:30:43 2009 for ISSM by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<title>Ice Sheet System Model</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="author" content="Mathieu Morlighem" />
+		<meta name="copyright" content="Caltech" />
+		<meta name="description" content="ISSM website" />
+		<meta name="keywords" content="" />
+		<meta name="robots" content="all, follow" />
+		<link rel="stylesheet" href="website/doc_html/style.css" type="text/css" media="screen" />
+	</head>
+	<body>
+		<a name="top"></a>
+		<div id="header">
+			<a href="index.html"><img src="website/doc_html/headerissm.png" alt="header"></a>
+		</div>
+		<div id="page">
+			<div id="content">
+				<h1 class="article-title" title="Welcome">Welcome !</h1>
+				<p>Welcome to ISSM's website. Ice Sheet System Model is a multi-purpose finite element code dedicated to ice sheet systems modeling.
+				It includes several features such as steady-states diagnostics, control methods, thermal simulations, and more to come...</p>
+				<p>ISSM has been developed at JPL and is under Caltech copyright</p>
+
+				<h1 class="article-title" title="Website">What can you find in this Website ?</h1>
+				<p>In this website, you can:</p>
+				<ul>
+					<li>Download the code</li>
+					<li>Download the documentations</li>
+					<li>Report a bug</li>
+					<li>...</li>
+				</ul>
+
+				<h1 class="article-title" title="News">What's new ?</h1>
+				<p>A first stable version "ICE2" has been tagged. The next stable version of ISSM will be released in the coming months. It will include a serial and a parallel solver.</p>
+
+			</div>
+
+			<div id="menu">
+				<h1>Menu</h1>
+				<ul>
+					<li><a href="#" title="Home">Home</a></li>
+					<li><a href="website/doc_html/about.html" title="About us">About us</a></li>
+					<li><a href="website/doc_html/features.html" title="Features">Features</a></li>
+					<li><a href="website/doc_html/documentation.html" title="Documentation">Documentation</a></li>
+					<li><a href="website/doc_html/download.html" title="Download">Download</a></li>
+					<li><a href="website/doc_html/installation.html" title="Installation">Installation</a></li>
+					<li><a href="website/doc_html/wiki.html" title="Developers Site">Developers Site</a></li>
+					<li><a href="website/doc_html/faq.html" title="FAQ">FAQ</a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="footer"> 
+			<p style="float: left"><a href="http://www.nasa.gov"><img src="website/doc_html/logo_NASA.png" alt="Logo NASA" height=50px/></a></p>
+				Copyright &copy; 2009 Caltech
+				<p style="float: right"><a href="http://www.jpl.nasa.gov"><img src="website/doc_html/logo_JPL.png" alt="Logo JPL" height=30px/></a></p>
+			</div>
+		</body>
+	</html>
Index: /issm/trunk/doc/website/doc_c/doxygen.config
===================================================================
--- /issm/trunk/doc/website/doc_c/doxygen.config	(revision 179)
+++ /issm/trunk/doc/website/doc_c/doxygen.config	(revision 180)
@@ -608,5 +608,5 @@
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */packages/* */tests/* */examples/*
+EXCLUDE_PATTERNS       = */externalpackages/* */tests/* */examples/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
Index: /issm/trunk/doc/website/doc_html/documentation.html
===================================================================
--- /issm/trunk/doc/website/doc_html/documentation.html	(revision 179)
+++ /issm/trunk/doc/website/doc_html/documentation.html	(revision 180)
@@ -26,5 +26,5 @@
 				<h1 class="article-title" title="developer Guide">Developer Guide</h1>
 				<p>ISSM is hosted on Matlab coded in C, C++. Here are the corresponding documentation:</p>
-				<li><a href="../doc_m/matlabhtml/ice1/menu.html" title="Mhtml"><u>Matlab code documentation</u></a></li>
+				<li><a href="../doc_m/matlabhtml/trunk/menu.html" title="Mhtml"><u>Matlab code documentation</u></a></li>
 				<li><a href="../doc_c/chtml/index.html" title="Chtml"><u>C  and C++ code documentation</u></a></li>
 			</div>
Index: /issm/trunk/doc/website/doc_m/creatematlabhtmldoc.sh
===================================================================
--- /issm/trunk/doc/website/doc_m/creatematlabhtmldoc.sh	(revision 179)
+++ /issm/trunk/doc/website/doc_m/creatematlabhtmldoc.sh	(revision 180)
@@ -5,5 +5,5 @@
 
 #copy issm_template in m2html
-cd "$ISSM_DIR/packages/m2html/install/templates"
+cd "$ISSM_DIR/externalpackages/m2html/install/templates"
 ln -s "$ISSM_DIR/doc/website/doc_m/template_issm" ./template_issm
 
@@ -13,10 +13,13 @@
 #launch matlab
 matlab -nodisplay << EOF
-%get ISSM_DIR, brief name
-[status,ISSM_DIR_BRIEF]=system('basename `pwd`');
-ISSM_DIR_BRIEF=ISSM_DIR_BRIEF(1:end-1); %skip the \n character
-if status~=0 | isempty(ISSM_DIR_BRIEF) | length(ISSM_DIR_BRIEF)==1,
-	error('startup error message: could not retrieve ISSM_DIR brief name');
+	%get ISSM_DIR, brief name
+	[status,ISSM_DIR_BRIEF]=system('basename `pwd`');
+	ISSM_DIR_BRIEF=ISSM_DIR_BRIEF(1:end-1); %skip the \n character
+	if status~=0 | isempty(ISSM_DIR_BRIEF) | length(ISSM_DIR_BRIEF)==1,
+		error('startup error message: could not retrieve ISSM_DIR brief name');
 	end
+
+	%Add m2html in path
+	addpath(genpath_ice([ISSM_DIR '/externalpackages/m2html/install']));
 
 	cd ../
@@ -31,3 +34,3 @@
 
 #remove soft link
-rm "$ISSM_DIR/packages/m2html/install/templates/template_issm"
+rm "$ISSM_DIR/externalpackages/m2html/install/templates/template_issm"
