]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)
12 files changed:
doc/bugs/Commonmark_support.mdwn [new file with mode: 0644]
doc/bugs/sessions.db_grows_big.mdwn [new file with mode: 0644]
doc/forum/Asciidoc_plugin.mdwn [deleted file]
doc/forum/Git_push_failure/comment_2_5e53d75ebf410ee2c3365595c7ecf246._comment [new file with mode: 0644]
doc/forum/Git_push_failure/comment_3_b55a749dcfc22a5c01a590836cf3af02._comment [new file with mode: 0644]
doc/forum/Git_push_failure/comment_4_add17d4171ad631369dad84a673f5e09._comment [new file with mode: 0644]
doc/forum/Git_push_failure/comment_5_87b05d66a30ab52f22c6167b2bad0654._comment [new file with mode: 0644]
doc/forum/How_to_allow_.markdown_and_.md_at_the_same_time_as_valid_extensions_for_source_files__63__.mdwn
doc/ikiwikiusers.mdwn
doc/plugins/contrib/asciidoc.mdwn [new file with mode: 0644]
doc/plugins/po/discussion.mdwn
doc/users/schmonz.mdwn

diff --git a/doc/bugs/Commonmark_support.mdwn b/doc/bugs/Commonmark_support.mdwn
new file mode 100644 (file)
index 0000000..5ee014b
--- /dev/null
@@ -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 (file)
index 0000000..6c06be4
--- /dev/null
@@ -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/Asciidoc_plugin.mdwn b/doc/forum/Asciidoc_plugin.mdwn
deleted file mode 100644 (file)
index 57d6fd9..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-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]].
-
-### Features
-
-* Uses a filter hook to escape WikiLinks and Directives using Asciidoc `+++` passthrough macros, to avoid them being processed by Asciidoc. This behavior is configurable in the wiki setup file.
-* Adds a preprocessor directive 'asciidoc' which allows extra Asciidoc command-line options to be passed on a per-page basis. Each parameter name is the option name (the leading `--` will be inserted automatically), and the parameter value is the option value. Currently, only 'conf-file' and 'doctype' are allowed (or even useful).
-* Sets the page title from the first line in the Asciidoc file using a meta directive. This behavior is configurable in the wiki setup file.
-* Searches for an Asciidoc configuration file named the same as the wiki if none is specified in the setup file.
-* Asciidoc configuration files are stored in the wiki. They should be named `._conf` to avoid publishing them.
-
-### Problems
-
-* Escaping Directives is not optimal. It prevents markup from being used in Directives, and the passthrough macros have to include extra spaces to avoid having directives that return an empty string collapse to `++++++`. In addition, I had to borrow the regexps from the Ikiwiki source code; it would be nice if this were available as part of the API.
-* Handling of Asciidoc errors is suboptimal; they are simply inserted into the returned page.  This could be fixed in Perl 5.12 by using the run_forked() in IPC::Cmd.
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 (file)
index 0000000..2439f57
--- /dev/null
@@ -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 (file)
index 0000000..8ca964c
--- /dev/null
@@ -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 (file)
index 0000000..b97f63b
--- /dev/null
@@ -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 (file)
index 0000000..e5095be
--- /dev/null
@@ -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
+"""]]
index d5f144957184acbaa9dd1082f35df1aaf4890212..79fbcfe672baeb799c73bfcf69a18c29040bcfea 100644 (file)
@@ -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]]
index d974f6ba44ca8a593da6507621553c0dbf19875d..24c1af8f288d4e0f058d177b863699fdbd37c2ca 100644 (file)
@@ -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/plugins/contrib/asciidoc.mdwn b/doc/plugins/contrib/asciidoc.mdwn
new file mode 100644 (file)
index 0000000..fe25e27
--- /dev/null
@@ -0,0 +1,17 @@
+[[!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
+
+* Uses a filter hook to escape WikiLinks and Directives using Asciidoc `+++` passthrough macros, to avoid them being processed by Asciidoc. This behavior is configurable in the wiki setup file.
+* Adds a preprocessor directive 'asciidoc' which allows extra Asciidoc command-line options to be passed on a per-page basis. Each parameter name is the option name (the leading `--` will be inserted automatically), and the parameter value is the option value. Currently, only 'conf-file' and 'doctype' are allowed (or even useful).
+* Sets the page title from the first line in the Asciidoc file using a meta directive. This behavior is configurable in the wiki setup file.
+* Searches for an Asciidoc configuration file named the same as the wiki if none is specified in the setup file.
+* Asciidoc configuration files are stored in the wiki. They should be named `._conf` to avoid publishing them.
+
+### Problems
+
+* Escaping Directives is not optimal. It prevents markup from being used in Directives, and the passthrough macros have to include extra spaces to avoid having directives that return an empty string collapse to `++++++`. In addition, I had to borrow the regexps from the Ikiwiki source code; it would be nice if this were available as part of the API.
+* Handling of Asciidoc errors is suboptimal; they are simply inserted into the returned page.  This could be fixed in Perl 5.12 by using the run_forked() in IPC::Cmd.
index 50998e822daed616bf5a206d1800ff4d8f338fa2..3a64c0fbe03aa0a441ed5f32f9eac6984491df55 100644 (file)
@@ -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.
index 04b3254f71b4bc1f87ad292f1e7ff195dd3e7226..fac5c94cb9bf57feddb23b6c7e0d21c8b4847cfc 100644 (file)
@@ -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.