diff --git a/software/cinit/speeches/2005-10-22.mdwn b/software/cinit/speeches/2005-10-22.mdwn
index ef68f252..342e4f22 100644
--- a/software/cinit/speeches/2005-10-22.mdwn
+++ b/software/cinit/speeches/2005-10-22.mdwn
@@ -1,27 +1,7 @@
-
-
-
-unix.schottelius.org
-
+[[!meta title="German speech at the Technophil weekend (2005-10-22)"]]
-
-Nico Schottelius
-
unix.schottelius.org
-
cinit
-
cinit speeches
-
-
-real life Speech
-2005-10-22: technophil weekend (in German)
-
-
-
This speech was hold in in Basel, Switzerland at the technophil
-weekend (a geekend)
-
-
-
+This speech was hold in in Basel, Switzerland at the technophil
+weekend (a geekend).
+
+* [[The speech (PDF format)|cinit.pdf]]
+ ([[LaTeX source|cinit.tex]])
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil-2005-10-22.tar.bz2 b/software/cinit/speeches/2005-10-22/cinit-technophil-2005-10-22.tar.bz2
deleted file mode 100644
index 20c79c1c..00000000
Binary files a/software/cinit/speeches/2005-10-22/cinit-technophil-2005-10-22.tar.bz2 and /dev/null differ
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil/Makefile b/software/cinit/speeches/2005-10-22/cinit-technophil/Makefile
deleted file mode 100644
index 04887d7a..00000000
--- a/software/cinit/speeches/2005-10-22/cinit-technophil/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# LaTeX Makefile for slides
-# Nico Schottelius
-#
-
-#PDFVIEWER=xpdf -z width -fullscreen
-PDFVIEWER=xpdf -z width
-
-all: clean-pdf
-
-public:
- scp *.pdf nico.schotteli.us/papers/
-
-%.show: %.pdf
- $(PDFVIEWER) $<
-
-%.pdf: %.ps
- ps2pdf $<
-
-%.ps: %.dvi
- dvips $<
-
-%.dvi: %.tex
- latex $< && latex $< && latex $<
-
-all-pdf:
- for source in *.tex; do latex2pdf $${source%.tex}; done
-
-clean-pdf: pdf unused-clean
-
-clean:
- rm -f *.aux *.log *.dvi *.toc *.ps *.pdf
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.aux b/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.aux
deleted file mode 100644
index 1b71bb12..00000000
--- a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.aux
+++ /dev/null
@@ -1,14 +0,0 @@
-\relax
-\ifx\hyper@anchor\@undefined
-\global \let \oldcontentsline\contentsline
-\gdef \contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
-\global \let \oldnewlabel\newlabel
-\gdef \newlabel#1#2{\newlabelxx{#1}#2}
-\gdef \newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
-\AtEndDocument{\let \contentsline\oldcontentsline
-\let \newlabel\oldnewlabel}
-\else
-\global \let \hyper@last\relax
-\fi
-
-\newlabel{last@page}{{}{10}{\relax }{}{}}
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.log b/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.log
deleted file mode 100644
index 07ccaabf..00000000
--- a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.log
+++ /dev/null
@@ -1,339 +0,0 @@
-This is pdfeTeX, Version 3.141592-1.21a-2.2 (Web2C 7.5.4) (format=latex 2005.10.28) 28 OCT 2005 01:36
-entering extended mode
-**cinit.tex
-(./cinit.tex
-LaTeX2e <2003/12/01>
-Babel and hyphenation patterns for american, french, german, ngerman, b
-ahasa, basque, bulgarian, catalan, croatian, czech, danish, dutch, esperanto, e
-stonian, finnish, greek, icelandic, irish, italian, latin, magyar, norsk, polis
-h, portuges, romanian, russian, serbian, slovak, slovene, spanish, swedish, tur
-kish, ukrainian, nohyphenation, loaded.
-(/usr/share/texmf/tex/latex/prosper/prosper.cls
-Document Class: prosper 2003/03/20, v. 1.6
-(c) 2000-2003 Frederic Goualard, IRIN, France
- and Peter Møller Neergaard, Boston Univ., USA
-CVSId: $Id: prosper.cls,v 1.25 2003/02/21 18:32:56 exupery Exp $
-(/usr/share/texmf/tex/latex/graphics/graphicx.sty
-Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
-
-(/usr/share/texmf/tex/latex/graphics/keyval.sty
-Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
-\KV@toks@=\toks14
-)
-(/usr/share/texmf/tex/latex/graphics/graphics.sty
-Package: graphics 2001/07/07 v1.0n Standard LaTeX Graphics (DPC,SPQR)
-
-(/usr/share/texmf/tex/latex/graphics/trig.sty
-Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
-)
-(/usr/share/texmf/tex/latex/graphics/graphics.cfg
-File: graphics.cfg 2005/02/03 v1.3 graphics configuration of teTeX/TeXLive
-)
-Package graphics Info: Driver file: dvips.def on input line 80.
-
-(/usr/share/texmf/tex/latex/graphics/dvips.def
-File: dvips.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
-))
-\Gin@req@height=\dimen102
-\Gin@req@width=\dimen103
-)
-(/usr/share/texmf/tex/latex/seminar/seminar.cls
-Document Class: seminar 1997/10/13, 1.4
-Document Style: `seminar' v1.4 <1997/10/13> (tvz)
-\slidewidth=\dimen104
-\slideheight=\dimen105
-\footheight=\dimen106
-(/usr/share/texmf/tex/latex/base/article.cls
-Document Class: article 2004/02/16 v1.4f Standard LaTeX document class
-(/usr/share/texmf/tex/latex/base/leqno.clo
-File: leqno.clo 1998/08/17 v1.1c Standard LaTeX option (left equation numbers)
-)
-(/usr/share/texmf/tex/latex/base/size10.clo
-File: size10.clo 2004/02/16 v1.4f Standard LaTeX file (size option)
-)
-\c@part=\count79
-\c@section=\count80
-\c@subsection=\count81
-\c@subsubsection=\count82
-\c@paragraph=\count83
-\c@subparagraph=\count84
-\c@figure=\count85
-\c@table=\count86
-\abovecaptionskip=\skip41
-\belowcaptionskip=\skip42
-\bibindent=\dimen107
-)
-(/usr/share/texmf/tex/latex/seminar/sem-page.sty)
-\before@document=\toks15
-\after@document=\toks16
-\before@enddocument=\toks17
-\c@slide=\count87
-\slide@count=\count88
-\@slidebox=\box26
-\not@slidebox=\box27
-\slide@hook=\toks18
-\after@slide=\toks19
-\slide@footins=\insert233
-\slide@listdepth=\count89
-\saved@specials=\box28
-\before@newslide=\toks20
-\after@slidepage=\toks21
-\slidesep=\skip43
-\c@note=\count90
-\slideframewidth=\dimen108
-\slideframesep=\dimen109
-\semin=\dimen110
-\semcm=\dimen111
-)
-(/usr/share/texmf/tex/latex/seminar/seminar.con)
-(/usr/share/texmf/tex/latex/seminar/semcolor.sty
-Style Option: `semcolor' for doc style `seminar' 1.01 <2004/05/18> (tvz)
-File: semcolor.sty 2004/05/18 v1.01 (tvz)
-(/usr/share/texmf/tex/latex/pstricks/pstricks.sty
-Package: pstricks 2004/05/12 v0.2l LaTeX wrapper for `PSTricks' (RN,HV)
-
-(/usr/share/texmf/tex/generic/pstricks/pstricks.tex
-`PSTricks' v1.04 <2004/06/22> (tvz)
-\pst@dima=\dimen112
-\pst@dimb=\dimen113
-\pst@dimc=\dimen114
-\pst@dimd=\dimen115
-\pst@dimg=\dimen116
-\pst@dimh=\dimen117
-\pst@hbox=\box29
-\pst@boxg=\box30
-\pst@cnta=\count91
-\pst@cntb=\count92
-\pst@cntc=\count93
-\pst@cntd=\count94
-\pst@cntg=\count95
-\pst@cnth=\count96
-\pst@toks=\toks22
-(/usr/share/texmf/tex/generic/pstricks/pstricks.con)
-\psunit=\dimen118
-\psxunit=\dimen119
-\psyunit=\dimen120
-\pslinewidth=\dimen121
-\pst@customdefs=\toks23
-\pslinearc=\dimen122
-\everypsbox=\toks24
-\psframesep=\dimen123
-\pslabelsep=\dimen124
-\theoverlaybox=\box31
-)
-File: pstricks.tex 2004/06/22 v1.04 `PSTricks' (tvz)
-
-(/usr/share/texmf/tex/latex/graphics/color.sty
-Package: color 1999/02/16 v1.0i Standard LaTeX Color (DPC)
-
-(/usr/share/texmf/tex/latex/graphics/color.cfg
-File: color.cfg 2005/02/03 v1.3 color configuration of teTeX/TeXLive
-)
-Package color Info: Driver file: dvips.def on input line 125.
-
-(/usr/share/texmf/tex/latex/graphics/dvipsnam.def
-File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
-))))
-(/usr/share/texmf/tex/latex/seminar/semlayer.sty
-\@@slidebox=\box32
-\c@overlay=\count97
-)
-(/usr/share/texmf/tex/latex/seminar/seminar.bug)
-(/usr/share/texmf/tex/latex/seminar/seminar.bg2
-seminar.bg2: various corrections for the Seminar document class added since sem
-inar.bug (waiting Seminar 98)
-(Version 1.7 of (D.G.))
-) (/usr/share/texmf/tex/latex/prosper/seminar-bg2-lepennec.fix)
-(/usr/share/texmf/tex/latex/hyperref/hyperref.sty
-Package: hyperref 2003/11/30 v6.74m Hypertext links for LaTeX
-\@linkdim=\dimen125
-\Hy@linkcounter=\count98
-\Hy@pagecounter=\count99
-
-(/usr/share/texmf/tex/latex/hyperref/pd1enc.def
-File: pd1enc.def 2003/11/30 v6.74m Hyperref: PDFDocEncoding definition (HO)
-)
-(/usr/share/texmf/tex/latex/hyperref/hyperref.cfg
-File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive and teTeX
-)
-Package hyperref Info: Option `bookmarks' set `true' on input line 1830.
-Package hyperref Info: Option `pdffitwindow' set `true' on input line 1830.
-Package hyperref Info: Option `pdfcenterwindow' set `true' on input line 1830.
-Package hyperref Info: Hyper figures OFF on input line 1880.
-Package hyperref Info: Link nesting OFF on input line 1885.
-Package hyperref Info: Hyper index ON on input line 1888.
-Package hyperref Info: Plain pages ON on input line 1893.
-Package hyperref Info: Backreferencing OFF on input line 1900.
-
-Implicit mode ON; LaTeX internals redefined
-Package hyperref Info: Bookmarks ON on input line 2004.
-(/usr/share/texmf/tex/latex/url/url.sty
-\Urlmuskip=\muskip10
-Package: url 2004/03/15 ver 3.1 Verb mode for urls, etc.
-)
-LaTeX Info: Redefining \url on input line 2143.
-\Fld@menulength=\count100
-\Field@Width=\dimen126
-\Fld@charsize=\dimen127
-\Choice@toks=\toks25
-\Field@toks=\toks26
-Package hyperref Info: Hyper figures OFF on input line 2618.
-Package hyperref Info: Link nesting OFF on input line 2623.
-Package hyperref Info: Hyper index ON on input line 2626.
-Package hyperref Info: backreferencing OFF on input line 2633.
-Package hyperref Info: Link coloring OFF on input line 2638.
-\c@Item=\count101
-\c@Hfootnote=\count102
-)
-*hyperref using driver hdvips*
-(/usr/share/texmf/tex/latex/hyperref/hdvips.def
-File: hdvips.def 2003/11/30 v6.74m Hyperref driver for dvips
-
-(/usr/share/texmf/tex/latex/hyperref/pdfmark.def
-File: pdfmark.def 2003/11/30 v6.74m Hyperref definitions for pdfmark specials
-\pdf@docset=\toks27
-\pdf@box=\box33
-\pdf@toks=\toks28
-\pdf@defaulttoks=\toks29
-\Fld@listcount=\count103
-\@outlinefile=\write3
-))
-\theoverlays=\box34
-\c@overlaysCount=\count104
-\c@limitOverlays=\count105
-\@tempoLimit=\count106
-\slideWidth=\skip44
-\c@trueSlideCounter=\count107
-
-(/usr/share/texmf/tex/latex/prosper/PPRautumn.sty
-Package: PPRautumn 2000/11/24
-
-`autumn' style for Prosper ---
-(c) 2000 Frederic Goualard, CWI, The Netherlands
-CVSId: $Id: PPRautumn.sty,v 1.6 2002/10/08 18:34:55 exupery Exp $
-
-(/usr/share/texmf/tex/latex/pstricks/pst-grad.sty
-Package: pst-grad 2004/07/15 package wrapper for pst-grad.tex
-
-(/usr/share/texmf/tex/generic/pstricks/pst-grad.tex v1.04, 2004/06/24
-Package color Info: Redefining color gradbegin on input line 53.
-Package color Info: Redefining color gradend on input line 57.
-)
-File: pst-grad.tex 2004/06/24 1.04 `pst-grad' (tvz)
-)
-(/usr/share/texmf/tex/latex/amsfonts/amssymb.sty
-Package: amssymb 2002/01/22 v2.2d
-
-(/usr/share/texmf/tex/latex/amsfonts/amsfonts.sty
-Package: amsfonts 2001/10/25 v2.2f
-\@emptytoks=\toks30
-\symAMSa=\mathgroup4
-\symAMSb=\mathgroup5
-LaTeX Font Info: Overwriting math alphabet `\mathfrak' in version `bold'
-(Font) U/euf/m/n --> U/euf/b/n on input line 132.
-))
-(/usr/share/texmf/tex/latex/psnfss/times.sty
-Package: times 2004/09/15 PSNFSS-v9.2 (SPQR)
-))
-\c@item@step=\count108
-\c@overlay@page=\count109
-\c@nbAffected=\count110
-\c@savecountAffected=\count111
-)
-(/usr/share/texmf/tex/latex/base/inputenc.sty
-Package: inputenc 2004/02/05 v1.0d Input encoding file
-
-(/usr/share/texmf/tex/latex/base/latin1.def
-File: latin1.def 2004/02/05 v1.0d Input encoding file
-))
-(/usr/share/texmf/tex/generic/german/german.sty v2.5e 1998-07-08
-Package: german 1998/07/08 v2.5e Support for writing german texts (br)
-\grmnU@D=\dimen128
-) (./cinit.aux)
-\openout1 = `cinit.aux'.
-
-LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 17.
-LaTeX Font Info: ... okay on input line 17.
-LaTeX Font Info: Try loading font information for OT1+ptm on input line 17.
-(/usr/share/texmf/tex/latex/psnfss/ot1ptm.fd
-File: ot1ptm.fd 2001/06/04 font definitions for OT1/ptm.
-)
-Package hyperref Info: Link coloring OFF on input line 17.
-
-(/usr/share/texmf/tex/latex/hyperref/nameref.sty
-Package: nameref 2003/12/03 v2.21 Cross-referencing by name of section
-\c@section@level=\count112
-)
-LaTeX Info: Redefining \ref on input line 17.
-LaTeX Info: Redefining \pageref on input line 17.
- (./cinit.out) (./cinit.out)
-\openout3 = `cinit.out'.
-
-LaTeX Font Info: Try loading font information for T1+ptm on input line 18.
-
-(/usr/share/texmf/tex/latex/psnfss/t1ptm.fd
-File: t1ptm.fd 2001/06/04 font definitions for T1/ptm.
-)
-LaTeX Font Info: Try loading font information for OT1+pcr on input line 18.
-
-(/usr/share/texmf/tex/latex/psnfss/ot1pcr.fd
-File: ot1pcr.fd 2001/06/04 font definitions for OT1/pcr.
-)
-LaTeX Font Info: Try loading font information for U+msa on input line 18.
-
-(/usr/share/texmf/tex/latex/amsfonts/umsa.fd
-File: umsa.fd 2002/01/19 v2.2g AMS font definitions
-)
-LaTeX Font Info: Try loading font information for U+msb on input line 18.
-
-(/usr/share/texmf/tex/latex/amsfonts/umsb.fd
-File: umsb.fd 2002/01/19 v2.2g AMS font definitions
-) [1
-
-
-] [2
-
-] [3
-
-] [4
-
-] [5
-
-] [6
-
-]
-Overfull \hbox (6.90784pt too wide) in paragraph at lines 82--82
-[] \OT1/pcr/m/n/14.4 hostname -> ../../../network/hostname/[]
- []
-
-[7
-
-] [8
-
-] [9
-
-] [10
-
-] (./cinit.aux) )
-Here is how much of TeX's memory you used:
- 4535 strings out of 94501
- 58966 string characters out of 1176788
- 124011 words of memory out of 1000000
- 7639 multiletter control sequences out of 10000+50000
- 24306 words of font info for 41 fonts, out of 500000 for 2000
- 580 hyphenation exceptions out of 8191
- 39i,6n,28p,234b,671s stack positions out of 1500i,500n,5000p,200000b,5000s
-
-Output written on cinit.dvi (10 pages, 34164 bytes).
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.out b/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.out
deleted file mode 100644
index e69de29b..00000000
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.pdf b/software/cinit/speeches/2005-10-22/cinit.pdf
similarity index 100%
rename from software/cinit/speeches/2005-10-22/cinit-technophil/cinit.pdf
rename to software/cinit/speeches/2005-10-22/cinit.pdf
diff --git a/software/cinit/speeches/2005-10-22/cinit-technophil/cinit.tex b/software/cinit/speeches/2005-10-22/cinit.tex
similarity index 100%
rename from software/cinit/speeches/2005-10-22/cinit-technophil/cinit.tex
rename to software/cinit/speeches/2005-10-22/cinit.tex