Merge remote-tracking branch 'upstream/master' into por

1 files changed, 3 insertions, 13 deletions

diff --git a/index.html b/index.html
index 664aa2b63..a3167c05a 100644
--- a/index.html
+++ b/index.html
@@ -4,9 +4,7 @@
 <TITLE>GF - Grammatical Framework</TITLE>
 <meta charset="UTF-8">
 <link rel="stylesheet" href="css/newstyle.css" title="GF">
-<link rel="alterante stylesheet" href="css/oldstyle.css" title="Old">
-<link rel="alternate" href="https://github.com/GrammaticalFramework/GF/" title="GF GitHub Mirror">
-<link rel="alternate" href="http://grammatical-framework.blogspot.com/" title="GF Blog">
+<link rel="alternate" href="https://github.com/GrammaticalFramework/GF/" title="GF GitHub repository">
 <meta name = "viewport" content = "width = device-width">
 <script type="text/javascript">
 function sitesearch() {
@@ -26,7 +24,6 @@ function sitesearch() {
 <img class="gflogo" src="doc/Logos/gf1.svg" alt="">
 <H1>Grammatical Framework</H1>
   <small class=tagline>A programming language for multilingual grammar applications</small>
-<!--<p>Version 3.7.1<br>Oct 2015-->
 </div>
 
 <div class=menu>
@@ -35,12 +32,10 @@ function sitesearch() {
   <h4>Use GF</h4>
   <ul>
     <li><a href="http://cloud.grammaticalframework.org/">GF Cloud<img class=right src="src/www/P/gf-cloud.png" alt="GF Cloud Service" title="GF Cloud Service"></a>
-    <li><a href="https://play.google.com/store/apps/details?id=org.grammaticalframework.ui.android">Android app</a>
     <li><A HREF="demos/index.html">Other Demos</A>
   </ul>
   <ul>
     <li><A HREF="http://www.grammaticalframework.org/download/index.html"><b>Download GF</b></A>
-    <li><a href="eclipse/index.html">GF Eclipse Plugin</a>
     <li><a href="doc/gf-editor-modes.html">GF Editor Modes</a>
   </ul>
 
@@ -48,7 +43,6 @@ function sitesearch() {
     <li><A HREF="http://groups.google.com/group/gf-dev">User Group</A>
     <li><a href="https://github.com/GrammaticalFramework/GF/issues">Bug Reports</a>
         (<a href="http://code.google.com/p/grammatical-framework/issues/list">old</a>)
-    <li><a href="http://grammatical-framework.blogspot.com/">Blog</a>
   </ul>
 </div>
 
@@ -77,12 +71,9 @@ function sitesearch() {
 <div class=links>
   <h4>Develop GF</h4>
   <ul>
-    <!--
-    <li><a href="http://ci.zjyto.net/job/GF/job/Build/"><img src="http://ci.zjyto.net/job/GF/job/Build/badge/icon" alt="GF build status"></a>
-    -->
+    <li><a href="https://travis-ci.org/GrammaticalFramework/GF"><img src="https://travis-ci.org/GrammaticalFramework/GF.svg?branch=master" alt="GF build status"></a>
     <li><a href="doc/gf-developers.html">GF Developers Guide</a>
-    <li><A HREF="https://github.com/GrammaticalFramework/GF/">GF on GitHub</A>
-    <li><A HREF="https://github.com/GrammaticalFramework/gf-contrib/">Contributions GitHub</A>
+    <li><A HREF="https://github.com/GrammaticalFramework/">GF on GitHub</A>
     <li><a href="/~hallgren/gf-experiment/browse/">Browse Source Code</a>
     <li><A HREF="doc/gf-people.html">Authors</A>
   </ul>
@@ -98,7 +89,6 @@ function sitesearch() {
   <h4>Related to GF</h4>
   <ul>
     <li><A HREF="doc/gf-bibliography.html">Publications</A>
-    <li><A HREF="http://school.grammaticalframework.org">GF Summer Schools</A>
     <li><A HREF="http://remu.grammaticalframework.org/">The REMU Project</A>
     <li><A HREF="http://www.molto-project.eu">The MOLTO Project</A>
     <li><a href="http://en.wikipedia.org/wiki/Grammatical_Framework">GF on Wikipedia</a>