diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..b14d9d1113e636235dffc52b97c4c537c2d279ce
--- /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 a68ec5d035959d83c29a4a7705679f0ecd21849b..dffeb9d816523a96df11258631d29300241c5ac7 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