diff --git a/docs/pages/docs/Dart API/manager.md b/docs/pages/docs/Dart API/manager.md
index 022143f7f..c8127ddbf 100644
--- a/docs/pages/docs/Dart API/manager.md	
+++ b/docs/pages/docs/Dart API/manager.md	
@@ -5,7 +5,7 @@ data:
   weight: 1
 
 template: layouts/docs/single
-path: /docs/getting-started/manager/
+path: /docs/manager/
 ---
 
 {% assign snippets = 'package:drift_docs/snippets/dart_api/manager.dart.excerpt.json' | readString | json_decode %}
diff --git a/docs/pages/docs/setup.md b/docs/pages/docs/setup.md
index d1660c91c..3f0672364 100644
--- a/docs/pages/docs/setup.md
+++ b/docs/pages/docs/setup.md
@@ -120,6 +120,9 @@ started with drift:
 
 - [Dart tables]({{ 'Dart API/tables.md' | pageUrl }}): This page describes how to write your own
   Dart tables and which classes drift generates for them.
+- For new drift users or users not familiar with SQL, the [manager]({{ 'Dart API/manager.md' | pageUrl }}) APIs
+  for tables allows writing most queries with a syntax you're likely familiar with from ORMs or other
+  packages.
 - Writing queries: Drift-generated classes support writing the most common SQL statements, like
   [selects]({{ 'Dart API/select.md' | pageUrl }}) or [inserts, updates and deletes]({{ 'Dart API/writes.md' | pageUrl }}).
 - Something to keep in mind for later: When changing the database, for instance by adding new columns
diff --git a/drift/CHANGELOG.md b/drift/CHANGELOG.md
index 3bc2d499c..4638a5cec 100644
--- a/drift/CHANGELOG.md
+++ b/drift/CHANGELOG.md
@@ -1,8 +1,10 @@
-## 2.18.0-dev
+## 2.18.0
 
 - Adds a new interface for writing most simple statements without manually creating
   select statements and expressions.
-  For a detailed description, see the [documentation website](https://drift.simonbinder.eu/docs/getting-started/manager/).
+  For a detailed description, see the [documentation website](https://drift.simonbinder.eu/docs/manager/).
+  This feature requires additional code to be generated - if you prefer using the existing APIs
+  exclusively, you can use the [`generate_manager: false` builder option](https://drift.simonbinder.eu/docs/advanced-features/builder_options/)
 - Add `AggregateFunctionExpression` to write custom [aggregate function](https://www.sqlite.org/lang_aggfunc.html)
   invocations in the Dart query builder.
 - The `json_group_array` and `jsonb_group_array` functions now contain an `orderBy`
diff --git a/drift/lib/src/runtime/manager/manager.dart b/drift/lib/src/runtime/manager/manager.dart
index 4edf9abf3..c81f153ed 100644
--- a/drift/lib/src/runtime/manager/manager.dart
+++ b/drift/lib/src/runtime/manager/manager.dart
@@ -405,7 +405,7 @@ abstract class BaseTableManager<
   Stream<DT> watchSingle() =>
       $state.copyWith(distinct: true).buildSelectStatement().watchSingle();
 
-  /// Executes the statement and returns the first all rows as a list.
+  /// Executes the statement and returns all rows as a list.
   ///
   /// Use [limit] and [offset] to limit the number of rows returned
   /// An offset will only be applied if a limit is also set
diff --git a/drift/pubspec.yaml b/drift/pubspec.yaml
index 2e5422f24..a1e04983f 100644
--- a/drift/pubspec.yaml
+++ b/drift/pubspec.yaml
@@ -1,6 +1,6 @@
 name: drift
 description: Drift is a reactive library to store relational data in Dart and Flutter applications.
-version: 2.18.0-dev
+version: 2.18.0
 repository: https://github.com/simolus3/drift
 homepage: https://drift.simonbinder.eu/
 issue_tracker: https://github.com/simolus3/drift/issues
diff --git a/drift_dev/CHANGELOG.md b/drift_dev/CHANGELOG.md
index 59efbceea..66af58ed2 100644
--- a/drift_dev/CHANGELOG.md
+++ b/drift_dev/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.18.0-dev
+## 2.18.0
 
 - Add support for the `geopoly` extension in drift files.
 - Improve finding the correct import alias in generated code for part files.
diff --git a/drift_dev/pubspec.yaml b/drift_dev/pubspec.yaml
index 1fcc64bd1..fbc5e9b99 100644
--- a/drift_dev/pubspec.yaml
+++ b/drift_dev/pubspec.yaml
@@ -1,6 +1,6 @@
 name: drift_dev
 description: Dev-dependency for users of drift. Contains the generator and development tools.
-version: 2.18.0-dev
+version: 2.18.0
 repository: https://github.com/simolus3/drift
 homepage: https://drift.simonbinder.eu/
 issue_tracker: https://github.com/simolus3/drift/issues
@@ -30,7 +30,7 @@ dependencies:
   io: ^1.0.3
 
   # Drift-specific analysis and apis
-  drift: '>=2.18.0-dev <2.18.0'
+  drift: '>=2.18.0 <2.19.0'
   sqlite3: '>=0.1.6 <3.0.0'
   sqlparser: '^0.36.0'
 
diff --git a/sqlparser/CHANGELOG.md b/sqlparser/CHANGELOG.md
index 015b8210c..92cddc3bb 100644
--- a/sqlparser/CHANGELOG.md
+++ b/sqlparser/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.36.0-dev
+## 0.36.0
 
 - Add support for the geopoly module.
 
diff --git a/sqlparser/pubspec.yaml b/sqlparser/pubspec.yaml
index ffaa4b875..e0086b644 100644
--- a/sqlparser/pubspec.yaml
+++ b/sqlparser/pubspec.yaml
@@ -1,6 +1,6 @@
 name: sqlparser
 description: Parses sqlite statements and performs static analysis on them
-version: 0.36.0-dev
+version: 0.36.0
 homepage: https://github.com/simolus3/drift/tree/develop/sqlparser
 repository: https://github.com/simolus3/drift
 #homepage: https://drift.simonbinder.eu/