From b7e05ad590f54fff2e30bddd7701e3de69fdc858 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Fri, 10 Aug 2018 14:14:31 +0800
Subject: [PATCH] mailmap

---
 .mailmap            | 3 +++
 lib/libwebsockets.h | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..b14d9d11
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Andy Green <andy@warmcat.com> <andy.green@linaro.org>
+Joakim Söderberg <joakim.soderberg@gmail.com>
+
diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index a68ec5d0..dffeb9d8 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -3090,10 +3090,6 @@ typedef int (*lws_reload_func)(void);
  *	And it marks the context to be deleted when the number of active
  *	connections into it falls to zero.
  *
- *	Otherwise if you attach the deprecated context to the replacement
- *	context when it has been created using lws_context_attach_deprecated()
- *	both any deprecated and the new context will service their connections.
- *
  *	This is aimed at allowing seamless configuration reloads.
  *
  *	The callback cb will be called after the listen sockets are actually
-- 
GitLab