From 9a6a28512025c91b7518d8c9b69678e124c44128 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 18 Mar 2010 22:33:18 +0000 Subject: corrected the update-the-laptop-from-the-server section --- doc/tips/laptop_wiki_with_git.mdwn | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn index 85e26c729..857083325 100644 --- a/doc/tips/laptop_wiki_with_git.mdwn +++ b/doc/tips/laptop_wiki_with_git.mdwn @@ -68,5 +68,12 @@ used by the ikiwiki CGI, and another which you can use for updating via git). When you want to update the server from the laptop, do a `git push` from -within the laptop's bare repository, and likewise do a `git pull` to update -the laptop from the server. +within the laptop's bare repository. + +To update the laptop from the server, add a section for the laptop to the config file of the server's bare repository: + + [remote "laptop"] + fetch = +refs/*:refs/* + url = me@laptop:/path/to/bare/repository + +Then do a `git push laptop` from within the server's bare repository. -- cgit v1.2.3 From deb3cd8c490f1a6b615366beaa1b5d736f825c59 Mon Sep 17 00:00:00 2001 From: haho Date: Thu, 18 Mar 2010 23:39:42 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index aef928d8e..8a6780741 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -77,4 +77,5 @@ bar Hmm, can I dig it? Test +test2 -- cgit v1.2.3 From fe86a91ffe4e26d59e1e64ae8a00285d1bf09d4a Mon Sep 17 00:00:00 2001 From: haho Date: Thu, 18 Mar 2010 23:43:04 +0000 Subject: --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 8a6780741..8cba8973f 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -3,7 +3,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v # Header -## Subheader +## Subheader2 > This is a blockquote. > -- cgit v1.2.3 From 4f4e09f925344940876c2e62de1e89e55ea1650e Mon Sep 17 00:00:00 2001 From: p4f Date: Fri, 19 Mar 2010 00:56:27 +0000 Subject: --- doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn index 0b370473e..036fe0d44 100644 --- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn +++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn @@ -24,3 +24,9 @@ Pab > push changes from your local git to git on the remote host to update the > wiki. [[tips/Laptop_wiki_with_git]] explains one way to do that. > --[[Joey]] + +Thanks a lot for your answer. +rsync plugin would be perfect but... how would i manage blog post? +I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? + +Pab -- cgit v1.2.3 From f54b5f583dfcb1f908b33d1687782ce8a2bfb30d Mon Sep 17 00:00:00 2001 From: p4f Date: Fri, 19 Mar 2010 00:57:03 +0000 Subject: --- doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn index 036fe0d44..5dcd01619 100644 --- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn +++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn @@ -27,6 +27,4 @@ Pab Thanks a lot for your answer. rsync plugin would be perfect but... how would i manage blog post? -I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? - -Pab +I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab -- cgit v1.2.3 From 2c310f8349182ca155a8cad1d8454f9937e87527 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 19 Mar 2010 01:09:44 +0000 Subject: comment about comments --- doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn index 5dcd01619..473b06b39 100644 --- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn +++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn @@ -28,3 +28,5 @@ Pab Thanks a lot for your answer. rsync plugin would be perfect but... how would i manage blog post? I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab + +> If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments. Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]] -- cgit v1.2.3 From eef4768d2d277925b42de8efda576b00cf64bee8 Mon Sep 17 00:00:00 2001 From: p4f Date: Fri, 19 Mar 2010 07:57:40 +0000 Subject: --- doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn index 473b06b39..1c0f8f561 100644 --- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn +++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn @@ -30,3 +30,6 @@ rsync plugin would be perfect but... how would i manage blog post? I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab > If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments. Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]] + +Ok, i understand, thanks. +Is there any hosting service that permits to have a full installation of iwkiwiki or i am forced to get a vps or to mantain a personal server for that? --Pab -- cgit v1.2.3 From 96a54b35fe2cdcdc1450b5d38c80e7b27b428c14 Mon Sep 17 00:00:00 2001 From: kierun Date: Fri, 19 Mar 2010 15:45:26 +0000 Subject: --- doc/todo/ACL.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn index cac6c9f18..dd9793233 100644 --- a/doc/todo/ACL.mdwn +++ b/doc/todo/ACL.mdwn @@ -93,3 +93,6 @@ Any idea when this is going to be finished? If you want, I am happy to beta tes >>> I don't believe this is currently possible. What is missing is the concept >>> of page 'ownership'. -- [[Jon]] + +>>>> GAH! That is really a shame... Any chance of adding that? No, I do not really expect it to be added, after all my requirements are pushing the boundary of what a wikiwiki + should be. Nonetheless, thanks for your help! -- cgit v1.2.3