From 317695f24f664f48ede0903713259e10da4c68de Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 9 Jan 2009 15:34:54 +0100 Subject: Enhance the colophon a bit. --- about_the_twiki_to_ikiwiki_conversion.mdwn | 107 --------------------- colophon.mdwn | 55 ++++++----- .../about_the_twiki_to_ikiwiki_conversion.mdwn | 107 +++++++++++++++++++++ 3 files changed, 140 insertions(+), 129 deletions(-) delete mode 100644 about_the_twiki_to_ikiwiki_conversion.mdwn create mode 100644 colophon/about_the_twiki_to_ikiwiki_conversion.mdwn diff --git a/about_the_twiki_to_ikiwiki_conversion.mdwn b/about_the_twiki_to_ikiwiki_conversion.mdwn deleted file mode 100644 index 8c556261..00000000 --- a/about_the_twiki_to_ikiwiki_conversion.mdwn +++ /dev/null @@ -1,107 +0,0 @@ -[[meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]] - -[[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable -id="license" text="Permission is granted to copy, distribute and/or modify this -document under the terms of the GNU Free Documentation License, Version 1.2 or -any later version published by the Free Software Foundation; with no Invariant -Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license -is included in the section entitled -[[GNU_Free_Documentation_License|/fdl]]."]]"""]] - -# Some Quick Notes About the *TWiki to ikiwiki* Conversion - -/!\ Incomplete. - -I saw a *moin2iki* program bundle being announced from -. - - JoshTriplett: On http://ikiwiki.info/users/joshtriplett.html - you write about a TWiki to ikiwiki conversion script. Is that already - available somewhere? - tschwinge: Yes, you can get it in its current state at - git://svcs.cs.pdx.edu/git/moin2iki.git - tschwinge: That repo has scripts for converting from Moin - and TWiki to ikiwiki. - tschwinge: Work in progress. - tschwinge: For a purely TWiki setup, it should work fine. - tschwinge: You need a number of depenencies, though, and we - haven't documented them well yet. - JoshTriplett: Thanks, I'll have a look and report back (in some - days, I hope). - tschwinge: In particular, you need HTML::WikiConverter with - our 12 ikiwiki-related patches. - tschwinge: - http://rt.cpan.org/Public/Bug/Display.html?id=24446 - -As I had difficulties with extracting the patches from the cpan site, they were -also made available by the authors at -. - -The Debian package *libhtml-wikiconverter-perl* is too old at least until -[[debbug 419918]] is closed. - -For converting from rcs files (as used by TWiki) to a git repository you'll -need to get `git clone git://people.freedesktop.org/~keithp/parsecvs` and build -it. Or don't do that and install the Debian *git-cvs* package instead; see -below. - -Here is the command line I used (line breaks added for readability) to create -an *Authors* file from the TWiki files, suitable for *parsecvs* or -*git-cvsimport* to use: - - $ sort < data/Main/TWikiUsers.txt | uniq | ↩ - while read s n r; do ↩ - ( [ "$s" != \* ] || expr "$r" : .\*\< > /dev/null) && continue; ↩ - echo "$n"="$(recode Latin1..UTF-8 < data/Main/"$n".txt | ↩ - awk -v name="$n" 'BEGIN { FS = ": "; email = "web-hurd@gnu.org" } ↩ - { sub("\r$", "") } $1 ~ /\* Name$/ { name = $2 } ↩ - $1 ~ /\* Email$/ { email = $2 } ↩ - END { print name " <" email ">" }')"; ↩ - done | tee Authors - -The old TWiki installation had managed to corrupt one of its own rcs files, -which both *parsecvs* and *git-cvsimport* stumbled on. As that file was not -essential for me, I simply deleted it. - -The final output (after the TWiki markup to Markdown markup conversion) was -expected to pour out *.mdwn* files. However the original TWiki files are named -*.txt*. As the *git-map* step as yet (would this be possible at all?) has no -way to rename the files while converting, I simply adapted the input files' -names to what was expected: I ran a the following command to rename the -*.txt,v* files to *.mdwn,v* files before running *git-cvsimport*: - - $ find ./ | grep \\.txt,v | while read f; do ↩ - mv -vi "$f" "$(expr "$f" : \\\(.\*\\\)\\.txt,v)".mdwn,v; done - -Instead of using *parsecvs* (which finally even choked on the valid rcs input -files) I eventually ended up successfully converting the old TWiki with -*git-cvsimport*: - - $ git-cvsimport -v -d "`pwd`"/../hurd-wiki/ -z 0 -a -A ../Authors data - [...] - Committed patch 4698 (origin +0000 2007-04-13 17:40:08) - Commit ID c33d05d0274d0d602fba835805abb9ba413c65c6 - Generating pack... - Done counting 18576 objects. - Deltifying 18576 objects... - 100% (18576/18576) done - Writing 18576 objects... - 100% (18576/18576) done - Total 18576 (delta 12567), reused 16106 (delta 10886) - Pack pack-d38e3d55705f5d355f669aaa7d993420b50798d0 created. - Removing unused objects 100%... - Done. - DONE; creating master branch - -The only thing I had to do to make the conglomerate of rcs files a *valid* cvs -repository (read: to satisfy *git-cvsimport*'s needs) was a `mkdir -../hurd-wiki/CVSROOT`. - -Then let's convert the whole git tree from TWiki syntax to Markdown: - - $ TWIKI="`pwd`"/../hurd-wiki tw_2001-12-01_2iki "`pwd`"/.git - [...] - -After that I repeated -- in a separate directory!, they can be merged later -- -the same last steps again, replacing *data* with *pub*, which contains the data -files that had been attached to the wiki pages (like images, for example). diff --git a/colophon.mdwn b/colophon.mdwn index b51c2f36..9146bc15 100644 --- a/colophon.mdwn +++ b/colophon.mdwn @@ -1,5 +1,5 @@ -[[meta copyright="Copyright © 2003, 2004, 2007, 2008 Free Software Foundation, -Inc."]] +[[meta copyright="Copyright © 2003, 2004, 2007, 2008, 2009 Free Software +Foundation, Inc."]] [[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable id="license" text="Permission is granted to copy, distribute and/or modify this @@ -13,10 +13,23 @@ Just like a book, this topic is designed to help describe the tools used to create this website and what methods were used to give it its look and feel. -# Rev. I +What we see today is the junction of two different branches: the original +static HTML pages and the wiki pages. + +# Static HTML Pages + +In November 2008, the Hurd's old static web pages were merged into the wiki +pages' repository. After a lot of cleansing work, on 2008-11-22 the joined set +of pages was made available for serving the official GNU Hurd web appearance at +. + +# Wiki Pages + +## Rev. I We used a particular implementation (or clone) of Wiki software called -[TWiki](http://twiki.org). +[TWiki](http://twiki.org). The wiki was reachable at +`http://hurd.gnufans.org/`. A generic [WikiWikiWeb](http://www.c2.com/cgi/wiki?WelcomeVisitors), or simply Wiki, is _"a collaborative forum where people can share ideas and record any @@ -24,30 +37,28 @@ consensus reached on difficult issues, along with rebuttal. It changes as people come and go, as experience develops, and as opinions change." The TWiki software is an enhanced descendent of the original WikiWikiWeb_. -We used the [GNU Skin](http://twiki.org/cgi-bin/view/Plugins/GnuSkin) created -by our own Joachim Nilsson. +We used the [GNU Skin](http://twiki.org/cgi-bin/view/Plugins/GnuSkin). -This site began in May, 2002 as one TWiki web: *Hurd*. This WebHome page was +The site began in May 2002 as one TWiki web: *Hurd*. This WebHome page was used as the front page of the whole site. We grew this site and added more -TWiki webs by December, 2002. Due to the success of the site we had to act +TWiki webs by December 2002. Due to the success of the site we had to act with respect to more completely addressing copyright issues. More people started adding content. +The gnufans site's administrators would eventually step back from maintenance +of their wiki installation, so from roughly 2005 on, day-to-day tasks like +processing new user's registrations or spam removal would not be done in a +timely fashion anymore. In July 2006, the [slow burial of the Hurd +Wiki](http://lists.gnu.org/archive/html/bug-hurd/2006-07/msg00014.html) was +announced. ---- +## Rev. II -# Rev. II - -On 2007-08-12 [[Thomas_Schwinge|tschwinge]] finished the conversion of the -TWiki content to [ikiwiki](http://ikiwiki.info). Read +Considering this [from April 2006 on +already](http://lists.gnu.org/archive/html/web-hurd/2006-04/msg00000.html), on +2007-08-12 the conversion of the TWiki content to a format usable by +[ikiwiki](http://ikiwiki.info) was finally finished. Read [[about_the_twiki_to_ikiwiki_conversion]]. - ---- - -# Rev. III - -In November 2008, [[Thomas_Schwinge|tschwinge]] imported the Hurd's old static -web pages into this repository. After a lot of cleansing work, on 2008-11-22 -this repository's pages were installed as the official GNU Hurd web appearance -at . +This wiki instance is now running distributed over two GNU/Hurd machines, and +is also providing the content of the official GNU Hurd pages. diff --git a/colophon/about_the_twiki_to_ikiwiki_conversion.mdwn b/colophon/about_the_twiki_to_ikiwiki_conversion.mdwn new file mode 100644 index 00000000..8c556261 --- /dev/null +++ b/colophon/about_the_twiki_to_ikiwiki_conversion.mdwn @@ -0,0 +1,107 @@ +[[meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]] + +[[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable +id="license" text="Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no Invariant +Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license +is included in the section entitled +[[GNU_Free_Documentation_License|/fdl]]."]]"""]] + +# Some Quick Notes About the *TWiki to ikiwiki* Conversion + +/!\ Incomplete. + +I saw a *moin2iki* program bundle being announced from +. + + JoshTriplett: On http://ikiwiki.info/users/joshtriplett.html + you write about a TWiki to ikiwiki conversion script. Is that already + available somewhere? + tschwinge: Yes, you can get it in its current state at + git://svcs.cs.pdx.edu/git/moin2iki.git + tschwinge: That repo has scripts for converting from Moin + and TWiki to ikiwiki. + tschwinge: Work in progress. + tschwinge: For a purely TWiki setup, it should work fine. + tschwinge: You need a number of depenencies, though, and we + haven't documented them well yet. + JoshTriplett: Thanks, I'll have a look and report back (in some + days, I hope). + tschwinge: In particular, you need HTML::WikiConverter with + our 12 ikiwiki-related patches. + tschwinge: + http://rt.cpan.org/Public/Bug/Display.html?id=24446 + +As I had difficulties with extracting the patches from the cpan site, they were +also made available by the authors at +. + +The Debian package *libhtml-wikiconverter-perl* is too old at least until +[[debbug 419918]] is closed. + +For converting from rcs files (as used by TWiki) to a git repository you'll +need to get `git clone git://people.freedesktop.org/~keithp/parsecvs` and build +it. Or don't do that and install the Debian *git-cvs* package instead; see +below. + +Here is the command line I used (line breaks added for readability) to create +an *Authors* file from the TWiki files, suitable for *parsecvs* or +*git-cvsimport* to use: + + $ sort < data/Main/TWikiUsers.txt | uniq | ↩ + while read s n r; do ↩ + ( [ "$s" != \* ] || expr "$r" : .\*\< > /dev/null) && continue; ↩ + echo "$n"="$(recode Latin1..UTF-8 < data/Main/"$n".txt | ↩ + awk -v name="$n" 'BEGIN { FS = ": "; email = "web-hurd@gnu.org" } ↩ + { sub("\r$", "") } $1 ~ /\* Name$/ { name = $2 } ↩ + $1 ~ /\* Email$/ { email = $2 } ↩ + END { print name " <" email ">" }')"; ↩ + done | tee Authors + +The old TWiki installation had managed to corrupt one of its own rcs files, +which both *parsecvs* and *git-cvsimport* stumbled on. As that file was not +essential for me, I simply deleted it. + +The final output (after the TWiki markup to Markdown markup conversion) was +expected to pour out *.mdwn* files. However the original TWiki files are named +*.txt*. As the *git-map* step as yet (would this be possible at all?) has no +way to rename the files while converting, I simply adapted the input files' +names to what was expected: I ran a the following command to rename the +*.txt,v* files to *.mdwn,v* files before running *git-cvsimport*: + + $ find ./ | grep \\.txt,v | while read f; do ↩ + mv -vi "$f" "$(expr "$f" : \\\(.\*\\\)\\.txt,v)".mdwn,v; done + +Instead of using *parsecvs* (which finally even choked on the valid rcs input +files) I eventually ended up successfully converting the old TWiki with +*git-cvsimport*: + + $ git-cvsimport -v -d "`pwd`"/../hurd-wiki/ -z 0 -a -A ../Authors data + [...] + Committed patch 4698 (origin +0000 2007-04-13 17:40:08) + Commit ID c33d05d0274d0d602fba835805abb9ba413c65c6 + Generating pack... + Done counting 18576 objects. + Deltifying 18576 objects... + 100% (18576/18576) done + Writing 18576 objects... + 100% (18576/18576) done + Total 18576 (delta 12567), reused 16106 (delta 10886) + Pack pack-d38e3d55705f5d355f669aaa7d993420b50798d0 created. + Removing unused objects 100%... + Done. + DONE; creating master branch + +The only thing I had to do to make the conglomerate of rcs files a *valid* cvs +repository (read: to satisfy *git-cvsimport*'s needs) was a `mkdir +../hurd-wiki/CVSROOT`. + +Then let's convert the whole git tree from TWiki syntax to Markdown: + + $ TWIKI="`pwd`"/../hurd-wiki tw_2001-12-01_2iki "`pwd`"/.git + [...] + +After that I repeated -- in a separate directory!, they can be merged later -- +the same last steps again, replacing *data* with *pub*, which contains the data +files that had been attached to the wiki pages (like images, for example). -- cgit v1.2.3