Merge remote-tracking branch 'origin/swift-4.0-branch' into stable
Docs: drop minor version
diff --git a/docs/conf.py b/docs/conf.py
index 4683ca5..9cf8d37 100644
@@ -49,9 +49,9 @@
# built documents.
# The short X.Y version.
-version = '4.0'
+version = '4'
# The full version, including alpha/beta/rc tags.
-release = '4.0'
+release = '4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.