From d5aa6e140a5c83300033bb94a9e61b952b929dbd Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Thu, 5 Apr 2012 14:35:26 -0400 Subject: [PATCH 01/10] Added a comment --- .../comment_1_158fbcef24d20920c40968da8f10442a._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/howto_install_the_pagedown_plugin/comment_1_158fbcef24d20920c40968da8f10442a._comment diff --git a/doc/forum/howto_install_the_pagedown_plugin/comment_1_158fbcef24d20920c40968da8f10442a._comment b/doc/forum/howto_install_the_pagedown_plugin/comment_1_158fbcef24d20920c40968da8f10442a._comment new file mode 100644 index 000000000..3985a797d --- /dev/null +++ b/doc/forum/howto_install_the_pagedown_plugin/comment_1_158fbcef24d20920c40968da8f10442a._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2012-04-05T18:35:25Z" + content=""" +See [[plugins/install]] +"""]] From 4f14decf41102de3b5485992f306fb1b661ad915 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 5 Apr 2012 22:11:52 -0400 Subject: [PATCH 02/10] rename tips/convert_MoinMoin_to_ikiwiki.mdwn to tips/convert_moinmoin_to_ikiwiki.mdwn --- ..._MoinMoin_to_ikiwiki.mdwn => convert_moinmoin_to_ikiwiki.mdwn} | 0 .../discussion.mdwn | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename doc/tips/{convert_MoinMoin_to_ikiwiki.mdwn => convert_moinmoin_to_ikiwiki.mdwn} (100%) rename doc/tips/{convert_MoinMoin_to_ikiwiki => convert_moinmoin_to_ikiwiki}/discussion.mdwn (100%) diff --git a/doc/tips/convert_MoinMoin_to_ikiwiki.mdwn b/doc/tips/convert_moinmoin_to_ikiwiki.mdwn similarity index 100% rename from doc/tips/convert_MoinMoin_to_ikiwiki.mdwn rename to doc/tips/convert_moinmoin_to_ikiwiki.mdwn diff --git a/doc/tips/convert_MoinMoin_to_ikiwiki/discussion.mdwn b/doc/tips/convert_moinmoin_to_ikiwiki/discussion.mdwn similarity index 100% rename from doc/tips/convert_MoinMoin_to_ikiwiki/discussion.mdwn rename to doc/tips/convert_moinmoin_to_ikiwiki/discussion.mdwn From 0c26a5048d02f78bef908965164fec4592ca0606 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 5 Apr 2012 22:11:53 -0400 Subject: [PATCH 03/10] update for rename of tips/convert_MoinMoin_to_ikiwiki.mdwn to tips/convert_moinmoin_to_ikiwiki.mdwn --- doc/users/joshtriplett/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/users/joshtriplett/discussion.mdwn b/doc/users/joshtriplett/discussion.mdwn index 100e1a324..bbe0ed7c1 100644 --- a/doc/users/joshtriplett/discussion.mdwn +++ b/doc/users/joshtriplett/discussion.mdwn @@ -65,4 +65,4 @@ Moin version is 1.8.5 Help please! -> Please take a look at [[tips/Convert_MoinMoin_to_ikiwiki]] again, the code has radically changed and should now be easier to use *and* work with 1.8.x. --[[anarcat]] +> Please take a look at [[tips/Convert_moinmoin_to_ikiwiki]] again, the code has radically changed and should now be easier to use *and* work with 1.8.x. --[[anarcat]] From bb6cffda4cadf06eb968872c7fcad716d81c68d3 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 5 Apr 2012 22:11:53 -0400 Subject: [PATCH 04/10] update for rename of tips/convert_MoinMoin_to_ikiwiki.mdwn to tips/convert_moinmoin_to_ikiwiki.mdwn --- doc/convert.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/convert.mdwn b/doc/convert.mdwn index 9e2409d71..602cf8dbb 100644 --- a/doc/convert.mdwn +++ b/doc/convert.mdwn @@ -3,7 +3,7 @@ to convert it to ikiwiki? Various tools and techniques have been developed to handle such conversions. * [[tips/convert_mediawiki_to_ikiwiki]] -* [[tips/Convert_MoinMoin_to_ikiwiki]] +* [[tips/Convert_moinmoin_to_ikiwiki]] * [[tips/convert_blogger_blogs_to_ikiwiki]] In addition, [[JoshTriplett]] has written scripts to convert Twiki sites, see [his page](/users/JoshTriplett) for more information. From 08dbc10eb77d4eecbadb5ca5d8c4b9e03b667fae Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 5 Apr 2012 22:13:05 -0400 Subject: [PATCH 05/10] fix link after rename --- doc/convert.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/convert.mdwn b/doc/convert.mdwn index 602cf8dbb..fd4fbeac3 100644 --- a/doc/convert.mdwn +++ b/doc/convert.mdwn @@ -3,7 +3,7 @@ to convert it to ikiwiki? Various tools and techniques have been developed to handle such conversions. * [[tips/convert_mediawiki_to_ikiwiki]] -* [[tips/Convert_moinmoin_to_ikiwiki]] +* [[tips/convert_moinmoin_to_ikiwiki]] * [[tips/convert_blogger_blogs_to_ikiwiki]] In addition, [[JoshTriplett]] has written scripts to convert Twiki sites, see [his page](/users/JoshTriplett) for more information. From 84c4ca3343663425d9a3105dfb82637b79ec1c04 Mon Sep 17 00:00:00 2001 From: jamescooper Date: Fri, 6 Apr 2012 07:28:37 -0400 Subject: [PATCH 06/10] --- doc/setup.mdwn | 147 +------------------------------------------------ 1 file changed, 2 insertions(+), 145 deletions(-) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ce51faa6d..90e472a4a 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -1,145 +1,2 @@ -This tutorial will walk you through setting up a wiki with ikiwiki. - -[[!toc ]] - -## Install ikiwiki - -If you're using Debian or Ubuntu, ikiwiki is an apt-get install ikiwiki away. -If you're not, see the [[download]] and [[install]] pages. - -## Create your wiki - -All it takes to create a fully functional wiki using ikiwiki is running -one command. -[[!template id=note text=""" -For more control, advanced users may prefer to set up a wiki -[[by_hand|byhand]]. -"""]] - - % ikiwiki --setup /etc/ikiwiki/auto.setup - -Or, set up a blog with ikiwiki, run this command instead. - - % ikiwiki --setup /etc/ikiwiki/auto-blog.setup - -`librpc-xml-perl` and `python-docutils` dependencies are needed. - -Either way, it will ask you a couple of questions. - - What will the wiki be named? foo - What revision control system to use? git - What wiki user (or openid) will be admin? joey - Choose a password: - -Then, wait for it to tell you an url for your new site.. - - Successfully set up foo: - url: http://example.com/~joey/foo - srcdir: ~/foo - destdir: ~/public_html/foo - repository: ~/foo.git - To modify settings, edit ~/foo.setup and then run: - ikiwiki --setup ~/foo.setup - -Done! - -## Using the web interface - -Now you can go to the url it told you, and edit pages in your new wiki -using the web interface. - -(If the web interface doesn't seem to allow editing or login, you may -need to [[configure_the_web_server|tips/dot_cgi]].) - -## Checkout and edit wiki source - -Part of the fun of using ikiwiki is not being limited to using the -web for editing pages, and instead using your favorite text editor and -[[Revision_Control_System|rcs]]. - -To do this, you need to check out a copy of the source to your wiki. -(You should avoid making changes directly to the `srcdir`, as that -checkout is reserved for use by ikiwiki itself.) - -Depending on which [[Revision_Control_System|rcs]] you chose to use, -you can run one of these commands to check out your own copy of your wiki's -source. (Remember to replace "foo" with the real directory name.) - - git clone foo.git foo.src - svn checkout file://`pwd`/foo.svn/trunk foo.src - cvs -d `pwd`/foo get -P ikiwiki - bzr clone foo foo.src - hg clone foo foo.src - darcs get foo.darcs foo.src - # TODO monotone, tla - -Now to edit pages by hand, go into the directory you checked out (ie, -"foo.src"), and fire up your text editor to edit `index.mdwn` or whatever -other page you want to edit. If you chose to set up a blog, there is even a -sample first post in `posts/first_post.mdwn` that you can edit. - -Once you've edited a page, use your revision control system to commit -the changes. For distributed revision control systems, don't forget to push -your commit. - -Once the commit reaches the repository, ikiwiki will notice it, and -automatically update the wiki with your changes. - -## Customizing the wiki - -There are lots of things you can configure to customize your wiki. -These range from changing the wiki's name, to enabling [[plugins]], -to banning users and locking pages. - -If you log in as the admin user you configured earlier, and go to -your Preferences page, you can click on "Setup" to customize many -wiki settings and plugins. - -Some settings cannot be configured on the web, for security reasons or -because misconfiguring them could break the wiki. To change these settings, -you can manually edit the setup file, which is named something like -"foo.setup". The file lists all available configuration settings -and gives a brief description of each. - -After making changes to this file, you need to tell ikiwiki to use it: - - % ikiwiki --setup foo.setup - -Alternatively, you can ask ikiwiki to change settings in the file for you: - - % ikiwiki --changesetup foo.setup --plugin goodstuff - -See [[usage]] for more options. - -## Customizing file locations - -As a wiki compiler, ikiwiki builds a wiki from files in a source directory, -and outputs the files to a destination directory. The source directory is -a working copy checked out from the version control system repository. - -When you used `auto.setup`, ikiwiki put the source directory, destination -directory, and repository in your home directory, and told you the location -of each. Those locations were chosen to work without customization, but you -might want to move them to different directories. - -First, move the destination directory and repository around. - - % mv public_html/foo /srv/web/foo.com - % mv foo.git /srv/git/foo.git - -If you moved the repository to a new location, checkouts pointing at the -old location won't work, and the easiest way to deal with this is to delete -them and re-checkout from the new repository location. - - % rm -rf foo - % git clone /srv/git/foo.git - -Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`, -`url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where -you moved things. Remember to run `ikiwiki --setup` after editing the -setup file. - -## Enjoy your new wiki! - -Add yourself to [[IkiWikiUsers]]. And check out -the [[tips]] to find out how to get more out of ikiwiki. +Google Maps (formerly Google Local) is a webGoogle Maps mapping service application and technology provided by Google, that powers many map-based services, including the website, Google Ride Finder, Google Transit,[1] and maps embedded on third-party websites via the Google Maps API.[2] It offers street maps, a route planner for traveling by foot, car, bike (beta), kayak,[3] or public transport and an urban business locator for numerous countries around the world. Google Maps satellite images are not updated in real time; they are several months or years old. +Google Maps uses a close variant of the Mercator projection, so it cannot show areas around the poles. A related product is Google Earth, a stand-alone program which offers more globe-viewing features, including showing polar areas. From 68f91e2523ed5bcdaddf47429a5f86fe5d2d76c9 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 6 Apr 2012 10:40:46 -0400 Subject: [PATCH 07/10] This reverts commit 84c4ca3343663425d9a3105dfb82637b79ec1c04 --- doc/setup.mdwn | 147 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 2 deletions(-) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 90e472a4a..ce51faa6d 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -1,2 +1,145 @@ -Google Maps (formerly Google Local) is a webGoogle Maps mapping service application and technology provided by Google, that powers many map-based services, including the website, Google Ride Finder, Google Transit,[1] and maps embedded on third-party websites via the Google Maps API.[2] It offers street maps, a route planner for traveling by foot, car, bike (beta), kayak,[3] or public transport and an urban business locator for numerous countries around the world. Google Maps satellite images are not updated in real time; they are several months or years old. -Google Maps uses a close variant of the Mercator projection, so it cannot show areas around the poles. A related product is Google Earth, a stand-alone program which offers more globe-viewing features, including showing polar areas. +This tutorial will walk you through setting up a wiki with ikiwiki. + +[[!toc ]] + +## Install ikiwiki + +If you're using Debian or Ubuntu, ikiwiki is an apt-get install ikiwiki away. +If you're not, see the [[download]] and [[install]] pages. + +## Create your wiki + +All it takes to create a fully functional wiki using ikiwiki is running +one command. +[[!template id=note text=""" +For more control, advanced users may prefer to set up a wiki +[[by_hand|byhand]]. +"""]] + + % ikiwiki --setup /etc/ikiwiki/auto.setup + +Or, set up a blog with ikiwiki, run this command instead. + + % ikiwiki --setup /etc/ikiwiki/auto-blog.setup + +`librpc-xml-perl` and `python-docutils` dependencies are needed. + +Either way, it will ask you a couple of questions. + + What will the wiki be named? foo + What revision control system to use? git + What wiki user (or openid) will be admin? joey + Choose a password: + +Then, wait for it to tell you an url for your new site.. + + Successfully set up foo: + url: http://example.com/~joey/foo + srcdir: ~/foo + destdir: ~/public_html/foo + repository: ~/foo.git + To modify settings, edit ~/foo.setup and then run: + ikiwiki --setup ~/foo.setup + +Done! + +## Using the web interface + +Now you can go to the url it told you, and edit pages in your new wiki +using the web interface. + +(If the web interface doesn't seem to allow editing or login, you may +need to [[configure_the_web_server|tips/dot_cgi]].) + +## Checkout and edit wiki source + +Part of the fun of using ikiwiki is not being limited to using the +web for editing pages, and instead using your favorite text editor and +[[Revision_Control_System|rcs]]. + +To do this, you need to check out a copy of the source to your wiki. +(You should avoid making changes directly to the `srcdir`, as that +checkout is reserved for use by ikiwiki itself.) + +Depending on which [[Revision_Control_System|rcs]] you chose to use, +you can run one of these commands to check out your own copy of your wiki's +source. (Remember to replace "foo" with the real directory name.) + + git clone foo.git foo.src + svn checkout file://`pwd`/foo.svn/trunk foo.src + cvs -d `pwd`/foo get -P ikiwiki + bzr clone foo foo.src + hg clone foo foo.src + darcs get foo.darcs foo.src + # TODO monotone, tla + +Now to edit pages by hand, go into the directory you checked out (ie, +"foo.src"), and fire up your text editor to edit `index.mdwn` or whatever +other page you want to edit. If you chose to set up a blog, there is even a +sample first post in `posts/first_post.mdwn` that you can edit. + +Once you've edited a page, use your revision control system to commit +the changes. For distributed revision control systems, don't forget to push +your commit. + +Once the commit reaches the repository, ikiwiki will notice it, and +automatically update the wiki with your changes. + +## Customizing the wiki + +There are lots of things you can configure to customize your wiki. +These range from changing the wiki's name, to enabling [[plugins]], +to banning users and locking pages. + +If you log in as the admin user you configured earlier, and go to +your Preferences page, you can click on "Setup" to customize many +wiki settings and plugins. + +Some settings cannot be configured on the web, for security reasons or +because misconfiguring them could break the wiki. To change these settings, +you can manually edit the setup file, which is named something like +"foo.setup". The file lists all available configuration settings +and gives a brief description of each. + +After making changes to this file, you need to tell ikiwiki to use it: + + % ikiwiki --setup foo.setup + +Alternatively, you can ask ikiwiki to change settings in the file for you: + + % ikiwiki --changesetup foo.setup --plugin goodstuff + +See [[usage]] for more options. + +## Customizing file locations + +As a wiki compiler, ikiwiki builds a wiki from files in a source directory, +and outputs the files to a destination directory. The source directory is +a working copy checked out from the version control system repository. + +When you used `auto.setup`, ikiwiki put the source directory, destination +directory, and repository in your home directory, and told you the location +of each. Those locations were chosen to work without customization, but you +might want to move them to different directories. + +First, move the destination directory and repository around. + + % mv public_html/foo /srv/web/foo.com + % mv foo.git /srv/git/foo.git + +If you moved the repository to a new location, checkouts pointing at the +old location won't work, and the easiest way to deal with this is to delete +them and re-checkout from the new repository location. + + % rm -rf foo + % git clone /srv/git/foo.git + +Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`, +`url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where +you moved things. Remember to run `ikiwiki --setup` after editing the +setup file. + +## Enjoy your new wiki! + +Add yourself to [[IkiWikiUsers]]. And check out +the [[tips]] to find out how to get more out of ikiwiki. From f5f41fa59af064ce3d5e038154950aefdc8d6f65 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 6 Apr 2012 10:46:24 -0400 Subject: [PATCH 08/10] fixed at some point? --- ...centchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn index bf311c198..fadf289df 100644 --- a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn +++ b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn @@ -1,3 +1,6 @@ in ikiwiki instances that don't reside in the git root directory (the only ones i know of are ikiwiki itself), reverts show the wrong link in the recentchanges (for example, in the ikiwiki main repository's 4530430 and its revert, the main index page was edited, but the revert shows doc/index as a link). the expected behavior is to compensate for the modified root directory (i.e., show index instead of doc/index). + +> This seems to work OK now - commit 84c4ca33 and its reversion both +> appear correctly in [[recentchanges]]. --[[smcv]] From 3a19fb2c6bb53b02fe0b8a1a9cf61b8ce26bc831 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 6 Apr 2012 12:12:13 -0400 Subject: [PATCH 09/10] close --- ...entchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn index fadf289df..5f7450b79 100644 --- a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn +++ b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn @@ -3,4 +3,6 @@ in ikiwiki instances that don't reside in the git root directory (the only ones the expected behavior is to compensate for the modified root directory (i.e., show index instead of doc/index). > This seems to work OK now - commit 84c4ca33 and its reversion both -> appear correctly in [[recentchanges]]. --[[smcv]] +> appear correctly in [[recentchanges]]. Looking at git history, +> Joey [[fixed this|done]] in commit 1b6c1895 before 3.20120203. +> --[[smcv]] From 66fa5826f35aaa2b609bb86f67c3df887bad1e09 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 6 Apr 2012 12:27:17 -0400 Subject: [PATCH 10/10] a branch to change pagenames semantics exists --- ..._pages_in_inline_pagenames_do_not_add_a_dependency.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn b/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn index c2f560e64..70b06a951 100644 --- a/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn +++ b/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn @@ -33,3 +33,10 @@ I think the presence dependency is probably the cleanest approach? > I think it was possibly a mistake to use wikilink style lookup for > `pagenames`. --[[Joey]] + +[[!tag patch]] [[!template id=gitbranch branch=smcv/literal-pagenames author="[[smcv]]"]] +>> I used the linking rules to make references to +>> "nearby" pages convenient, but if you'd prefer "absolute" +>> semantics, my `ready/literal-pagenames` branch does that. For +>> my main use-case for `pagenames` ([[plugins/contrib/album]]) +>> it's fine either way. --[[smcv]]