From 36a61469e479725c535e1d4164971f0c07126ab5 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 3 Nov 2021 03:48:23 +0000
Subject: [PATCH] add changelog

---
 actix-server/CHANGES.md | 5 +++++
 actix-server/src/lib.rs | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index 83aeecd4..913a48e0 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -1,11 +1,16 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+* Server can be started in regular Tokio runtime. [#408]
+* Expose new `Server` type whose `Future` impl resolves when server stops. [#408]
 * Rename `Server` to `ServerHandle`. [#407]
+* Add `Server::handle` to obtain handle to server. [#408]
 * Rename `ServerBuilder::{maxconn => max_concurrent_connections}`. [#407]
+* Deprecate crate-level `new` shortcut for server builder. [#408]
 * Minimum supported Rust version (MSRV) is now 1.52.
 
 [#407]: https://github.com/actix/actix-net/pull/407
+[#408]: https://github.com/actix/actix-net/pull/408
 
 
 ## 2.0.0-beta.6 - 2021-10-11
diff --git a/actix-server/src/lib.rs b/actix-server/src/lib.rs
index 7862b810..86db82d2 100644
--- a/actix-server/src/lib.rs
+++ b/actix-server/src/lib.rs
@@ -23,3 +23,10 @@ pub use self::test_server::TestServer;
 
 #[doc(hidden)]
 pub use self::socket::FromStream;
+
+/// Start server building process
+#[doc(hidden)]
+#[deprecated(since = "2.0.0", note = "Use `Server::build()`.")]
+pub fn new() -> ServerBuilder {
+    ServerBuilder::default()
+}