Merge branch 'master' of https://github.com/esp8266/Arduino

Author: pgollor

doc/boards.md

@@ -37,7 +37,7 @@ static const uint8_t D10  = 1;
 
 If you want to use NodeMCU pin 5, use D5 for pin number, and it will be translated to 'real' GPIO pin 14.
 
-### NodeMCU 1.0 <a name="nodemcu-1-0"></a>
+### NodeMCU 1.0
 
 This module is sold under many names for around $6.50 on AliExpress and it's one of the cheapest, fully integrated ESP8266 solutions.
 
@@ -126,7 +126,7 @@ PL2303-based adapters are known not to work on Mac OS X. See https://github.com/
  - **Directly connecting a pin to VCC or GND is not a substitute for a PullUp or PullDown resistor, doing this can break upload management and the serial console, instability has also been noted in some cases.**
 
 ### ESP to Serial
-![ESP to Serial](https://raw.githubusercontent.com/esp8266/Arduino/esp8266/docs/ESP_to_serial.png)
+![ESP to Serial](ESP_to_serial.png)
 
 #### Minimal Hardware Setup for Bootloading only ##
 ESPxx Hardware
@@ -158,7 +158,7 @@ ESPxx Hardware
 | CH_PD         | PullUp   |                 |
 
 ### Minimal
-![ESP min](https://raw.githubusercontent.com/Links2004/Arduino/esp8266/docs/ESP_min.png)
+![ESP min](ESP_min.png)
 
 ### Improved Stability
-![ESP improved stability](https://raw.githubusercontent.com/Links2004/Arduino/esp8266/docs/ESP_improved_stability.png)
+![ESP improved stability](ESP_improved_stability.png)

libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h

@@ -77,10 +77,11 @@ class StaticRequestHandler : public RequestHandler {
         else if (path.endsWith(".gif")) return "image/gif";
         else if (path.endsWith(".jpg")) return "image/jpeg";
         else if (path.endsWith(".ico")) return "image/x-icon";
+        else if (path.endsWith(".svg")) return "image/svg+xml";
         else if (path.endsWith(".xml")) return "text/xml";
         else if (path.endsWith(".pdf")) return "application/pdf";
         else if (path.endsWith(".zip")) return "application/zip";
-        return "text/plain";
+        return "application/octet-stream";
     }
 
 protected:

package/build_boards_manager_package.sh

@@ -8,17 +8,17 @@ if [ -z "$REMOTE_URL" ]; then
     echo "REMOTE_URL not defined, using default"
 fi
 echo "Remote: $REMOTE_URL"
-
+pushd ..
 # Figure out how will the package be called
 ver=`git describe --tags --always`
 package_name=esp8266-$ver
 echo "Version: $ver"
 echo "Package name: $package_name"
 
 # Create directory for the package
-outdir=versions/$ver/$package_name
-srcdir=$PWD/..
-rm -rf versions/$ver
+outdir=package/versions/$ver/$package_name
+srcdir=$PWD
+rm -rf package/versions/$ver
 mkdir -p $outdir
 
 # Some files should be excluded from the package
@@ -58,7 +58,7 @@ $SED 's/tools.mkspiffs.path={runtime.platform.path}\/tools\/mkspiffs/tools.mkspi
  > $outdir/platform.txt
 
 # Zip the package
-pushd versions/$ver
+pushd package/versions/$ver
 echo "Making $package_name.zip"
 zip -qr $package_name.zip $package_name
 rm -rf $package_name
@@ -80,3 +80,4 @@ jq ".packages[0].platforms[0].version = \"$ver\" | \
     > package_esp8266com_index.json
 
 popd
+popd