Merged 1.0.5

Still missing:
- updates to WiFi lib for sam.
- updates to examples of Ehternet and WiFi for sam.

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/helpers/FileUtils.java
	app/src/processing/app/i18n/Resources_fr.po
	app/src/processing/app/i18n/Resources_fr.properties
	build/shared/revisions.txt
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
	libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
	libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
	libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
	libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
	libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
	libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
	libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino

8 files changed, 13 insertions, 13 deletions

diff --git a/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino b/libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
index e4b1d1a..e4b1d1a 100644
--- a/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
+++ b/libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
diff --git a/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino b/libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
index f8ffc07..f8ffc07 100644
--- a/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
+++ b/libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
diff --git a/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino b/libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
index 243fe83..243fe83 100644
--- a/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
+++ b/libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
diff --git a/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino b/libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
index 3dc2c8d..d500cfb 100644
--- a/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
+++ b/libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
@@ -132,8 +132,8 @@ void connectToServer() {
     Serial.println("making HTTP request...");
     // make HTTP GET request to twitter:
     client.println("GET /1/statuses/user_timeline.xml?screen_name=arduino HTTP/1.1");
-    client.println("Host:api.twitter.com");
-    client.println("Connection:close");
+    client.println("Host: api.twitter.com");
+    client.println("Connection: close");
     client.println();
   }
   // note the time of this connect attempt:
diff --git a/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino b/libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
index eb11295..eb11295 100644
--- a/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
+++ b/libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
diff --git a/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino b/libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
index 17f44a3..310ec46 100644
--- a/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
+++ b/libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
@@ -31,8 +31,8 @@ int keyIndex = 0;            // your network key Index number (needed only for W
 int status = WL_IDLE_STATUS;
 // if you don't want to use DNS (and reduce your sketch size)
 // use the numeric IP instead of the name for the server:
-IPAddress server(173,194,73,105);  // numeric IP for Google (no DNS)
-//char server[] = "www.google.com";    // name address for Google (using DNS)
+//IPAddress server(74,125,232,128);  // numeric IP for Google (no DNS)
+char server[] = "www.google.com";    // name address for Google (using DNS)
 
 // Initialize the Ethernet client library
 // with the IP address and port of the server 
@@ -54,7 +54,7 @@ void setup() {
   } 
   
   // attempt to connect to Wifi network:
-  while ( status != WL_CONNECTED) { 
+  while (status != WL_CONNECTED) { 
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     // Connect to WPA/WPA2 network. Change this line if using open or WEP network:    
@@ -72,7 +72,7 @@ void setup() {
     Serial.println("connected to server");
     // Make a HTTP request:
     client.println("GET /search?q=arduino HTTP/1.1");
-    client.println("Host:www.google.com");
+    client.println("Host: www.google.com");
     client.println("Connection: close");
     client.println();
   }
diff --git a/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino b/libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
index 96eb628..96eb628 100644
--- a/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
+++ b/libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
diff --git a/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino b/libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
index 7d7a247..de861e8 100644
--- a/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
+++ b/libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
@@ -22,7 +22,7 @@
 #include <WiFi.h>
 
 
-char ssid[] = "yourNetwork";      //  your network SSID (name) 
+char ssid[] = "yourNetwork";      // your network SSID (name) 
 char pass[] = "secretPassword";   // your network password
 int keyIndex = 0;                 // your network key Index number (needed only for WEP)
 
@@ -78,12 +78,11 @@ void loop() {
           // send a standard http response header
           client.println("HTTP/1.1 200 OK");
           client.println("Content-Type: text/html");
-          client.println("Connection: close");
+          client.println("Connection: close");  // the connection will be closed after completion of the response
+          client.println("Refresh: 5");  // refresh the page automatically every 5 sec
           client.println();
           client.println("<!DOCTYPE HTML>");
           client.println("<html>");
-          // add a meta refresh tag, so the browser pulls again every 5 seconds:
-          client.println("<meta http-equiv=\"refresh\" content=\"5\">");
           // output the value of each analog input pin
           for (int analogChannel = 0; analogChannel < 6; analogChannel++) {
             int sensorReading = analogRead(analogChannel);
@@ -108,9 +107,10 @@ void loop() {
     }
     // give the web browser time to receive the data
     delay(1);
-      // close the connection:
-      client.stop();
-      Serial.println("client disonnected");
+    
+    // close the connection:
+    client.stop();
+    Serial.println("client disonnected");
   }
 }