Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470""

This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673.

A fix has been put up for openbmc/openbmc#3720 so we can bring
this back now

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6
diff --git a/poky/documentation/README b/poky/documentation/README
index fce3cfe..fe86876 100644
--- a/poky/documentation/README
+++ b/poky/documentation/README
@@ -121,7 +121,7 @@
 To build the documentation locally, run:
 
  $ cd documentation
- $ make -f Makefile.sphinx html
+ $ make html
 
 The resulting HTML index page will be _build/html/index.html, and you
 can browse your own copy of the locally generated documentation with