Docserver: Reorganise the site templates into a single site.html file which

chrome/common/extensions/docs/server2/render_servlet.py

Index: chrome/common/extensions/docs/server2/render_servlet.py
diff --git a/chrome/common/extensions/docs/server2/render_servlet.py b/chrome/common/extensions/docs/server2/render_servlet.py
index 10cc7ae7403c67315441d1e6f3d659728f1a563d..4272b2e358e1c174ddd7f253981beed35ec38909 100644
--- a/chrome/common/extensions/docs/server2/render_servlet.py
+++ b/chrome/common/extensions/docs/server2/render_servlet.py
@@ -103,7 +103,8 @@ class RenderServlet(Servlet):
           server_instance.template_renderer.Render(content, self._request),
           render_title=path != 'google2ed1af765c529f57.html')
       if warnings:
-        logging.warning('\n'.join(warnings))
+        sep = '\n - '
+        logging.warning('Rendering %s:%s%s' % (path, sep, sep.join(warnings)))
 
     content_type = content_and_type.content_type
     if isinstance(content, unicode):