Merge pull request #248 from karlp/webserver-update

[webserver] Update urls in default data
2013-05-22 00:00:26 -07:00 · 2013-05-22 00:00:26 -07:00 · d8236f9cc1
parent 092c69b2fb 2146ee1c84
commit d8236f9cc1
3 changed files with 664 additions and 602 deletions
--- a/apps/webserver/httpd-fs/header.html
+++ b/apps/webserver/httpd-fs/header.html
@ -24,6 +24,6 @@

  <div class="contentblock">
  <p class="border-title">
-  Welcome to the <a href="http://www.sics.se/contiki/">Contiki</a> 
+  Welcome to the <a href="http://www.contiki-os.org/">Contiki</a>
  web server!
  </p>
--- a/apps/webserver/httpd-fs/index.html
+++ b/apps/webserver/httpd-fs/index.html
@ -24,14 +24,14 @@

  <div class="contentblock">
  <p class="border-title">
-  Welcome to the <a href="http://www.sics.se/contiki/">Contiki</a> 
+  Welcome to the <a href="http://www.contiki-os.org">Contiki</a>
  web server!
  </p>
 	      
 	  <p class="intro">
 	    The web pages you are watching are served by a web
 	    server running under the <a
-	    href="http://www.sics.se/contiki/">Contiki operating
+	    href="http://www.contiki-os.org">Contiki operating
 	    system</a>.
 	  </p>

--- a/apps/webserver/httpd-fsdata.c
+++ b/apps/webserver/httpd-fsdata.c