diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73ea333..452d5f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
   - docker
   - test
-  
+
 docker:
   only:
     - schedules
@@ -27,7 +27,7 @@ docker:
     - rustup --version
     - rustc --version
     - cargo --version
-  
+
 
 test-stable:
   <<: *rust_test_template
@@ -35,7 +35,7 @@ test-stable:
     - cargo test --all
   variables:
     RUSTUP_TOOLCHAIN: stable
-    
+
 test-beta:
   <<: *rust_test_template
   script:
@@ -53,10 +53,10 @@ test-nightly:
 test-1.31.0:
   <<: *rust_test_template
   script:
-    - cargo test --tests 
+    - cargo test --tests
   variables:
     RUSTUP_TOOLCHAIN: nightly
-    
+
 test-fmt:
   <<: *rust_test_template
   variables:
@@ -64,5 +64,5 @@ test-fmt:
   script:
     - rustup component add rustfmt
     - cargo fmt --all -- --check
-    
+
 
diff --git a/.travis.yml b/.travis.yml
index d106776..521e86b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,4 @@ matrix:
       script: cargo test --tests # skip doctests
   allow_failures:
     - rust: nightly
-  fast_finish: true
\ No newline at end of file
+  fast_finish: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a104e4f..3a794a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [Upcoming]
+
+## The crate has been completely rewritten from scratch!
+
+## Changes (most are breaking):
+* Renamed macros:
+  * `span_error` => `abort`
+  * `call_site_error` => `abort_call_site`
+* `filter_macro_errors` was replaced by `#[proc_macro_error]` attribute.
+* `set_dummy` now takes `TokenStream` instead of `Option<TokenStream>`
+* Support for multiple errors via `emit_error` and `emit_call_site_error`
+* New `macro_error` macro for building errors in format=like style.
+* `MacroError` API had been reconsidered. It also now implements `quote::ToTokens`.
+
 # v0.2.6 (2019-09-02)
 * Introduce support for dummy implementations via `dummy::set_dummy`
 * `multi::*` is now deprecated, will be completely rewritten in v0.3
diff --git a/proc-macro-error/src/multi.rs b/proc-macro-error/src/multi.rs
index 6415fbf..d939ef7 100644
--- a/proc-macro-error/src/multi.rs
+++ b/proc-macro-error/src/multi.rs
@@ -21,6 +21,10 @@ thread_local! {
 /// of `compile_error!` invocations after the execution hits the end
 /// of the function marked with `[proc_macro_error]` or the lambda passed to [`entry_point`].
 ///
+/// # Syntax
+///
+/// The same as [`abort!`].
+///
 /// # Note:
 /// If a panic occurs somewhere in your macro no errors will be shown.
 #[macro_export]