From 9d3b12259708d3d2c04d16637b58658ca3058ec9 Mon Sep 17 00:00:00 2001 From: Arquivo Publico de Memoria Coletiva Date: Wed, 4 May 2016 09:22:11 -0300 Subject: Updates doc again --- documentacao/index.html | 4 ++-- ikiwiki/directive/index.html | 2 +- ikiwiki/formatting/index.html | 2 +- ikiwiki/index.html | 2 +- ikiwiki/markdown/index.html | 2 +- ikiwiki/openid/index.html | 2 +- ikiwiki/pagespec/attachment/index.html | 2 +- ikiwiki/pagespec/index.html | 5 +++-- ikiwiki/pagespec/po/index.html | 2 +- ikiwiki/pagespec/sorting/index.html | 2 +- ikiwiki/searching/index.html | 2 +- ikiwiki/subpage/index.html | 2 +- ikiwiki/subpage/linkingrules/index.html | 2 +- ikiwiki/wikilink/index.html | 2 +- sandbox/index.html | 4 +--- shortcuts/index.html | 13 +++++++------ smileys/index.html | 2 +- templates/index.html | 11 ++++++++--- templates/note/index.html | 2 +- templates/popup/index.html | 2 +- 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 
cd /var/cache/sites
 git clone arquivo.git arquivo && rm -rf arquivo.git
 chown -R arquivo. arquivo
-cd arquivo && git annex init SERVIDOR && make whoami && make post_update
+cd arquivo && git annex init SERVIDOR && make whoami && make post_receive

A partir deste ponto você já pode adicionar usar o repositório normalmente.

@@ -174,7 +174,7 @@ cd arquivo && git annex init SERVIDOR && make whoami && 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 prefix_directives option is disabled.

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:

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 @@ 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.

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:

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 mimetype(image/*).

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 user(*://*)
  • "admin()" - tests whether a modification is being made by one of the wiki admins.
  • "ip(address)" - tests whether a modification is being made from the -specified IP address.
    • +specified IP address. Glob patterns can be used in the address. For +example, ip(127.0.0.*)
  • "comment(glob)" - matches comments to a page matching the glob.
  • "comment_pending(glob)" - matches unmoderated, pending comments.
  • "postcomment(glob)" - matches only when comments are being @@ -204,7 +205,7 @@ linking to the page containing the PageSpec.

    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.
    • 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).

    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". 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.

    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.

    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.

    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 @@

    WikiLink

    -

    [[!calendar type="month" pages="blog/*"]]

    -
    @@ -140,7 +138,7 @@ 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 @@ 
    [[!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"]].

    This page controls what shortcut links the wiki supports.

    @@ -101,7 +101,7 @@ Check the [[!cia ikiwiki desc="CIA page for %s"]].
  • Usage: [[!debss package]] or [[!debss package/version]]. See http://snapshot.debian.org/ for details.
    • -
  • shortcut debwiki points to https://wiki.debian.org/%s
    • +
  • shortcut debwiki points to https://wiki.debian.org/%S
  • shortcut fdobug points to https://bugs.freedesktop.org/show_bug.cgi?id=%s
  • shortcut fdolist points to http://lists.freedesktop.org/mailman/listinfo/%s
  • shortcut gnomebug points to https://bugzilla.gnome.org/show_bug.cgi?id=%s
    • @@ -128,10 +128,8 @@ Check the [[!cia ikiwiki desc="CIA page for %s"]].
  • shortcut perldoc points to http://perldoc.perl.org/search.html?q=%s
  • shortcut whois points to http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain
  • shortcut cve points to https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s
    • -
  • shortcut cia points to http://cia.vc/stats/project/%s
    • -
  • shortcut ciauser points to http://cia.vc/stats/user/%s
  • shortcut flickr points to https://secure.flickr.com/photos/%s
    • -
  • shortcut man points to http://linux.die.net/man/%s
    • +
  • shortcut man points to http://manpages.debian.org/%s
  • shortcut ohloh points to https://www.ohloh.net/p/%s
  • shortcut cpanrt points to https://rt.cpan.org/Ticket/Display.html?id=%s
  • shortcut novellbug points to https://bugzilla.novell.com/show_bug.cgi?id=%s
    • @@ -139,6 +137,9 @@ Check the [[!cia ikiwiki desc="CIA page for %s"]].
  • shortcut mozillazinekb points to http://kb.mozillazine.org/%s
  • shortcut freebsdwiki points to http://wiki.freebsd.org/%s
  • shortcut hackage points to http://hackage.haskell.org/package/%s
    • +
  • shortcut pkgsrc points to http://pkgsrc.se/%S
    • +
  • shortcut doi points to http://dx.doi.org/%s
    • +
  • shortcut arxiv points to http://arxiv.org/abs/%s
    • @@ -191,7 +192,7 @@ ikiwiki will include your shortcut in the standard underlay.

    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.

    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 <TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>

    template pages

    -

    Template pages are regular wiki pages that are used as templates for other -pages.

    +

    Template pages are regular wiki pages containing a +templatebody directive, +used as templates for other pages. The parts of the template +page outside the directive can be used to document it.

    The template directive allows template pages to be filled out and inserted into other pages in the wiki.

    @@ -107,6 +109,9 @@ template pages to be filled out and inserted into other pages in the wiki.

    +

    If the template does not contain a templatebody directive, the entire +source of the page is used for the template. This is deprecated.

    +

    template files

    Template files are unlike template pages in that they have the extension @@ -192,7 +197,7 @@ interface; do not normally need to be customised. 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:

    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. -- cgit v1.2.3