aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2015-03-14 15:57:53 -0400
committerJoey Hess <joeyh@joeyh.name>2015-03-14 15:57:53 -0400
commitcfd750aad091e4f82593f63164f9de3bb711479f (patch)
tree8cc44a3a0e4b878ff918af4a133f012d97a5d352
parent6ff7d4bba6e78399cacb0d19c7e66a90ed208fbe (diff)
parent9485bd1e5d76432139e4ef691e8d61cdfe41d03b (diff)
downloadikiwiki-cfd750aad091e4f82593f63164f9de3bb711479f.tar
ikiwiki-cfd750aad091e4f82593f63164f9de3bb711479f.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
Diffstat
-rw-r--r--doc/bugs/Commonmark_support.mdwn3
-rw-r--r--doc/bugs/sessions.db_grows_big.mdwn7
-rw-r--r--doc/forum/Git_push_failure/comment_2_5e53d75ebf410ee2c3365595c7ecf246._comment107
-rw-r--r--doc/forum/Git_push_failure/comment_3_b55a749dcfc22a5c01a590836cf3af02._comment8
-rw-r--r--doc/forum/Git_push_failure/comment_4_add17d4171ad631369dad84a673f5e09._comment10
-rw-r--r--doc/forum/Git_push_failure/comment_5_87b05d66a30ab52f22c6167b2bad0654._comment15
-rw-r--r--doc/forum/How_to_allow_.markdown_and_.md_at_the_same_time_as_valid_extensions_for_source_files__63__.mdwn23
-rw-r--r--doc/ikiwikiusers.mdwn1
-rw-r--r--doc/plugins/contrib/asciidoc.mdwn (renamed from doc/forum/Asciidoc_plugin.mdwn)5
-rw-r--r--doc/plugins/po/discussion.mdwn13
-rw-r--r--doc/users/schmonz.mdwn6
11 files changed, 193 insertions, 5 deletions
diff --git a/doc/bugs/Commonmark_support.mdwn b/doc/bugs/Commonmark_support.mdwn
new file mode 100644
index 000000000..5ee014b19
--- /dev/null
+++ b/doc/bugs/Commonmark_support.mdwn
@@ -0,0 +1,3 @@
+I suffer from the occasional markdown glitches using branchable.
+
+I've found that switching my own non-ikiwiki projects to https://github.com/jgm/CommonMark has helped sort them out for the most part.
diff --git a/doc/bugs/sessions.db_grows_big.mdwn b/doc/bugs/sessions.db_grows_big.mdwn
new file mode 100644
index 000000000..6c06be4b2
--- /dev/null
+++ b/doc/bugs/sessions.db_grows_big.mdwn
@@ -0,0 +1,7 @@
+The `$srcdir/.ikiwiki/sessions.db` file gets big. Does anything clean it?
+
+ -rw------- 1 jon jon 81M Mar 10 15:41 sessions.db
+
+That's 155,990 records, with the earliest having an atime of
+Sat, 29 Nov 2008 17:33:43 GMT… — [[Jon]]
+
diff --git a/doc/forum/Git_push_failure/comment_2_5e53d75ebf410ee2c3365595c7ecf246._comment b/doc/forum/Git_push_failure/comment_2_5e53d75ebf410ee2c3365595c7ecf246._comment
new file mode 100644
index 000000000..2439f57b7
--- /dev/null
+++ b/doc/forum/Git_push_failure/comment_2_5e53d75ebf410ee2c3365595c7ecf246._comment
@@ -0,0 +1,107 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlobQ5j7hQVIGkwMWW3yKB_DWqthJcpnsQ"
+ nickname="Qi"
+ subject="comment 2"
+ date="2015-03-10T06:01:06Z"
+ content="""
+Building manually seems to generate a functioning output web site. I can't see any obvious error in the result or the console output when running ikiwiki.
+
+The complete console output for running `git push` from the source dir is:
+ Counting objects: 33, done.
+ Delta compression using up to 4 threads.
+ Compressing objects: 100% (32/32), done.
+ Writing objects: 100% (33/33), 11.62 KiB | 0 bytes/s, done.
+ Total 33 (delta 15), reused 0 (delta 0)
+ remote: Died at /usr/share/perl5/IkiWiki/CGI.pm line 491.
+ remote: Content-type: text/html
+ remote:
+ remote: <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
+ remote: \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">
+ remote: <html xmlns=\"http://www.w3.org/1999/xhtml\">
+ remote:
+ remote: <head>
+ remote:
+ remote:
+ remote: <base href=\"/~qazwsx/pages/\" />
+ remote:
+ remote:
+ remote: <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
+ remote: <title>Error</title>
+ remote:
+ remote: <link rel=\"stylesheet\" href=\"/~qazwsx/pages/style.css\" type=\"text/css\" />
+ remote:
+ remote: <link rel=\"stylesheet\" href=\"/~qazwsx/pages/local.css\" type=\"text/css\" />
+ remote:
+ remote:
+ remote:
+ remote:
+ remote:
+ remote: </head>
+ remote: <body>
+ remote:
+ remote: <div class=\"page\">
+ remote:
+ remote: <div class=\"pageheader\">
+ remote: <div class=\"header\">
+ remote: <span>
+ remote: <span class=\"parentlinks\">
+ remote:
+ remote: <a href=\"/~qazwsx/pages/\">Qazwsx XXX's Home Page</a><font color=\"gray\"> / </font>
+ remote:
+ remote: </span>
+ remote: <span class=\"title\">
+ remote: Error
+ remote:
+ remote: </span>
+ remote: </span>
+ remote:
+ remote:
+ remote:
+ remote: </div>
+ remote:
+ remote: <!-- do not use action bar (the gray bar under the title) -->
+ remote: <!-- -->
+ remote: <!-- <div class=\"actions\"> -->
+ remote: <!-- <ul> -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- <!--<li><a href=\"./recentchanges/\">RecentChanges</a></li>-->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- -->
+ remote: <!-- </ul> -->
+ remote: <!-- </div> -->
+ remote: <!-- -->
+ remote:
+ remote:
+ remote:
+ remote: </div>
+ remote:
+ remote:
+ remote:
+ remote: <div id=\"pagebody\">
+ remote:
+ remote: <div id=\"content\">
+ remote: <p class=\"error\">Error: \"do\" parameter missing
+ remote: </p>
+ remote: </div>
+ remote:
+ remote:
+ remote:
+ remote: </div>
+ remote:
+ remote: <div id=\"footer\" class=\"pagefooter\">
+ remote:
+ remote: <!-- from Qazwsx XXX's Home Page -->
+ remote: </div>
+ remote:
+ remote: </div>
+ remote:
+ remote: </body>
+ remote: </html>
+"""]]
diff --git a/doc/forum/Git_push_failure/comment_3_b55a749dcfc22a5c01a590836cf3af02._comment b/doc/forum/Git_push_failure/comment_3_b55a749dcfc22a5c01a590836cf3af02._comment
new file mode 100644
index 000000000..8ca964ce9
--- /dev/null
+++ b/doc/forum/Git_push_failure/comment_3_b55a749dcfc22a5c01a590836cf3af02._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlobQ5j7hQVIGkwMWW3yKB_DWqthJcpnsQ"
+ nickname="Qi"
+ subject="comment 3"
+ date="2015-03-10T06:09:10Z"
+ content="""
+See [here](http://pastebin.com/sBZvFYNp) for the complete console output when I ran `git push`.
+"""]]
diff --git a/doc/forum/Git_push_failure/comment_4_add17d4171ad631369dad84a673f5e09._comment b/doc/forum/Git_push_failure/comment_4_add17d4171ad631369dad84a673f5e09._comment
new file mode 100644
index 000000000..b97f63bc6
--- /dev/null
+++ b/doc/forum/Git_push_failure/comment_4_add17d4171ad631369dad84a673f5e09._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 4"
+ date="2015-03-10T08:56:46Z"
+ content="""
+It looks as though either your git hook is running ikiwiki with '--cgi', or you have
+`cgi: true` (or equivalent Perl) in the setup file, or you generated the git hook using
+`ikiwiki ... --cgi --wrappers` or similar. This is not correct: `cgi: true` does not
+mean \"enable CGI\", it means \"always run in CGI mode\", which is not what is desired.
+"""]]
diff --git a/doc/forum/Git_push_failure/comment_5_87b05d66a30ab52f22c6167b2bad0654._comment b/doc/forum/Git_push_failure/comment_5_87b05d66a30ab52f22c6167b2bad0654._comment
new file mode 100644
index 000000000..e5095be18
--- /dev/null
+++ b/doc/forum/Git_push_failure/comment_5_87b05d66a30ab52f22c6167b2bad0654._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlobQ5j7hQVIGkwMWW3yKB_DWqthJcpnsQ"
+ nickname="Qi"
+ subject="comment 5"
+ date="2015-03-10T15:40:34Z"
+ content="""
+After fixing cgi config
+
+ git_wrapper: '/home/qazwsx/space-pages/repo.git/hooks/post-update'
+ cgi_wrapper: '/home/qazwsx/public_html/space-pages/ikiwiki.cgi'
+
+, rebuilding, modifying some .md file, git commit & push, it now works.
+
+The git wrapper is the executable that lives in your git repository, and is used to accept git pushes. The cgi wrapper is the executable that is visible by your web server, and is run by the web server when requests come in from the web
+"""]]
diff --git a/doc/forum/How_to_allow_.markdown_and_.md_at_the_same_time_as_valid_extensions_for_source_files__63__.mdwn b/doc/forum/How_to_allow_.markdown_and_.md_at_the_same_time_as_valid_extensions_for_source_files__63__.mdwn
index d5f144957..79fbcfe67 100644
--- a/doc/forum/How_to_allow_.markdown_and_.md_at_the_same_time_as_valid_extensions_for_source_files__63__.mdwn
+++ b/doc/forum/How_to_allow_.markdown_and_.md_at_the_same_time_as_valid_extensions_for_source_files__63__.mdwn
@@ -1 +1,24 @@
How to allow .markdown and .md (at the same time) as valid extensions for source files? The default is .mdwn.
+
+> Add `md` to your `add_plugins`, set `libdir` if not already set,
+> put the following in `${libdir}/IkiWiki/Plugin/md.pm`, and rebuild:
+
+ #!/usr/bin/perl
+ package IkiWiki::Plugin::md;
+
+ use warnings;
+ use strict;
+ use IkiWiki 3.00;
+
+ my @ADDITIONAL_EXTENSIONS = qw(md markdown);
+
+ sub import {
+ IkiWiki::loadplugin('mdwn');
+ foreach my $ext (@ADDITIONAL_EXTENSIONS) {
+ hook(type => "htmlize", id => $ext, call => \&IkiWiki::Plugin::mdwn::htmlize, longname => "Markdown (.$ext)");
+ }
+ }
+
+ 1
+
+> --[[schmonz]]
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d974f6ba4..24c1af8f2 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -147,7 +147,6 @@ Personal sites and blogs
* [[Simon_McVittie|smcv]]'s [website](http://www.pseudorandom.co.uk/) and
[blog](http://smcv.pseudorandom.co.uk/)
* Svend's [website](http://ciffer.net/~svend/) and [blog](http://ciffer.net/~svend/blog/)
-* [muammar's site](http://muammar.me)
* [Per Bothner's blog](http://per.bothner.com/blog/)
* [Bernd Zeimetz (bzed)](http://bzed.de/)
* [Gaudenz Steinlin](http://gaudenz.durcheinandertal.ch)
diff --git a/doc/forum/Asciidoc_plugin.mdwn b/doc/plugins/contrib/asciidoc.mdwn
index 57d6fd91e..fe25e2771 100644
--- a/doc/forum/Asciidoc_plugin.mdwn
+++ b/doc/plugins/contrib/asciidoc.mdwn
@@ -1,4 +1,7 @@
-I have completely overhauled the Asciidoc plugin for ikiwiki that was created by [[Karl Mowson|http://www.mowson.org/karl/colophon/]]. The source can be downloaded from my [[Dropbox|http://dl.dropbox.com/u/11256359/asciidoc.pm]].
+[[!template id=plugin name=asciidoc author="Karl Mowson, GEychaner"]]
+[[!tag type/format]]
+
+I have [completely overhauled](https://groups.google.com/forum/#!topic/asciidoc/vwS1Vijv4hQ) the Asciidoc plugin for ikiwiki that was created by [[Karl Mowson|http://www.mowson.org/karl/colophon/]]. The source can be downloaded from my [[Dropbox|http://dl.dropbox.com/u/11256359/asciidoc.pm]].
### Features
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index 50998e822..3a64c0fbe 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -719,3 +719,16 @@ that po might be replacing the only link on a page, in error?
>>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]]
>>>> Cherry-picked --[[Joey]]
+
+----
+# Failing to have currentlang being respected when using inline
+I am trying to wrap my head around l10n. Set up a test site, l10n is working fine.
+Now when inlining a bunch of pages, no matter what inline template I use all links are
+going to the master language, the slave being ignored on all levels I tried.
+
+Trying to use currentlang() inside the inline directive - I get no pages or links to pages at all.
+Turning meta title on slave translation pages on and of, no change.
+
+Can this be related to the templetes used by inline not being localized?
+
+Any hints wether I am currently running into some dead end with ikiwiki here would be greatly appreciated.
diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 04b3254f7..fac5c94cb 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -19,9 +19,9 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
## Non-public
-* At work, team documentation and project planning: product and sprint
- backlogs, burndown charts, release plans/procedures/announcements,
- aggregating feeds of shared interest, etc.
* On my laptop, personal to-do and scratch space
* [A small personal site](http://podcast.schmonz.com/) (happily hosted at
[Branchable](http://www.branchable.com/))
+* At a previous job, team documentation and project planning: product and sprint
+ backlogs, burndown charts, release plans/procedures/announcements,
+ aggregating feeds of shared interest, etc.
generated by cgit v1.2.3 (git 2.25.4) at 2024-06-29 05:37:22 +0000