Updates HTML

diff --git a/ikiwiki/directive/index.html b/ikiwiki/directive/index.html
index 637deabba957a6a7dd304ad06241d4acbbff378c..c7f1a5935a713be49d9ea296568476db99a9d262 100644 (file)
--- a/ikiwiki/directive/index.html
+++ b/ikiwiki/directive/index.html
@@ -163,7 +163,7 @@ the older syntax, if the <code>prefix_directives</code> option is disabled.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/formatting/index.html b/ikiwiki/formatting/index.html
index ca215739da570b001f71cc0fa06b21de528effcf..6b21a24ff8a67752ee553f13c9ff06adfc2a764c 100644 (file)
--- a/ikiwiki/formatting/index.html
+++ b/ikiwiki/formatting/index.html
@@ -198,7 +198,7 @@ For example, you can:</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Qui 09 Out 2014 15:31:33 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/index.html b/ikiwiki/index.html
index 47ea17c14533a36a3d6fbf717f7f92d7a0bd5ea5..3cad3490969de9f5d69186f482ca95c5493af3f0 100644 (file)
--- a/ikiwiki/index.html
+++ b/ikiwiki/index.html
@@ -115,7 +115,7 @@
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/markdown/index.html b/ikiwiki/markdown/index.html
index e37f260219cb0bf722a976b388a795920d603aac..33d595b2a68e2e48ca020917ebe4779e4f6b11cf 100644 (file)
--- a/ikiwiki/markdown/index.html
+++ b/ikiwiki/markdown/index.html
@@ -113,7 +113,7 @@ handles internally.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/openid/index.html b/ikiwiki/openid/index.html
index c48cf34269a2f71762092c4769ec6e5a84446e33..a6183214356b45eb80e06283c0e713916808fdf6 100644 (file)
--- a/ikiwiki/openid/index.html
+++ b/ikiwiki/openid/index.html
@@ -119,7 +119,7 @@ by delegating it to an openid server. Here's an example of how to do that:</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/pagespec/attachment/index.html b/ikiwiki/pagespec/attachment/index.html
index ca33f57844d3fe020b87a08e375a705b4126a64a..ec3e4d75285d20da66e9130e4f53a7bc9aba2712 100644 (file)
--- a/ikiwiki/pagespec/attachment/index.html
+++ b/ikiwiki/pagespec/attachment/index.html
@@ -130,7 +130,7 @@ include a glob in the type, for example <code>mimetype(image/*)</code>.</p></li>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/pagespec/index.html b/ikiwiki/pagespec/index.html
index 4e6679b96b8ef485dbf9bb7a5d4f94c88ae3513b..8c7337cb83c424e546eb43f3bea46b892b881f28 100644 (file)
--- a/ikiwiki/pagespec/index.html
+++ b/ikiwiki/pagespec/index.html
@@ -129,7 +129,8 @@ to match all openid users, use <code>user(*://*)</code></li>
 <li>"<code>admin()</code>" - tests whether a modification is being made by one of the
 wiki admins.</li>
 <li>"<code>ip(address)</code>" - tests whether a modification is being made from the
-specified IP address.</li>
+specified IP address. Glob patterns can be used in the address. For
+example, <code>ip(127.0.0.*)</code></li>
 <li>"<code>comment(glob)</code>" - matches comments to a page matching the glob.</li>
 <li>"<code>comment_pending(glob)</code>" - matches unmoderated, pending comments.</li>
 <li>"<code>postcomment(glob)</code>" - matches only when comments are being
@@ -203,7 +204,7 @@ linking to the page containing the PageSpec.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/pagespec/po/index.html b/ikiwiki/pagespec/po/index.html
index 079b199de08dd0c95fbf293f94f9df4347a26e53..5b6495e3ccbd73090ca17c3c7a3bf0aa1bf00237 100644 (file)
--- a/ikiwiki/pagespec/po/index.html
+++ b/ikiwiki/pagespec/po/index.html
@@ -117,7 +117,7 @@ translated.</li>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/pagespec/sorting/index.html b/ikiwiki/pagespec/sorting/index.html
index b7f196015c58db078529281fa6c57fac7f9a1a76..819786766b0cff830ab119d07ba53c654ed9a9fa 100644 (file)
--- a/ikiwiki/pagespec/sorting/index.html
+++ b/ikiwiki/pagespec/sorting/index.html
@@ -115,7 +115,7 @@ title in reverse order if two pages have the same age).</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/searching/index.html b/ikiwiki/searching/index.html
index d2f22f7bab886778235b308dda1704d3ac0658e4..d6c01951be65575b938ef96e3ccd34d744216b1d 100644 (file)
--- a/ikiwiki/searching/index.html
+++ b/ikiwiki/searching/index.html
@@ -120,7 +120,7 @@ For example, "-discussion" will omit "discussion".</li>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/subpage/index.html b/ikiwiki/subpage/index.html
index cdbbd0bd6c90fe5b72620390add8d6da7ff29429..e8071cdda721f051abbb7fa35f5e649a46c4e1b7 100644 (file)
--- a/ikiwiki/subpage/index.html
+++ b/ikiwiki/subpage/index.html
@@ -118,7 +118,7 @@ can be nested as deeply as you'd like.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/subpage/linkingrules/index.html b/ikiwiki/subpage/linkingrules/index.html
index 8a41ac732575076a90f625d8c0a90aa7e356f571..56a839d6e8443c792955d6897c5c0d5ff4deeaf5 100644 (file)
--- a/ikiwiki/subpage/linkingrules/index.html
+++ b/ikiwiki/subpage/linkingrules/index.html
@@ -137,7 +137,7 @@ links are checked for last of all.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/ikiwiki/wikilink/index.html b/ikiwiki/wikilink/index.html
index 8a2391240ed6b7cc947b4d21110b1a67d7dd8fb2..9d733c511f5e72838d91e8c3a63a077fb443a19c 100644 (file)
--- a/ikiwiki/wikilink/index.html
+++ b/ikiwiki/wikilink/index.html
@@ -141,7 +141,7 @@ Email addresses can also be used to generate a mailto link.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/index.html b/index.html
index 4d30691e0794f26a53c0f9db347e920244f53792..5ea8be315113ccddacc69d3a447108607ed07235 100644 (file)
--- a/index.html
+++ b/index.html
@@ -95,7 +95,7 @@
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Sex 02 Out 2015 18:01:11 BRT</span>
+    Last edited <span class="date">Sex 02 Out 2015 18:02:30 BRT</span>
     </div> -->
 
     </div>

diff --git a/sandbox/index.html b/sandbox/index.html
index 03b45b2629e39737928527142eb66c47060ddae8..869d2bcd763e134478ccbae22efec97ea19e4fb8 100644 (file)
--- a/sandbox/index.html
+++ b/sandbox/index.html
@@ -106,8 +106,6 @@
 
 <p><a href="../ikiwiki/wikilink/">WikiLink</a></p>
 
-<p>[[!calendar  type="month" pages="blog/*"]]</p>
-
     </div>
 
     <hr />
@@ -139,7 +137,7 @@
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/shortcuts/index.html b/shortcuts/index.html
index 105dc95f4a4e9c56c46e4f9d5a53beeac10bbda4..924151c69e162f290798496d3f466b44874bf6ed 100644 (file)
--- a/shortcuts/index.html
+++ b/shortcuts/index.html
@@ -74,7 +74,7 @@
 <pre><code>[[!google  foo]]
 [[!wikipedia  War_of_1812]]
 [[!debbug  12345]]
-Check the [[!cia  ikiwiki desc="CIA page for %s"]].
+Check the [[!google  ikiwiki desc="google search for %s"]].
 </code></pre>
 
 <p>This page controls what shortcut links the wiki supports.</p>
@@ -100,7 +100,7 @@ Check the [[!cia  ikiwiki desc="CIA page for %s"]].
 <li>Usage: <code>[[!debss  package]]</code> or <code>[[!debss  package/version]]</code>.  See <a href="http://snapshot.debian.org/">http://snapshot.debian.org/</a> for details.</li>
 </ul>
 </li>
-<li>shortcut debwiki points to <i>https://wiki.debian.org/%s</i></li>
+<li>shortcut debwiki points to <i>https://wiki.debian.org/%S</i></li>
 <li>shortcut fdobug points to <i>https://bugs.freedesktop.org/show_bug.cgi?id=%s</i></li>
 <li>shortcut fdolist points to <i>http://lists.freedesktop.org/mailman/listinfo/%s</i></li>
 <li>shortcut gnomebug points to <i>https://bugzilla.gnome.org/show_bug.cgi?id=%s</i></li>
@@ -127,10 +127,8 @@ Check the [[!cia  ikiwiki desc="CIA page for %s"]].
 <li>shortcut perldoc points to <i>http://perldoc.perl.org/search.html?q=%s</i></li>
 <li>shortcut whois points to <i>http://reports.internic.net/cgi/whois?whois_nic=%s&amp;type=domain</i></li>
 <li>shortcut cve points to <i>https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s</i></li>
-<li>shortcut cia points to <i>http://cia.vc/stats/project/%s</i></li>
-<li>shortcut ciauser points to <i>http://cia.vc/stats/user/%s</i></li>
 <li>shortcut flickr points to <i>https://secure.flickr.com/photos/%s</i></li>
-<li>shortcut man points to <i>http://linux.die.net/man/%s</i></li>
+<li>shortcut man points to <i>http://manpages.debian.org/%s</i></li>
 <li>shortcut ohloh points to <i>https://www.ohloh.net/p/%s</i></li>
 <li>shortcut cpanrt points to <i>https://rt.cpan.org/Ticket/Display.html?id=%s</i></li>
 <li>shortcut novellbug points to <i>https://bugzilla.novell.com/show_bug.cgi?id=%s</i></li>
@@ -138,6 +136,9 @@ Check the [[!cia  ikiwiki desc="CIA page for %s"]].
 <li>shortcut mozillazinekb points to <i>http://kb.mozillazine.org/%s</i></li>
 <li>shortcut freebsdwiki points to <i>http://wiki.freebsd.org/%s</i></li>
 <li>shortcut hackage points to <i>http://hackage.haskell.org/package/%s</i></li>
+<li>shortcut pkgsrc points to <i>http://pkgsrc.se/%S</i></li>
+<li>shortcut doi points to <i>http://dx.doi.org/%s</i></li>
+<li>shortcut arxiv points to <i>http://arxiv.org/abs/%s</i></li>
 </ul>
 
 
@@ -190,7 +191,7 @@ ikiwiki will include your shortcut in the standard underlay.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 26 Set 2014 19:55:09 BRT</span>
     </div> -->
 
     </div>

diff --git a/smileys/index.html b/smileys/index.html
index a6d7080d7b452762eb14d052b61ec64bf6ea8a35..a26df21ddcbd2cd1ae7b3170c38f678ea2efd4f2 100644 (file)
--- a/smileys/index.html
+++ b/smileys/index.html
@@ -158,7 +158,7 @@ smileys directory in the path to the file.</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/templates/index.html b/templates/index.html
index 5a84bc91a079ea7223ba32c63e2b723dd1160c9f..6494ef9d0b468d45a03b3a48373bca0369d64b0d 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -85,8 +85,10 @@ use <code>&lt;TMPL_IF variable&gt;text&lt;TMPL_ELSE&gt;other text&lt;/TMPL_IF&gt
 
 <h2>template pages</h2>
 
-<p>Template pages are regular wiki pages that are used as templates for other
-pages.</p>
+<p>Template pages are regular wiki pages containing a
+<a href="http://ikiwiki.info/ikiwiki/directive/templatebody/">templatebody directive</a>,
+used as templates for other pages. The parts of the template
+page outside the directive can be used to document it.</p>
 
 <p>The <a href="http://ikiwiki.info/ikiwiki/directive/template/">template directive</a> allows
 template pages to be filled out and inserted into other pages in the wiki.</p>
@@ -106,6 +108,9 @@ template pages to be filled out and inserted into other pages in the wiki.</p>
 
 
 
+<p>If the template does not contain a <code>templatebody</code> directive, the entire
+source of the page is used for the template. This is deprecated.</p>
+
 <h2>template files</h2>
 
 <p>Template files are unlike template pages in that they have the extension
@@ -191,7 +196,7 @@ interface; do not normally need to be customised.</li>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Sex 12 Set 2014 17:23:58 BRT</span>
     </div> -->
 
     </div>

diff --git a/templates/note/index.html b/templates/note/index.html
index abb237a3162f1e814f7f7b504055ea19f8b37e87..61cef4f69661adb6979b4f9f2dc67cb62ea44638 100644 (file)
--- a/templates/note/index.html
+++ b/templates/note/index.html
@@ -109,7 +109,7 @@ parameter:</p>
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Dom 29 Mar 2015 18:27:19 BRT</span>
     </div> -->
 
     </div>

diff --git a/templates/popup/index.html b/templates/popup/index.html
index bf0fa01d23361a44ac10d3f527dd2d73571f79e6..38cc4c5fc72babdf263b67f1493260c89dc50cc2 100644 (file)
--- a/templates/popup/index.html
+++ b/templates/popup/index.html
@@ -112,7 +112,7 @@ inline in the page, inside square brackets.
     
 
     <!--<div class="pagedate">
-    Last edited <span class="date">Seg 06 Abr 2015 17:15:27 BRT</span>
+    Last edited <span class="date">Dom 29 Mar 2015 18:27:19 BRT</span>
     </div> -->
 
     </div>