diff --git a/site/about/index.org b/site/about/index.org
index 69674f5..3a122ca 100644
--- a/site/about/index.org
+++ b/site/about/index.org
@@ -8,9 +8,8 @@
This is metanohi.
Currently, metanohi resides on *metanohi.name*. Originally, it was on
-*metanohi.org* which now&del no more redirects requests to .name. To contact
-[[./niels][Niels]] (the creator), send him an electronic mail at [[mailto:ns@metanohi.name][ns@metanohi.name]]
-{(ns@metanohi.org no more redirects emails to that address)}&small.
+metanohi.org. To contact [[./niels][Niels]] (the creator), send him an electronic mail at
+[[mailto:ns@metanohi.name][ngws@metanohi.name]].
metanohi is mostly XHTML 1.1 and CSS 2 valid. Currently, metanohi.name pages
are served as text/html and not as application/xml+xhtml (as they should). This
@@ -18,6 +17,9 @@ might get fixed (it is extremely easy to fix, but if fixed, some things
depending on external JavaScript which depends on non-XHTML, like the FSF
widget on the front page, might cease to work).
+[[./links][Propaganda]].
+
+
** Copying
In general, text, images, and other media on metanohi is licensed under the
diff --git a/site/about/links.org b/site/about/links.org
new file mode 100644
index 0000000..f06f675
--- /dev/null
+++ b/site/about/links.org
@@ -0,0 +1,70 @@
+#+title: Links
+#+summary: Various links.
+#+license: cc0
+
+#++show
+#+BEGIN_SRC javascript
+ // Add the FSF widget after the page has loaded.
+ window.addEventListener('load',
+ function(event) {
+ add_fsf_widget(8085);
+ }, false);
+#+END_SRC
+
+
+* Hyperlinks
+
+My first web pages from ~2004 contained pages whose only purpose was to show
+links to other sites, because that's what you use websites for. With this page I
+intend to carry on with this tradition.
+
+** Passive activism[fn:oxymoron]
+
+Beware, for the following Hyperlinks contain Knowledge!
+
+#++show
+#+BEGIN_SRC html
+
+#+END_SRC
+
+
+[fn:oxymoron] "Passive activism" is an oxymoron. Activism is, of course, not a
+ passive thing. But having links stowed on the front of one's web page
+ certainly is.
diff --git a/site/about/niels.org b/site/about/niels.org
index 65418b6..7758c27 100644
--- a/site/about/niels.org
+++ b/site/about/niels.org
@@ -8,7 +8,9 @@
Niels G. W. Serup is the creator of metanohi and [[/projects/mege/][mege]], metanohi's engine. He
was born in 1992 and lives in Denmark.
-He studies datalogi (computer science) at the University of Copenhagen, [[https://en.wikipedia.org/wiki/DIKU][DIKU]].
+He studies datalogy (computer science) at [[http://diku.dk/][DIKU]].
+
+He goes by the nicknames "ngws" and "nqpz" (and a few others).
** Contact
@@ -58,8 +60,8 @@ need to synchronize my files with my laptop, I remember putting my flash drive
in my lower left pocket. I pick it up and put it in my laptop, and then I run
Unison again.
-It's fast, secure and durable (I often have poor or even none connection when
-working on my laptop).
+It's fast, secure and durable (I sometimes have poor or even none connection
+when working on my laptop).
** Things which Niels uses but doesn't like
@@ -93,7 +95,7 @@ In order of randomness:
+ [[https://gitorious.org/~nqpz][Gitorious]]
+ [[http://openlibrary.org/people/nqpz][Open Library]]
+ [[http://en.literateprograms.org/User:NqpZ][LiteratePrograms]]
- + [[https://launchpad.net/~nqpz][Launchpad]]
+ + [[https://launchpad.net/~ngws][Launchpad]]
+ [[http://uncyclopedia.wikia.com/wiki/User:Schabeindividuum][Uncyclopedia]] (don't take this one seriously)
Also, I don't use Facebook (or Facebook-/like/ social networks). If I did, my
@@ -106,7 +108,7 @@ friendica, or something else instead of Facebook.
Apparently someone else sharing my first name and my last name is on
Facebook. That's not me. I don't use PhageBook. I do, however, use [[http://friendica.com/][friendica]] on
-[[http://hongabar.org/][Hongabar]].
+[[http://hongabar.org/][Hongabar]] (currently down).
** Keys
diff --git a/site/index.org b/site/index.org
index 57a99b2..8632578 100644
--- a/site/index.org
+++ b/site/index.org
@@ -1,84 +1,32 @@
#+title: Home
#+summary: This is the start page.
-#+license: bysa, own works
-#+license: Varying, external works
-
-#++show
-#+BEGIN_SRC javascript
- // Add the FSF widget after the page has loaded.
- window.addEventListener('load',
- function(event) {
- add_fsf_widget(8085);
- }, false);
-#+END_SRC
+#+license: cc0, own text
-* This is metanohi
+* Meta-meta-meta-meta-meta-metanohi!
-*metanohi* is a website founded in 2009 with a well-defined purpose: to
-exist. It is the personal website of [[/about/niels][Niels G. W. Serup]], a [[/writings/hacking][hacker]] apprentice in
-a world of non-hackers.
+*metanohi* is a website created in 2009. It is the personal website of [[/about/niels][Niels
+G. W. Serup]], a [[/writings/hacking][hacker]] apprentice in a world of non-hackers.
-Historically, this start page has featured text which had little purpose except
-to exist. That is over now. /metanohi/ has no real need for a start page ---
-and that means no more superfluous text[fn:extra].
-
-Feel free to check out my [[/projects/][Projects]] page.
-
-* Passive activism[fn:oxymoron]
-
-Beware, for the following Hyperlinks contain Knowledge!
-
-#++show
-#+BEGIN_SRC html
-
-#+END_SRC
+Historically, this start page has featured text which tried to be funny. It
+never really worked right, so now there's just a lot of footnotes.[fn:alot].
-[fn:extra] Not much, anyway.[fn:notsuperfluous]
+* Quick links
-[fn:notsuperfluous] This footnote is not superfluous.[fn:notfunny]
+If you're not the type who crawls through the entirety of a website when you
+visit it, here are the author's pick of metanohi pages you should read:
-[fn:oxymoron] "Passive activism" is an oxymoron. Activism is, of course, not a
- passive thing. But having links stowed on the front of one's web page
- certainly is.
++ <@eval macros.titlelink('/writings/atem')@>
++ <@eval macros.titlelink('/writings/software-licenses')@>
++ <@eval macros.titlelink('/projects/sleinlib')@>
++ <@eval macros.titlelink('/projects/magicng')@>
+
+
+[fn:alot] Like, 3[fn:alot2]
+
+[fn:alot2] No, more like 4[fn:notfunny]
[fn:notfunny] This footnote is not funny.[fn:notsuperfluous]
+[fn:notsuperfluous] This footnote is not superfluous.[fn:notfunny]
diff --git a/site/projects/sleinlib.org b/site/projects/sleinlib.org
index 454d8b9..2862aa3 100644
--- a/site/projects/sleinlib.org
+++ b/site/projects/sleinlib.org
@@ -12,7 +12,8 @@ See [[http://gitorious.org/sleinlib]].
Includes:
+ Standard ML
++ Prolog
++ Haskell
+ Math
+ Junk code
+ Mini projects/experiments
-
diff --git a/site/writings/index.org b/site/writings/index.org
index f4d3417..a40e6cc 100644
--- a/site/writings/index.org
+++ b/site/writings/index.org
@@ -1,6 +1,6 @@
#+title: Writings
#+summary: A list of my writings
-#+license: bysa
+#+license: cc0
* Writings
@@ -9,10 +9,16 @@
macros.list_pages()
#+END_SRC
+** Pseudo-writings
+
++ <@eval macros.titlelink('/projects/magicng/')@>
+
+
** Old
+ [[http://projects.metanohi.name/eonaton/?t=0&s=5][Eon Aton]] (both a story and an unfinished game)
+
** Purposely crappy
+ [[./potator/][POTATORR!]]
diff --git a/site/writings/software-licenses.org b/site/writings/software-licenses.org
new file mode 100644
index 0000000..8780f21
--- /dev/null
+++ b/site/writings/software-licenses.org
@@ -0,0 +1,68 @@
+#+title: My choices of software licenses
+#&summary
+Which licenses do I use, and why?
+#&
+#+startup: showall
+#+license: bysa
+
+* My choices of software licenses
+
+I like strong copyleft, the stuff found in the GNU General Public License, the
+Creative Commons Attribution-Share Alike, and others. I like how people cannot
+take the code or culture I contributed to the world and turn it into something
+non-free. I have used those licenses a lot.
+
+For cultural works, it seems to me that the Creative Commons Attribution-Share
+Alike has a strong following; of course some people dislike it for being a long,
+legalese text, but my general impression is that people who want to create
+sharable and modifiable cultural works like it just fine. If there was a large
+resistance towards the BY-SA, making something available under that license
+would mean excluding many people from remixing that something, just because of
+their dislike of the license. Since that doesn't appear to be the case, I'll
+happily continue to use the BY-SA license.
+
+For software, on the other hand, there are many loud voices against the
+GPL. [[http://dustycloud.org/blog/field-guide-to-copyleft][This article]] explains the arguments well. As much as I like to copyleft my
+code, I find it even more important that it's not lonely; and if so many are
+against the strong copyleft in the GPL, I feel I must concede and release my
+software under BSD3 or something on that level of lack of user freedom.
+
+I only see two reasons to not use strong copyleft with a program (and they
+overlap):
+
++ If the main objective of the software is to become widespread (like how the
+ Ogg Ogg/Vorbis codec uses a lax license --- which, by the way, [[https://lwn.net/2001/0301/a/rms-ov-license.php3][RMS agrees]]
+ with)
++ If so many people dislike strong copyleft that too few are willing to
+ contribute to a strong copyleft project (my reason)
+
+I'm not that interested in whether GPL usage is currently dropping or rising, or
+that the GPL is still very widely used; what interests me is that a high number
+of projects simply do not use the GPL. I found the [[https://archive.fosdem.org/2012/schedule/event/is_copyleft_being_framed.html][Is copyleft being framed?]]
+talk interesting, but copyleft being framed doesn't change the data at
+[[http://flossmole.org]]: [[http://flossmole.org/system/files/FreecodeLicenses2012.png][this]] and [[http://flossmole.org/system/files/FSFLicenseCounts2012_0.png][this]] show that while GPL usage is high, so is the
+combined use of BSD3, Expat/MIT, Apache 2.0, and other lax licenses.
+
+A (for me) important example of where a lax license (in this case the BSD3) is
+pretty much used everywhere is Haskell's package collection, [[http://hackage.haskell.org/][Hackage]]. If I came
+along with a GPL-licensed program, it would be pretty lonely.
+
+I must remind myself that strong copyleft was never an end in itself, but merely
+a help. From now on (Oct 10, 2012), I'll make new software written by myself
+available under the BSD3 license. If at some point in the future, the usage of a
+lax licenses drops a lot and the usage of strong copyleft licenses rises (I
+don't think that'll happen), I might switch back to using a strong copyleft
+license. Until then, let the BSD3 experiment begin!
+
+The main point of it all is to share code both ways, and if that flow works
+better with a lax license, then I think I'm okay with the risk of someone
+putting it into a proprietary program, even though I find that amoral.
+
+I'm not going to relicense past (A|L)?GPL'd programs I've written unless someone
+asks me to.
+
+I'll still contribute to strong copyleft software, but I might mention this URL.
+
+If I were to place myself in a camp, it would be the
+I-like-copyleft-sometimes-but-I-like-sharing-code-even-more camp.
+
+ 
+ 
+ 
+