Merge branch 'new'

The branch 'new' is finally enough finished to be merged into master.
It will appear at http://mkaysi.github.com/ in 15 minutes after this merge.

By the way, I love this new feature of git to ask for commit message for merges :).
This commit is contained in:
Mikaela Suomalainen 2012-05-24 12:44:07 +03:00
commit 097637388a
2 changed files with 98 additions and 9 deletions

View File

@ -1,5 +1,33 @@
<h1>Welcome</h1> <h1 id="welcome">Welcome</h1>
<p>There might not be much to see in this page. You can find list of pages in the source.</p>
<p>You can find my <a href="http://mkaysi.github.com/PGP/key.txt">PGP key here.</a>.</p> <h1 id="around-the-web">Around the web</h1>
<p>This is list of my profiles etc. in different services.</p>
<p>The list of pages can be found in <a href="https://github.com/Mkaysi/mkaysi.github.com">source.</a></p> <p>The list can be incomplete if I am inactive somewhere or forget some place.</p>
<h2 id="email">Email</h2>
<h3 id="mailing-lists">Mailing lists</h3>
<p><a href="http://lists.debian.org/">Some Debian mailing lists.</a></p>
<p><a href="http://lists.ubuntu.com/">Some Ubuntu mailing lists.</a></p>
<p><a href="https://www.mozdev.org/mailman/listinfo/enigmail">Enigmail mailing list.</a></p>
<p>And some other mailing lists. You can see if email is sent by me by looking at PGP signature.</p>
<h3 id="pgp">pgp</h3>
<pre><code>pub 4096R/82A46728 2012-03-27
Key fingerprint = 24BC 1573 B8EE D666 D10A AA65 4DB5 3CFE 82A4 6728
uid Mika Suomalainen
&lt;...&gt;
sub 4096R/A4271AC5 2012-03-27</code></pre>
<p>Preferred keyserver: <a href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&amp;search=0x4DB53CFE82A46728">pool.sks-keyservers.net</a></p>
<p>My PGP key is also available <a href="http://mkaysi.github.com/PGP/key.txt">here, at GitHub</a>.</p>
<p>Please note that my key at GitHub doesn't contain any other signatures than selfsigs.</p>
<p>It has been procressed with <a href="http://pgp-tools.alioth.debian.org/">pgp-clean</a></p>
<h2 id="version-control-code-etc.">Version control / code etc.</h2>
<p><a href="https://github.com/Mkaysi">Mkaysi at GitHub</a></p>
<p><a href="https://launchpad.net/~mkaysi">Mkaysi at Launchpad</a></p>
<p><a href="https://gitorious.org/~mkaysi">Mkaysi at Gitorious</a></p>
<p><a href="https://sourceforge.net/users/mkaysi">Mkaysi at SourceForge</a></p>
<h2 id="social-media">Social media</h2>
<p><a href="https://twitter.com/Mkaysi">Mkaysi at Twitter</a></p>
<p><a href="https://identi.ca/Mkaysi">Mkaysi at Identica</a></p>
<h3 id="irc">IRC</h3>
<p>You can find me (Mkaysi) at <a href="http://freenode.net/">freenode</a> and <a href="http://oftc.net/">OFTC</a>.</p>
<p>At freenode I can usually be found from at least at <a href="irc://irc.freenode.net/#limnoria,#gribble,#supybot,##Mkaysi">#limnoria,#gribble,#supybot,##Mkaysi</a>.</p>
<p>At OFTC, I can usually be found from at least at <a href="irc://irc.oftc.net/#debian-next,#supybot,">#debian-next,#supybot,</a></p>

View File

@ -1,6 +1,67 @@
Welcome # Welcome
=======
You can find my [PGP key here.](http://mkaysi.github.com/PGP/key.txt). There might not be much to see in this page. You can find list of pages in the source.
The list of pages can be found in [source.](https://github.com/Mkaysi/mkaysi.github.com) # Around the web
This is list of my profiles etc. in different services.
The list can be incomplete if I am inactive somewhere or forget some place.
## Email
### Mailing lists
[Some Debian mailing lists.](http://lists.debian.org/)
[Some Ubuntu mailing lists.](http://lists.ubuntu.com/)
[Enigmail mailing list.](https://www.mozdev.org/mailman/listinfo/enigmail)
And some other mailing lists. You can see if email is sent by me by looking at PGP signature.
### pgp
```
pub 4096R/82A46728 2012-03-27
Key fingerprint = 24BC 1573 B8EE D666 D10A AA65 4DB5 3CFE 82A4 6728
uid Mika Suomalainen
<...>
sub 4096R/A4271AC5 2012-03-27
```
Preferred keyserver: [pool.sks-keyservers.net](http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0x4DB53CFE82A46728)
My PGP key is also available [here, at GitHub](http://mkaysi.github.com/PGP/key.txt).
Please note that my key at GitHub doesn't contain any other signatures than selfsigs.
It has been procressed with [pgp-clean](http://pgp-tools.alioth.debian.org/)
## Version control / code etc.
[Mkaysi at GitHub](https://github.com/Mkaysi)
[Mkaysi at Launchpad](https://launchpad.net/~mkaysi)
[Mkaysi at Gitorious](https://gitorious.org/~mkaysi)
[Mkaysi at SourceForge](https://sourceforge.net/users/mkaysi)
## Social media
[Mkaysi at Twitter](https://twitter.com/Mkaysi)
[Mkaysi at Identica](https://identi.ca/Mkaysi)
### IRC
You can find me (Mkaysi) at [freenode] and [OFTC].
[freenode]:http://freenode.net/
[OFTC]:http://oftc.net/
At freenode I can usually be found from at least at [#limnoria,#gribble,#supybot,##Mkaysi](irc://irc.freenode.net/#limnoria,#gribble,#supybot,##Mkaysi).
At OFTC, I can usually be found from at least at [#debian-next,#supybot,](irc://irc.oftc.net/#debian-next,#supybot,)