From f3ada760d40b3a2db91538187e86caecfb33a8ea Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 10 Feb 2011 16:01:16 +0100 Subject: topgit: init --- .topdeps | 1 + .topmsg | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 .topdeps create mode 100644 .topmsg diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000..fc3aa50 --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +ikiwiki diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000..5c07090 --- /dev/null +++ b/.topmsg @@ -0,0 +1,6 @@ +From: Jonas Smedegaard +Subject: [PATCH] typos + +Typos. + +Signed-off-by: Jonas Smedegaard -- cgit v1.2.3 From 2b9f4b2135de9f94dbe48fa201bd49746242e822 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 10 Feb 2011 16:02:12 +0100 Subject: "WikiLinks and directives" is plural. --- ikiwiki/markdown.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn index 6841919..d1aa914 100644 --- a/ikiwiki/markdown.mdwn +++ b/ikiwiki/markdown.mdwn @@ -7,5 +7,5 @@ For documentation about the markdown syntax, see [[formatting]] and [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part -of the markdown syntax, and are the only bit of markup that this wiki +of the markdown syntax, and are the only bits of markup that this wiki handles internally. -- cgit v1.2.3 From 180e3557b657da29f4106054a8abe2f029aec088 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 10 Feb 2011 16:03:42 +0100 Subject: Headlines are _semantic_ so refer to their _level_ (not size). --- ikiwiki/formatting.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn index befbce9..d2a5f46 100644 --- a/ikiwiki/formatting.mdwn +++ b/ikiwiki/formatting.mdwn @@ -24,7 +24,7 @@ do) followed by a period: To create a header, start a line with one or more `#` characters followed by a space and the header text. The number of `#` characters controls the -size of the header: +level of the header: # # h1 ## ## h2 -- cgit v1.2.3 From 6aac938c82557d6f42841fa5e98fb80c37922bec Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 9 Oct 2013 12:35:57 +0200 Subject: Sync with ikiwiki 3.20130904.1. --- ikiwiki/pagespec.mdwn | 3 ++- sandbox.mdwn | 2 -- shortcuts.mdwn | 4 +--- style.css | 11 ++++++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn index fe1af4c..0f298ad 100644 --- a/ikiwiki/pagespec.mdwn +++ b/ikiwiki/pagespec.mdwn @@ -51,7 +51,8 @@ Some more elaborate limits can be added to what matches using these functions: * "`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 diff --git a/sandbox.mdwn b/sandbox.mdwn index e76bdb8..c66534f 100644 --- a/sandbox.mdwn +++ b/sandbox.mdwn @@ -30,5 +30,3 @@ Bulleted list * item [[ikiwiki/WikiLink]] - -[[!calendar type="month" pages="blog/*"]] diff --git a/shortcuts.mdwn b/shortcuts.mdwn index 722c6b1..b4f6d8e 100644 --- a/shortcuts.mdwn +++ b/shortcuts.mdwn @@ -7,7 +7,7 @@ Some examples of using shortcuts include: \[[!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. @@ -54,8 +54,6 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]] * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] * [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]] -* [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]] -* [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]] * [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]] * [[!shortcut name=man url="http://linux.die.net/man/%s"]] * [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]] diff --git a/style.css b/style.css index 6e2afce..067a3bf 100644 --- a/style.css +++ b/style.css @@ -58,7 +58,8 @@ nav { border-bottom: 1px solid #000; } -.inlinecontent { +.inlinecontent, +.inlineenclosure { margin-top: .4em; } @@ -202,6 +203,13 @@ div.recentchanges { margin-top: 1em; } +.archivepagedate { + font-style: italic; +} +.archivepage { + margin-bottom: 1em; +} + .error { color: #C00; } @@ -316,6 +324,7 @@ div.progress-done { .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon { -- cgit v1.2.3