summaryrefslogtreecommitdiff
path: root/lib/godoc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/godoc')
-rw-r--r--lib/godoc/error.html (renamed from lib/godoc/source.html)10
-rw-r--r--lib/godoc/godoc.html3
-rw-r--r--lib/godoc/package.html10
-rw-r--r--lib/godoc/search.html10
4 files changed, 16 insertions, 17 deletions
diff --git a/lib/godoc/source.html b/lib/godoc/error.html
index 4189f4ef8..c14c57405 100644
--- a/lib/godoc/source.html
+++ b/lib/godoc/error.html
@@ -4,10 +4,6 @@
license that can be found in the LICENSE file.
-->
-{.section Error}
- <p>
- <span class="alert" style="font-size:120%">{@|html}</span>
- </p>
-{.or}
- <pre>{Source|html}</pre>
-{.end}
+<p>
+<span class="alert" style="font-size:120%">{@|html-esc}</span>
+</p>
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index 893982500..944643a34 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -94,6 +94,9 @@
<li><a href="/doc/code.html">How to write code</a></li>
<li><a href="/cmd">Command documentation</a></li>
<li><a href="/pkg">Package documentation</a></li>
+ {.repeated section PkgRoots}
+ <li><a href="/pkg/{@|html-esc}">Package documentation for {@|html-esc}</a></li>
+ {.end}
<li><a href="/src">Source files</a></li>
<li><a href="/doc/devel/">The Go project</a></li>
diff --git a/lib/godoc/package.html b/lib/godoc/package.html
index 6a799c2fd..2113e46bd 100644
--- a/lib/godoc/package.html
+++ b/lib/godoc/package.html
@@ -16,7 +16,7 @@
<h4>Package files</h4>
<span style="font-size:90%">
{.repeated section @}
- <a href="/{FilePath|html-esc}/{@|html-esc}">{@|html}</a>
+ <a href="{@|url-src}">{@|localname}</a>
{.end}
</span>
</p>
@@ -38,14 +38,14 @@
{.end}
{.section Funcs}
{.repeated section @}
- <h2 id="{Name|html-esc}">func <a href="{Decl|link}">{Name|html}</a></h2>
+ <h2 id="{Name|html-esc}">func <a href="{Decl|url-pos}">{Name|html}</a></h2>
<p><code>{Decl|html}</code></p>
{Doc|html-comment}
{.end}
{.end}
{.section Types}
{.repeated section @}
- <h2 id="{Type.Name|html-esc}">type <a href="{Decl|link}">{Type.Name|html}</a></h2>
+ <h2 id="{Type.Name|html-esc}">type <a href="{Decl|url-pos}">{Type.Name|html}</a></h2>
{Doc|html-comment}
<p><pre>{Decl|html}</pre></p>
{.repeated section Consts}
@@ -57,12 +57,12 @@
<pre>{Decl|html}</pre>
{.end}
{.repeated section Factories}
- <h3 id="{Type.Name|html-esc}.{Name|html-esc}">func <a href="{Decl|link}">{Name|html}</a></h3>
+ <h3 id="{Type.Name|html-esc}.{Name|html-esc}">func <a href="{Decl|url-pos}">{Name|html}</a></h3>
<p><code>{Decl|html}</code></p>
{Doc|html-comment}
{.end}
{.repeated section Methods}
- <h3 id="{Type.Name|html-esc}.{Name|html-esc}">func ({Recv|html}) <a href="{Decl|link}">{Name|html}</a></h3>
+ <h3 id="{Type.Name|html-esc}.{Name|html-esc}">func ({Recv|html}) <a href="{Decl|url-pos}">{Name|html}</a></h3>
<p><code>{Decl|html}</code></p>
{Doc|html-comment}
{.end}
diff --git a/lib/godoc/search.html b/lib/godoc/search.html
index 254f9b66f..a6b7fe29c 100644
--- a/lib/godoc/search.html
+++ b/lib/godoc/search.html
@@ -22,11 +22,11 @@
{.section Decls}
<h2 id="Global">Package-level declarations</h2>
{.repeated section @}
- <h3 id="Global_{Pak.Path|path}">package <a href="{Pak.Path|path}">{Pak.Name|html}</a></h3>
+ <h3 id="Global_{Pak.Path|url-pkg}">package <a href="{Pak.Path|url-pkg}">{Pak.Name|html}</a></h3>
{.repeated section Files}
{.repeated section Groups}
{.repeated section Infos}
- <a href="{File.Path|html-esc}?h={Query|html-esc}#L{@|infoLine}">{File.Path|html}:{@|infoLine}</a>
+ <a href="{File.Path|url-src}?h={Query|html-esc}#L{@|infoLine}">{File.Path|html}:{@|infoLine}</a>
<pre>{@|infoSnippet}</pre>
{.end}
{.end}
@@ -36,9 +36,9 @@
{.section Others}
<h2 id="Local">Local declarations and uses</h2>
{.repeated section @}
- <h3 id="Local_{Pak.Path|path}">package <a href="{Pak.Path|path}">{Pak.Name|html}</a></h3>
+ <h3 id="Local_{Pak.Path|url-pkg}">package <a href="{Pak.Path|url-pkg}">{Pak.Name|html}</a></h3>
{.repeated section Files}
- <a href="{File.Path|html-esc}?h={Query|html-esc}">{File.Path|html}</a>
+ <a href="{File.Path|url-src}?h={Query|html-esc}">{File.Path|html}</a>
<table class="layout">
{.repeated section Groups}
<tr>
@@ -47,7 +47,7 @@
<td align="left" width="4"></td>
<td>
{.repeated section Infos}
- <a href="{File.Path|html-esc}?h={Query|html-esc}#L{@|infoLine}">{@|infoLine}</a>
+ <a href="{File.Path|url-src}?h={Query|html-esc}#L{@|infoLine}">{@|infoLine}</a>
{.end}
</td>
</tr>