Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/linkgraph/demands.h

@@ -26,7 +26,7 @@ private:
 };
 
 /**
- * Stateless, thread safe demand hander. Doesn't do anything but call DemandCalculator.
+ * Stateless, thread safe demand handler. Doesn't do anything but call DemandCalculator.
  */
 class DemandHandler : public ComponentHandler {
 public:

src/linkgraph/init.h

@@ -6,7 +6,7 @@
 #include "linkgraphjob_base.h"
 
 /**
- * Stateless, thread safe initialization hander. Initializes node and edge
+ * Stateless, thread safe initialization handler. Initializes node and edge
  * annotations.
  */
 class InitHandler : public ComponentHandler {

src/linkgraph/linkgraphjob.h

@@ -457,7 +457,7 @@ public:
 protected:
 
 	/**
-	 * Some boundaries to clamp agains in order to avoid integer overflows.
+	 * Some boundaries to clamp against in order to avoid integer overflows.
 	 */
 	enum PathCapacityBoundaries {
 		PATH_CAP_MULTIPLIER = 16,

src/linkgraph/refresh.cpp

@@ -280,7 +280,7 @@ void LinkRefresher::RefreshStats(const Order *cur, const Order *next)
 /**
  * Iterate over orders starting at \a cur and \a next and refresh links
  * associated with them. \a cur and \a next can be equal. If they're not they
- * must be "neigbours" in their order list, which means \a next must be directly
+ * must be "neighbours" in their order list, which means \a next must be directly
  * reachable from \a cur without passing any further OT_GOTO_STATION or
  * OT_IMPLICIT orders in between.
  * @param cur Current order being evaluated.