I've given up on the merge commit messages. I merged master into a branch, OK?

WasabiFan · WasabiFan · commit 7e0b1783f357 · 2016-01-08T19:44:06.000-08:00
diff --git a/docs/kernel-hackers-notebook/ev3-pru.md b/docs/kernel-hackers-notebook/ev3-pru.md
@@ -3,8 +3,10 @@ title: EV3 PRU
 subtitle: Programmable Runtime Unit
 ---
 
-The [AM1808 SoC](../ev3-processor) has 2 [Independent Programmable Realtime
-Unit](http://processors.wiki.ti.com/index.php/Programmable_Realtime_Unit_Subsystem) (PRU) Cores.
+The [AM1808 SoC](../ev3-processor) has 2 [Independent Programmable Realtime Unit]
+(PRU) Cores.
+
+[Independent Programmable Realtime Unit]: http://processors.wiki.ti.com/index.php/Programmable_Realtime_Unit_Subsystem
 
 ## Usage
 
@@ -18,16 +20,28 @@ __PRU1__: Not used.
 
 ## Firmware
 
-The PRU requires firmware to implement the UART interfaces. We are using the firmware from LEGO (distributed in the [ev3dev-uart](package-ev3dev-uart) package).
+The PRU requires firmware to implement the UART interfaces. We are using the
+firmware from LEGO (distributed in the [firmware-ev3] package).
 
     /lib/firmware/PRU_SUART.bin
 
+[firmware-ev3]: https://github.com/ev3dev/firmware-ev3
+
 ## Device Driver
 
 ### Origin
 
-The device driver originally comes from TI and was ported from LMS2012. LMS2012 had 2 copies of this driver, one in the [linux kernel source](https://github.com/mindboards/ev3sources/tree/master/extra/linux-03.20.00.13/pru-firmware-05-31-2011-1423-v3.0) and one in the [LMS2012 source](https://github.com/mindboards/ev3sources/tree/master/lms2012/d_uart/Linuxmod_AM1808/pru-firmware-05-31-2011-1423-v3.0). We are using the one from the kernel. The one in the LSM2012 section has been modified by LEGO to work with their d_uart.c driver.
+The device driver originally comes from TI and was ported from LMS2012. LMS2012
+had 2 copies of this driver, one in the [linux kernel source] and one in the
+[LMS2012 source]. We are using the one from the kernel. The one in the LSM2012
+section has been modified by LEGO to work with their d_uart.c driver.
+
+[linux kernel source]: https://github.com/mindboards/ev3sources/tree/master/extra/linux-03.20.00.13/pru-firmware-05-31-2011-1423-v3.0
+[LMS2012 source]: https://github.com/mindboards/ev3sources/tree/master/lms2012/d_uart/Linuxmod_AM1808/pru-firmware-05-31-2011-1423-v3.0
 
 ### ev3dev Implementation
 
-Only slight modifications were made to this driver to get it to work with the 3.16 kernel. Code is [here](https://github.com/ev3dev/ev3dev-kernel/tree/uart-sensors/drivers/tty/serial/omapl_pru).
+Only slight modifications were made to this driver to get it to work with the
+3.16 kernel. Code is [here][source code].
+
+[source code]: https://github.com/ev3dev/ev3-kernel/tree/ev3dev-jessie/drivers/tty/serial/omapl_pru
diff --git a/docs/tutorials/using-brickstrap-to-cross-compile.md b/docs/tutorials/using-brickstrap-to-cross-compile.md
@@ -145,7 +145,7 @@ filesystem of your host computer on the EV3.
 You have a couple of options to do this:
 
 * [Use nfs](https://github.com/mindboards/ev3dev/wiki/Set-Up-An-nfs-FileShare)
-* [Use sshfs]()
+* [Use sshfs] TOTO: find link or write tutorial.
 
 Both of these options essentially do the same thing, just using a different
 network protocol. They make files that physically exist on your host computer
diff --git a/publish.rb b/publish.rb
@@ -17,8 +17,8 @@
 # --test '<command>' will run <command> in a shell and return the result. The
 # working directory will be a temporary directory containing the fixed up files.
 #
-# Use BASENAME environment variable to override basename. Use "@TMP@" as a
-# placeholder for the temporary directory that is created.
+# Use BASENAME environment variable to override basename. Use "@FULL_PATH@" as a
+# placeholder for the full path to the temporary directory that is created.
 
 require 'tmpdir'
 
@@ -32,7 +32,7 @@
     Dir.chdir tmp
     system "git init"
 
-    if ARGV[0] != "--test"
+    unless ARGV.include? "--test"
         git_url = ARGV[0]
         if not git_url.include? "/"
             git_url = "git@github.com:#{ARGV[0]}/ev3dev.github.io.git"
@@ -53,7 +53,7 @@
 
     # prepend ev3dev.github.io to all root-relative urls
     basename = ENV['BASENAME'] || "/ev3dev.github.io"
-    basename = basename.gsub(/@TMP@/, tmp)
+    basename = basename.gsub(/@FULL_PATH@/, tmp)
     system "git add ."
     file_names = `git ls-files | grep '.html$'`
     file_names.each_line do |file_name|
