From 6527b76a6702bc87229f3f557c80ab5fa8029c84 Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Wed, 3 Jun 2015 08:21:37 -0400
Subject: [PATCH] updated docs

---
 docs/docs/imaging.xml       |  1 +
 docs/docs/main_menu.xml     |  4 ++++
 docs/docs/release_notes.xml | 29 ++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/docs/docs/imaging.xml b/docs/docs/imaging.xml
index e2278276be..1c218b6678 100644
--- a/docs/docs/imaging.xml
+++ b/docs/docs/imaging.xml
@@ -2197,6 +2197,7 @@
          </description>
          <examples>
             <example>video_tracking_ex.cpp.html</example>
+            <example>correlation_tracker.py.html</example>
          </examples>
                                  
       </component>
diff --git a/docs/docs/main_menu.xml b/docs/docs/main_menu.xml
index ae55df694b..1c49f04caa 100644
--- a/docs/docs/main_menu.xml
+++ b/docs/docs/main_menu.xml
@@ -133,6 +133,10 @@
          <item nolink="true">
             <name>Examples: Python</name>
             <sub>
+               <item>
+                  <name>Video_Object_Tracking</name>
+                  <link>correlation_tracker.py.html</link>
+               </item>
                <item>
                   <name>Face_Landmark_Detection</name>
                   <link>face_landmark_detection.py.html</link>
diff --git a/docs/docs/release_notes.xml b/docs/docs/release_notes.xml
index 2ac7b7dbf9..d532c15f9d 100644
--- a/docs/docs/release_notes.xml
+++ b/docs/docs/release_notes.xml
@@ -11,6 +11,33 @@
 <!-- **************************************************************************************  -->
 
 <current>
+New Features:
+   - Added a linear model predictive control solver.  See the mpc_ex.cpp example
+     program for details.
+   - Thanks to Patrick Snape, the correlation_tracker can now be used from Python.
+      
+Non-Backwards Compatible Changes:
+   - The camera_transform's second operator() method now takes 3 arguments
+     instead of 2.  This is to allow it to output the z distance in addition to
+     scale.
+
+Bug fixes:
+   - Fixed a bug in the eigenvalue_decomposition which could occur when a
+     symmetric matrix was used along with the LAPACK bindings.
+   - Fixed a bug where the last column of data in a file wasn't loaded on some
+     OS X machines when load_libsvm_formatted_data() was called.
+
+Other:
+   - Added a hard iteration limit to a number of the SVM solvers.
+   - Adrian Rosebrock graciously setup an OS X machine for dlib testing, which
+     resulted in improved CMake python scripts on OS X machines.
+   - Improved the way overlapping points are rendered by the perspective_window.
+
+</current>
+
+<!-- **************************************************************************************  -->
+
+<old name="18.15" date="Apr 29, 2015">
 New Features:
    - Added a number of tools for working with 3D data:
       - Added the perspective_window which is a tool for displaying 3D point clouds.
@@ -37,7 +64,7 @@ Other:
    - The imglab tool now allows the user to click and drag annotations around by holding
      shift and right clicking.
 
-</current>
+</old>
 
 <!-- **************************************************************************************  -->