manual merge residue

Cargo.toml

@@ -52,7 +52,7 @@ layout-rs          = { version = "^0.1" }
 mqtt               = { version = "^0.23.0", package = "rumqttc", default-features = false }
 non-empty-vec      = { version = "^0.2", features = ["serde"]}
 percent-encoding   = "^2.3"
-roto               = { version = "^0.1.0", git = "https://github.com/NLnetLabs/roto.git", branch = "compose-messages-ng" }
+roto               = { version = "^0.1", git = "https://github.com/NLnetLabs/roto.git", branch = "main" }
 # roto               = { path = "../roto" }
 rotonda-store      = { version = "^0.3.0-pre.3", git = "https://github.com/NLnetLabs/rotonda-store.git", branch = "compose-messages-ng" }
 # rotonda-store      = { path = "../rotonda-store" }

README.md

@@ -1,10 +1,25 @@
 # Rotonda
 
-Roll your own BGP application with Rotonda. 
+<img align="right" src="doc/manual/source/resources/rotonda-illustrative-icon.png" height="150">
 
-This repository contains the units and the configurations to create a high-performance BGP application.
+Roll your own BGP application with Rotonda. 
 
-Other parts of `Rotonda` are the lock-free, concurrent read/write prefix store [`rotonda-store`](https://github.com/NLnetLabs/rotonda-store) and the filter & query language [`roto`](https://github.com/NLnetLabs/roto). `Rotonda` draws heavily upon the BGP/BMP packet parsing functionality of the library called [`routecore`](https://github.com/NLnetLabs/routecore).
+BGP services that you will be able to build with Rotonda include, but are not
+limited to, a route monitor, a route collector, a route server, or a route reflector.
+
+Rotonda is and always
+will be free, open-source software.
+
+>### ROTONDA IS CURRENTLY IN ALPHA, DO NOT USE IN PRODUCTION
+>
+> Rotonda is being actively worked on and this repository and all the packages
+> we supply are still in ALPHA stage. Use it to experiment freely (we value your
+> feedback!), but do not use it with data and data-streams you cannot afford
+> to lose.
+>
+> You should also be aware that all the APIs, configuration and the `roto`
+> syntax and grammar are still (highly) unstable.
+>
 
 ### ROADMAP