diff --git a/lib/rdoc/generator/template/aliki/_head.rhtml b/lib/rdoc/generator/template/aliki/_head.rhtml
index 8d46376d6c..d7392f3487 100644
--- a/lib/rdoc/generator/template/aliki/_head.rhtml
+++ b/lib/rdoc/generator/template/aliki/_head.rhtml
@@ -4,72 +4,106 @@
<%= h @title %>
<%- if defined?(klass) %>
- ">
-
+ "
+ >
<%- if klass.comment.empty? %>
- ">
+ "
+ >
<%- else %>
- ">
+ "
+ >
<%- end %>
<%- elsif defined?(file) %>
- ">
+ "
+ >
<%- elsif @title %>
-
<%- if @options.main_page and
main_page = @files.find { |f| f.full_name == @options.main_page } then %>
- ">
+ "
+ >
<%- else %>
<%- end %>
<%- end %>
<%- if canonical_url = @options.canonical_root %>
-<% canonical_url = current.canonical_url if defined?(current) %>
-
+ <% canonical_url = current.canonical_url if defined?(current) %>
+
<%- end %>
+
<%- if defined?(klass) %>
<%- if klass.comment.empty? %>
-
+
<%- else %>
<%- end %>
<%- elsif defined?(file) %>
<%- if file.comment.empty? %>
-
+
<%- else %>
<%- end %>
<%- else %>
-
+
<%- end %>
+
<%- if canonical_url = @options.canonical_root %>
-<% canonical_url = current.canonical_url if defined?(current) %>
-
+ <% canonical_url = current.canonical_url if defined?(current) %>
+
<%- end %>
+
<%- if defined?(klass) %>
<%- if klass.comment.empty? %>
-
+
<%- else %>
<%- end %>
<%- elsif defined?(file) %>
<%- if file.comment.empty? %>
-
+
<%- else %>
<%- end %>
<%- else %>
-
+
<%- end %>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
<%- @options.template_stylesheets.each do |stylesheet| %>
-
+
<%- end %>
diff --git a/lib/rdoc/version.rb b/lib/rdoc/version.rb
index 84fd51ded0..95b56ea25d 100644
--- a/lib/rdoc/version.rb
+++ b/lib/rdoc/version.rb
@@ -5,6 +5,6 @@ module RDoc
##
# RDoc version you are using
- VERSION = '6.16.0'
+ VERSION = '6.16.1'
end