merge

[jalview.git] / utils / help2Website.java

diff --git a/utils/help2Website.java b/utils/help2Website.java
index 6bb4dfc..e9e9ce7 100755 (executable)
--- a/utils/help2Website.java
+++ b/utils/help2Website.java
@@ -1,20 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 import java.io.*;
 import java.util.*;
@@ -76,11 +78,13 @@ public class help2Website
                                target = st.nextToken();
 
                                if(targets.get(target)!=null)
+                               {
                                        out.println("<br>"+indent+"<a href=\""
                                                        + targets.get(target)
                                                        +"\" target=bodyframe>"
                                                        +text
                                                        +"</a>");
+                               }
                                else
                                        out.println("<br>"+indent+text);
 
@@ -89,8 +93,7 @@ public class help2Website
                                        indent.append("&nbsp;&nbsp;&nbsp;");
 
                        }
-
-                       out.println("</body>\n</html>");
+                       // Add Googletracker.
 
 
                        out.close();