servo: Merge #12470 - Place apis.html in the same place as css-properties.html (from servo:jdm-patch-2); r=Manishearth

Right now it's visible at http://doc.servo.org/apis.html, unlike http://doc.servo.org/servo/css-properties.html.

Source-Repo: https://github.com/servo/servo
Source-Revision: d9b7c060a5ec7a6c0556de371b3e9ed3dc832337

servo/etc/ci/upload_docs.sh

@@ -16,7 +16,8 @@ cp etc/doc.servo.org/* target/doc/
 
 python components/style/properties/build.py servo html
 
-OUT_DIR="`pwd`/target/doc" make -f makefile.cargo -C components/script dom_docs
+OUT_DIR="`pwd`/target/doc/servo" make -f makefile.cargo -C components/script dom_docs
+rm -rf target/doc/servo/.cache
 
 ghp-import -n target/doc
 git push -qf "https://${TOKEN}@github.com/servo/doc.servo.org.git" gh-pages