4 files changed, 21 insertions, 10 deletions
diff --git a/coverage/htmlfiles/coverage_html.js b/coverage/htmlfiles/coverage_html.js
index 5ef0ece5..bd6a8753 100644
--- a/coverage/htmlfiles/coverage_html.js
+++ b/coverage/htmlfiles/coverage_html.js
@@ -1,3 +1,6 @@
+// Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+// For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
+
 // Coverage.py HTML report browser code.
 /*jslint browser: true, sloppy: true, vars: true, plusplus: true, maxerr: 50, indent: 4 */
 /*global coverage: true, document, window, $ */
diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html
index 1afc57c9..ee2deab0 100644
--- a/coverage/htmlfiles/index.html
+++ b/coverage/htmlfiles/index.html
@@ -1,3 +1,6 @@
+{# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 #}
+{# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt #}
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -41,7 +44,7 @@
         <span class="key">s</span>
         <span class="key">m</span>
         <span class="key">x</span>
-        {% if arcs %}
+        {% if has_arcs %}
         <span class="key">b</span>
         <span class="key">p</span>
         {% endif %}
@@ -59,7 +62,7 @@
                 <th class="shortkey_s">statements</th>
                 <th class="shortkey_m">missing</th>
                 <th class="shortkey_x">excluded</th>
-                {% if arcs %}
+                {% if has_arcs %}
                 <th class="shortkey_b">branches</th>
                 <th class="shortkey_p">partial</th>
                 {% endif %}
@@ -73,7 +76,7 @@
                 <td>{{totals.n_statements}}</td>
                 <td>{{totals.n_missing}}</td>
                 <td>{{totals.n_excluded}}</td>
-                {% if arcs %}
+                {% if has_arcs %}
                 <td>{{totals.n_branches}}</td>
                 <td>{{totals.n_partial_branches}}</td>
                 {% endif %}
@@ -83,11 +86,11 @@
         <tbody>
             {% for file in files %}
             <tr class="file">
-                <td class="name left"><a href="{{file.html_filename}}">{{file.name}}</a></td>
+                <td class="name left"><a href="{{file.html_filename}}">{{file.relative_filename}}</a></td>
                 <td>{{file.nums.n_statements}}</td>
                 <td>{{file.nums.n_missing}}</td>
                 <td>{{file.nums.n_excluded}}</td>
-                {% if arcs %}
+                {% if has_arcs %}
                 <td>{{file.nums.n_branches}}</td>
                 <td>{{file.nums.n_partial_branches}}</td>
                 {% endif %}
diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html
index d78ba536..ad7969db 100644
--- a/coverage/htmlfiles/pyfile.html
+++ b/coverage/htmlfiles/pyfile.html
@@ -1,3 +1,6 @@
+{# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 #}
+{# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt #}
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -5,7 +8,7 @@
     {# IE8 rounds line-height incorrectly, and adding this emulateIE7 line makes it right! #}
     {# http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/7684445e-f080-4d8f-8529-132763348e21 #}
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for {{fr.name|escape}}: {{nums.pc_covered_str}}%</title>
+    <title>Coverage for {{fr.relative_filename|escape}}: {{nums.pc_covered_str}}%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     {% if extra_css %}
         <link rel="stylesheet" href="{{ extra_css }}" type="text/css">
@@ -22,7 +25,7 @@
 
 <div id="header">
     <div class="content">
-        <h1>Coverage for <b>{{fr.name|escape}}</b> :
+        <h1>Coverage for <b>{{fr.relative_filename|escape}}</b> :
             <span class="pc_cov">{{nums.pc_covered_str}}%</span>
         </h1>
 
@@ -34,7 +37,7 @@
             <span class="{{c_mis}} shortkey_m button_toggle_mis">{{nums.n_missing}} missing</span>
             <span class="{{c_exc}} shortkey_x button_toggle_exc">{{nums.n_excluded}} excluded</span>
 
-            {% if arcs %}
+            {% if has_arcs %}
                 <span class="{{c_par}} shortkey_p button_toggle_par">{{nums.n_partial_branches}} partial</span>
             {% endif %}
         </h2>
diff --git a/coverage/htmlfiles/style.css b/coverage/htmlfiles/style.css
index 038335c1..15b08904 100644
--- a/coverage/htmlfiles/style.css
+++ b/coverage/htmlfiles/style.css
@@ -1,4 +1,7 @@
-/* CSS styles for Coverage. */
+/* Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 */
+/* For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt */
+
+/* CSS styles for coverage.py. */
 /* Page-wide styles */
 html, body, h1, h2, h3, p, table, td, th {
     margin: 0;
@@ -249,7 +252,6 @@ td.text {
 
 .text span.annotate {
     font-family: georgia;
-    font-style: italic;
     color: #666;
     float: right;
     padding-right: .5em;