15 files changed, 19 insertions, 5 deletions

diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md
index 05578c7..55352aa 100644
--- a/docs/markdown/Builtin-options.md
+++ b/docs/markdown/Builtin-options.md
@@ -36,7 +36,7 @@ Installation options are all relative to the prefix, except:
 | sysconfdir                           | etc           | Sysconf data directory |
 | localstatedir                        | var           | Localstate data directory |
 | sharedstatedir                       | com           | Architecture-independent data directory |
-| werror                               | false         | Treat warnings as erros |
+| werror                               | false         | Treat warnings as errors |
 | warnlevel {1, 2, 3}                  | 1             | Set the warning level. From 1 = lowest to 3 = highest |
 | layout {mirror,flat}                 | mirror        | Build directory layout. |
 | default-library {shared, static, both} | shared       | Default library type. |
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 907ceda..b616d3e 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -1094,7 +1094,7 @@ Project supports the following keyword arguments.
     `meson.project_license()`.
 
   - `meson_version` takes a string describing which Meson version the
-    project requires. Usually something like `>0.28.0`.
+    project requires. Usually something like `>=0.28.0`.
 
   - `subproject_dir` specifies the top level directory name that holds
     Meson subprojects. This is only meant as a compatibility option
diff --git a/docs/images/buildtime.png b/docs/markdown/images/buildtime.png
index 2a44422..2a44422 100644
--- a/docs/images/buildtime.png
+++ b/docs/markdown/images/buildtime.png
diff --git a/docs/images/conftime.png b/docs/markdown/images/conftime.png
index 63754db..63754db 100644
--- a/docs/images/conftime.png
+++ b/docs/markdown/images/conftime.png
diff --git a/docs/images/emptytime.png b/docs/markdown/images/emptytime.png
index d80eab9..d80eab9 100644
--- a/docs/images/emptytime.png
+++ b/docs/markdown/images/emptytime.png
diff --git a/docs/images/glib_build.png b/docs/markdown/images/glib_build.png
index ddb9947..ddb9947 100644
--- a/docs/images/glib_build.png
+++ b/docs/markdown/images/glib_build.png
diff --git a/docs/images/glib_conf.png b/docs/markdown/images/glib_conf.png
index 5de60d5..5de60d5 100644
--- a/docs/images/glib_conf.png
+++ b/docs/markdown/images/glib_conf.png
diff --git a/docs/images/glib_empty.png b/docs/markdown/images/glib_empty.png
index 5976e7f..5976e7f 100644
--- a/docs/images/glib_empty.png
+++ b/docs/markdown/images/glib_empty.png
diff --git a/docs/images/glib_link.png b/docs/markdown/images/glib_link.png
index 23d9044..23d9044 100644
--- a/docs/images/glib_link.png
+++ b/docs/markdown/images/glib_link.png
diff --git a/docs/images/gtksample.png b/docs/markdown/images/gtksample.png
index b6557c4..b6557c4 100644
--- a/docs/images/gtksample.png
+++ b/docs/markdown/images/gtksample.png
diff --git a/docs/images/py3-install-1.png b/docs/markdown/images/py3-install-1.png
index 74f0819..74f0819 100644
--- a/docs/images/py3-install-1.png
+++ b/docs/markdown/images/py3-install-1.png
diff --git a/docs/images/py3-install-2.png b/docs/markdown/images/py3-install-2.png
index 9a8f1fe..9a8f1fe 100644
--- a/docs/images/py3-install-2.png
+++ b/docs/markdown/images/py3-install-2.png
diff --git a/docs/images/py3-install-3.png b/docs/markdown/images/py3-install-3.png
index b702910..b702910 100644
--- a/docs/images/py3-install-3.png
+++ b/docs/markdown/images/py3-install-3.png
diff --git a/docs/markdown/snippets/version_comparison.md b/docs/markdown/snippets/version_comparison.md
new file mode 100644
index 0000000..861a3ee
--- /dev/null
+++ b/docs/markdown/snippets/version_comparison.md
@@ -0,0 +1,15 @@
+## Version comparison
+
+`dependency(version:)` and other version constraints now handle versions
+containing non-numeric characters better, comparing versions using the rpmvercmp
+algorithm (as using the `pkg-config` autoconf macro `PKG_CHECK_MODULES` does).
+
+This is a breaking change for exact comparison constraints which rely on the
+previous comparison behaviour of extending the compared versions with `'0'`
+elements, up to the same length of `'.'`-separated elements.
+
+For example, a version of `'0.11.0'` would previously match a version constraint
+of `'==0.11'`, but no longer does, being instead considered strictly greater.
+
+Instead, use a version constraint which exactly compares with the precise
+version required, e.g. `'==0.11.0'`.
diff --git a/docs/meson.build b/docs/meson.build
index c83d5f8..32aab07 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -17,6 +17,5 @@ documentation = hotdoc.generate_doc(meson.project_name(),
 )
 
 run_target('upload',
-    command: [find_program('hotdoc'), 'run', '--conf-file', documentation.config_path(),
-              '--git-upload']
-)
\ No newline at end of file
+    command: [find_program('hotdoc'), 'run', '--conf-file', documentation.config_path()]
+)