Merge branch 'master' into master

Arachnid · web-flow · commit 2246ac20e8c9 · 2018-09-24T16:20:09.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -19,10 +19,10 @@ env:
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.2.5
+    - rvm: 2.3.0
       env: TASK='htmlproofer'
-    - rvm: 2.2.5
+    - rvm: 2.3.0
       env: TASK='htmlproofer-external'
   allow_failures:
-    - rvm: 2.2.5
+    - rvm: 2.3.0
       env: TASK='htmlproofer-external'
diff --git a/1209/5740/index.md b/1209/5740/index.md
@@ -0,0 +1,18 @@
+---
+layout: pid
+title: autopilot
+owner: ArduPilot
+license: GPLv3
+site: http://www.ardupilot.org/
+source: https://github.com/ArduPilot/
+---
+The ArduPilot project supports many open source hardware designs. We
+don't design the hardware ourselves (we are a software project), but
+we work closely with many organisations and companies that do make
+open source hardware. For those that don't have their own VID we use a
+single VID/PID pair for all boards, then distinguish boards using the
+product ID strings in the bootloader and application firmware. 
+
+Schematics for some of the boards we support are here:
+
+  https://github.com/ArduPilot/Schematics
diff --git a/org/ArduPilot/index.md b/org/ArduPilot/index.md
@@ -0,0 +1,8 @@
+---
+layout: org
+title: ArduPilot.org
+site: http://www.ardupilot.org/
+---
+ArduPilot is a leading open source autopilot system, supporting
+autonomous robots on land, air and sea
+
