diff --git a/.editorconfig b/.editorconfig
index db1f4a95d7f..3f9e475a6ac 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -32,6 +32,10 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
+[*.html]
+indent_style = space
+indent_size = 2
+
 [*.patch]
 trim_trailing_whitespace = false
 
diff --git a/docs/intro.html b/docs/intro.html
index 99b58fd1c9c..0afd55c4314 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -357,46 +357,46 @@ features.
 </p>
 <ul>
 <li>Texture mapping:
-	<ul>
-	<li>glAreTexturesResident
-	<li>glBindTexture
-	<li>glCopyTexImage1D
-	<li>glCopyTexImage2D
-	<li>glCopyTexSubImage1D
-	<li>glCopyTexSubImage2D
-	<li>glDeleteTextures
-	<li>glGenTextures
-	<li>glIsTexture
-	<li>glPrioritizeTextures
-	<li>glTexSubImage1D
-	<li>glTexSubImage2D
-	</ul>
+  <ul>
+  <li>glAreTexturesResident
+  <li>glBindTexture
+  <li>glCopyTexImage1D
+  <li>glCopyTexImage2D
+  <li>glCopyTexSubImage1D
+  <li>glCopyTexSubImage2D
+  <li>glDeleteTextures
+  <li>glGenTextures
+  <li>glIsTexture
+  <li>glPrioritizeTextures
+  <li>glTexSubImage1D
+  <li>glTexSubImage2D
+  </ul>
 <li>Vertex Arrays:
-	<ul>
-	<li>glArrayElement
-	<li>glColorPointer
-	<li>glDrawElements
-	<li>glEdgeFlagPointer
-	<li>glIndexPointer
-	<li>glInterleavedArrays
-	<li>glNormalPointer
-	<li>glTexCoordPointer
-	<li>glVertexPointer
-	</ul>
+  <ul>
+  <li>glArrayElement
+  <li>glColorPointer
+  <li>glDrawElements
+  <li>glEdgeFlagPointer
+  <li>glIndexPointer
+  <li>glInterleavedArrays
+  <li>glNormalPointer
+  <li>glTexCoordPointer
+  <li>glVertexPointer
+  </ul>
 <li>Client state management:
-	<ul>
-	<li>glDisableClientState
-	<li>glEnableClientState
-	<li>glPopClientAttrib
-	<li>glPushClientAttrib
-	</ul>
+  <ul>
+  <li>glDisableClientState
+  <li>glEnableClientState
+  <li>glPopClientAttrib
+  <li>glPushClientAttrib
+  </ul>
 <li>Misc:
-	<ul>
-	<li>glGetPointer
-	<li>glIndexub
-	<li>glIndexubv
-	<li>glPolygonOffset
-	</ul>
+  <ul>
+  <li>glGetPointer
+  <li>glIndexub
+  <li>glIndexubv
+  <li>glPolygonOffset
+  </ul>
 </ul>
 
 </div>
diff --git a/docs/sourcetree.html b/docs/sourcetree.html
index 5ef74d93908..b16d2627abf 100644
--- a/docs/sourcetree.html
+++ b/docs/sourcetree.html
@@ -49,15 +49,15 @@ each directory.
     <li><b>main</b> - The core Mesa code (mainly state management)
     <li><b>drivers</b> - Mesa drivers (not used with Gallium)
         <ul>
-	<li><b>common</b> - code which may be shared by all drivers
+        <li><b>common</b> - code which may be shared by all drivers
         <li><b>dri</b> - Direct Rendering Infrastructure drivers
            <ul>
-	   <li><b>common</b> - code shared by all DRI drivers
-	   <li><b>i915</b> - driver for Intel i915/i945
-	   <li><b>i965</b> - driver for Intel i965
-	   <li><b>radeon</b> - driver for ATI R100
-	   <li><b>r200</b> - driver for ATI R200
-	   <li>XXX more
+           <li><b>common</b> - code shared by all DRI drivers
+           <li><b>i915</b> - driver for Intel i915/i945
+           <li><b>i965</b> - driver for Intel i965
+           <li><b>radeon</b> - driver for ATI R100
+           <li><b>r200</b> - driver for ATI R200
+           <li>XXX more
            </ul>
         <li><b>x11</b> - Xlib-based software driver
         <li><b>osmesa</b> - off-screen software driver