Merge branch '2.2.1' into 2.0

3 files changed, 17 insertions, 6 deletions

diff --git a/AUTHORS b/AUTHORS
index 27c51d150..1cc77b640 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Other contributors, listed alphabetically, are:
 * Henrique Bastos -- SVG support for graphviz extension
 * Daniel Bültmann -- todo extension
 * Marco Buttu -- doctest extension (pyversion option)
+* Nathan Damon -- bugfix in validation of static paths in html builders
 * Etienne Desautels -- apidoc module
 * Michael Droettboom -- inheritance_diagram extension
 * Charles Duffy -- original graphviz extension
diff --git a/CHANGES b/CHANGES
index 56d2e6bfe..33d5ff2b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,7 +42,7 @@ Bugs fixed
 Testing
 --------
 
-Release 2.2.1 (in development)
+Release 2.2.2 (in development)
 ==============================
 
 Dependencies
@@ -60,12 +60,20 @@ Features added
 Bugs fixed
 ----------
 
-* #6641: LaTeX: Undefined control sequence ``\sphinxmaketitle``
-* #6710: LaTeX not well configured for Greek language as main language
-
 Testing
 --------
 
+Release 2.2.1 (released Oct 26, 2019)
+=====================================
+
+Bugs fixed
+----------
+
+* #6641: LaTeX: Undefined control sequence ``\sphinxmaketitle``
+* #6710: LaTeX not well configured for Greek language as main language
+* #6759: validation of html static paths and extra paths no longer throws
+  an error if the paths are in different directories
+
 Release 2.2.0 (released Aug 19, 2019)
 =====================================
 
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index ee071ed5d..4cdd8c32e 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -1162,7 +1162,8 @@ def validate_html_extra_path(app: Sphinx, config: Config) -> None:
         if not path.exists(extra_path):
             logger.warning(__('html_extra_path entry %r does not exist'), entry)
             config.html_extra_path.remove(entry)
-        elif path.commonpath([app.outdir, extra_path]) == app.outdir:
+        elif (path.splitdrive(app.outdir)[0] == path.splitdrive(extra_path)[0] and
+              path.commonpath([app.outdir, extra_path]) == app.outdir):
             logger.warning(__('html_extra_path entry %r is placed inside outdir'), entry)
             config.html_extra_path.remove(entry)
 
@@ -1174,7 +1175,8 @@ def validate_html_static_path(app: Sphinx, config: Config) -> None:
         if not path.exists(static_path):
             logger.warning(__('html_static_path entry %r does not exist'), entry)
             config.html_static_path.remove(entry)
-        elif path.commonpath([app.outdir, static_path]) == app.outdir:
+        elif (path.splitdrive(app.outdir)[0] == path.splitdrive(static_path)[0] and
+              path.commonpath([app.outdir, static_path]) == app.outdir):
             logger.warning(__('html_static_path entry %r is placed inside outdir'), entry)
             config.html_static_path.remove(entry)