From 51339ecb1d34046de2fa330364524b0432cdc7d1 Mon Sep 17 00:00:00 2001
From: kyren <kerriganw@gmail.com>
Date: Mon, 1 Oct 2018 05:07:10 -0400
Subject: [PATCH] Some documentation and changelog fixes

---
 CHANGELOG.md | 6 ++++++
 src/error.rs | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae2c825..8a04991 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.15.1]
+- Docs and changelog fixes
+
 ## [0.15.0]
 - Implement MultiValue conversion up to 16
 - Small fix to prevent leaking on errors in metatable creation
@@ -5,6 +8,9 @@
   now split into `create_static_userdata` and `create_nonstatic_userdata`
   because there are certain limitations on `create_nonstatic_userdata` that mean
   that nonstatic is not always what you want.
+- API incompatible change: In order to support the new non-'static scoped
+  UserData, the API for UserData methods has changed, and UserDataMethods is now
+  a trait rather than a concrete type.
 - Added pkg-config feature that can be used if builtin-lua is disabled to use
   pkg-config to find lua5.3 externally (thanks @acrisci!).
 - API incompatible change: Add conversions for i128 and u128 and change the
diff --git a/src/error.rs b/src/error.rs
index 8530ff6..b447a81 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -82,7 +82,7 @@ pub enum Error {
     /// details.
     ///
     /// [`AnyUserData`]: struct.AnyUserData.html
-    /// [`UserDataMethods`]: struct.UserDataMethods.html
+    /// [`UserDataMethods`]: trait.UserDataMethods.html
     UserDataTypeMismatch,
     /// An [`AnyUserData`] immutable borrow failed because it is already borrowed mutably.
     ///
diff --git a/src/lib.rs b/src/lib.rs
index 21e8749..dbf4608 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -34,7 +34,7 @@
 //! [`ToLuaMulti`]: trait.ToLuaMulti.html
 //! [`FromLuaMulti`]: trait.FromLuaMulti.html
 //! [`UserData`]: trait.UserData.html
-//! [`UserDataMethods`]: struct.UserDataMethods.html
+//! [`UserDataMethods`]: trait.UserDataMethods.html
 
 // Deny warnings inside doc tests / examples. When this isn't present, rustdoc doesn't show *any*
 // warnings at all.