aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--documentacao/index.html4
-rw-r--r--ikiwiki/directive/index.html2
-rw-r--r--ikiwiki/formatting/index.html2
-rw-r--r--ikiwiki/index.html2
-rw-r--r--ikiwiki/markdown/index.html2
-rw-r--r--ikiwiki/openid/index.html2
-rw-r--r--ikiwiki/pagespec/attachment/index.html2
-rw-r--r--ikiwiki/pagespec/index.html5
-rw-r--r--ikiwiki/pagespec/po/index.html2
-rw-r--r--ikiwiki/pagespec/sorting/index.html2
-rw-r--r--ikiwiki/searching/index.html2
-rw-r--r--ikiwiki/subpage/index.html2
-rw-r--r--ikiwiki/subpage/linkingrules/index.html2
-rw-r--r--ikiwiki/wikilink/index.html2
-rw-r--r--sandbox/index.html4
-rw-r--r--shortcuts/index.html13
-rw-r--r--smileys/index.html2
-rw-r--r--templates/index.html11
-rw-r--r--templates/note/index.html2
-rw-r--r--templates/popup/index.html2
20 files changed, 36 insertions, 31 deletions
diff --git a/documentacao/index.html b/documentacao/index.html
index 9b54288a3d7..5cce37323d4 100644
--- a/documentacao/index.html
+++ b/documentacao/index.html
@@ -118,7 +118,7 @@ rsync -avz -e 'ssh -p PORTA' arquivo.git/ arquivo@SERVIDOR:/var/cache/sites/arqu
<pre><code>cd /var/cache/sites
git clone arquivo.git arquivo &amp;&amp; rm -rf arquivo.git
chown -R arquivo. arquivo
-cd arquivo &amp;&amp; git annex init SERVIDOR &amp;&amp; make whoami &amp;&amp; make post_update
+cd arquivo &amp;&amp; git annex init SERVIDOR &amp;&amp; make whoami &amp;&amp; make post_receive
</code></pre>
<p>A partir deste ponto você já pode adicionar usar o repositório normalmente.</p>
@@ -174,7 +174,7 @@ cd arquivo &amp;&amp; git annex init SERVIDOR &amp;&amp; make whoami &amp;&amp;
<!--<div class="pagedate">
- Last edited <span class="date">Sex 02 Out 2015 16:04:19 BRT</span>
+ Last edited <span class="date">Qua 04 Mai 2016 09:21:42 BRT</span>
</div> -->
</div>
diff --git a/ikiwiki/directive/index.html b/ikiwiki/directive/index.html
index ed97a5f98fc..30568669935 100644
--- a/ikiwiki/directive/index.html
+++ b/ikiwiki/directive/index.html
@@ -164,7 +164,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 b9afafb5973..09be4497511 100644
--- a/ikiwiki/formatting/index.html
+++ b/ikiwiki/formatting/index.html
@@ -199,7 +199,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 fd4efd96b6e..1263160133f 100644
--- a/ikiwiki/index.html
+++ b/ikiwiki/index.html
@@ -116,7 +116,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 a5c84c01e5f..147e6a49377 100644
--- a/ikiwiki/markdown/index.html
+++ b/ikiwiki/markdown/index.html
@@ -114,7 +114,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 09181ecc471..34a2ac69658 100644
--- a/ikiwiki/openid/index.html
+++ b/ikiwiki/openid/index.html
@@ -120,7 +120,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 e2f74c1ab7c..b549a2836d6 100644
--- a/ikiwiki/pagespec/attachment/index.html
+++ b/ikiwiki/pagespec/attachment/index.html
@@ -131,7 +131,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 de19ebeefb5..cde24187dfb 100644
--- a/ikiwiki/pagespec/index.html
+++ b/ikiwiki/pagespec/index.html
@@ -130,7 +130,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
@@ -204,7 +205,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 6e2e0b8fbaf..9ad59fab831 100644
--- a/ikiwiki/pagespec/po/index.html
+++ b/ikiwiki/pagespec/po/index.html
@@ -118,7 +118,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 8d4ad84c732..daf3bafddac 100644
--- a/ikiwiki/pagespec/sorting/index.html
+++ b/ikiwiki/pagespec/sorting/index.html
@@ -116,7 +116,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 41069230d4f..f72c951f96e 100644
--- a/ikiwiki/searching/index.html
+++ b/ikiwiki/searching/index.html
@@ -121,7 +121,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 6ff6de92952..08a84ed3191 100644
--- a/ikiwiki/subpage/index.html
+++ b/ikiwiki/subpage/index.html
@@ -119,7 +119,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 a63978a770c..5be89e0b7c3 100644
--- a/ikiwiki/subpage/linkingrules/index.html
+++ b/ikiwiki/subpage/linkingrules/index.html
@@ -138,7 +138,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 1d753d6a91e..0c897585d7b 100644
--- a/ikiwiki/wikilink/index.html
+++ b/ikiwiki/wikilink/index.html
@@ -142,7 +142,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/sandbox/index.html b/sandbox/index.html
index 2e8d6666fe6..6ce77b442b9 100644
--- a/sandbox/index.html
+++ b/sandbox/index.html
@@ -107,8 +107,6 @@
<p><a href="../ikiwiki/wikilink/">WikiLink</a></p>
-<p>[[!calendar type="month" pages="blog/*"]]</p>
-
</div>
<hr />
@@ -140,7 +138,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 2aa3422e4d3..54be410bf71 100644
--- a/shortcuts/index.html
+++ b/shortcuts/index.html
@@ -75,7 +75,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>
@@ -101,7 +101,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>
@@ -128,10 +128,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>
@@ -139,6 +137,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>
@@ -191,7 +192,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 f14a5bb051c..3ab5ea312d9 100644
--- a/smileys/index.html
+++ b/smileys/index.html
@@ -159,7 +159,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 25fb4f5742d..6a78b260e70 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -86,8 +86,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>
@@ -107,6 +109,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
@@ -192,7 +197,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 ef90ebb80e3..3b9fe495562 100644
--- a/templates/note/index.html
+++ b/templates/note/index.html
@@ -110,7 +110,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 45a4bfcaaeb..c98a6e2a82c 100644
--- a/templates/popup/index.html
+++ b/templates/popup/index.html
@@ -113,7 +113,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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 10:15:04 +0000