80 Commits

Author SHA1 Message Date
Mikaela Suomalainen
922c5b98ed Fix previous merge. 2012-06-09 12:39:41 +03:00
Mikaela Suomalainen
3d2fd66532 Merge branch 'master' into guides
Conflicts:
	index.html
2012-06-09 12:37:07 +03:00
Mikaela Suomalainen
209a95e402 index: Change cadoth to be lowercase everywhere.
I know it might sound weird, but I don't really like seeing it
starting with an uppercase c, and the "official" name is
lowercase :P
2012-06-09 11:08:10 +02:00
Mikaela Suomalainen
0d3e164f41 Merge index changes from master.
Why do .html files always conflict? .md files don't complain about anything.

Conflicts:
	index.html
2012-06-09 12:00:06 +03:00
Mikaela Suomalainen
393eacf03f index: add notice about cadoth missing other address than IP.§ 2012-06-09 11:59:15 +03:00
Mikaela Suomalainen
9149a2bda6 index: fix cadoth text & remove useless notice about PGP key. 2012-06-09 11:57:49 +03:00
Mikaela Suomalainen
d59d8c25c0 Update PGP/key.txt from master. 2012-06-09 11:15:40 +03:00
Mikaela Suomalainen
ccdd65badc PGP/key.txt: fix the key receiving comment. 2012-06-09 11:15:17 +03:00
Mikaela Suomalainen
85eb026b17 Merge branch 'master' into guides
Conflicts:
	index.html
	index.html.md
2012-06-06 18:38:19 +03:00
Mikaela Suomalainen
e73d4cfe90 index: cadoth is again without other address than IP. 2012-06-06 18:36:53 +03:00
Mikaela Suomalainen
5ab0a0fdb0 GPG guide: add places for group line and comment instructions. 2012-06-04 18:56:13 +03:00
Mikaela Suomalainen
a3c545c246 GPG guide: add configuration. 2012-06-04 18:54:00 +03:00
Mikaela Suomalainen
16abcac134 GPG guide: add links to GPG-Tools, Mozilla Thunderbird, Enigmail and GPG4Win. 2012-06-04 18:41:59 +03:00
Mikaela Suomalainen
d5ff606fa5 GPG guide: add example outputs to "gpg2 --list-keys" and "gpg2 --fingerprint" 2012-06-04 18:34:51 +03:00
Mikaela Suomalainen
4418df9e2f Enigmail guide: start writing. 2012-06-03 17:32:03 +03:00
Mikaela Suomalainen
5987c01d0e Merge the v1 advertising stop.
Conflicts:
	index.html
2012-06-03 17:07:40 +03:00
Mikaela Suomalainen
50b1150f8b index: don't advertise v1. I heard that it has been discontinued. 2012-06-03 15:56:38 +03:00
Mikaela Suomalainen
6ee668db4c Enigmail.html.md: start digitalizing Enigmail guide. 2012-06-03 15:54:01 +03:00
Mikaela Suomalainen
30fc45ffa7 Add license. 2012-06-03 15:27:35 +03:00
Mikaela Suomalainen
c1d8f88abd Add license. 2012-06-03 15:27:12 +03:00
Mikaela Suomalainen
1444e45636 GPG guide: digitalize page 8. The last page. 2012-06-03 15:19:11 +03:00
Mikaela Suomalainen
2411d49cda GPG guide: digitalize page 7. 2012-06-03 14:52:17 +03:00
Mikaela Suomalainen
6cb37e7410 GPG guide: digitalize page 6. 2012-06-03 14:46:30 +03:00
Mikaela Suomalainen
b446c18ff4 GPG guide: digitalize page 5. 2012-06-03 14:41:57 +03:00
Mikaela Suomalainen
8a6dfaacf4 GPG guide: digitalize page 4. 2012-06-03 14:29:18 +03:00
Mikaela Suomalainen
e2baa9448b GPG guide: digitalize page 3. 2012-06-03 12:48:05 +03:00
Mikaela Suomalainen
e51df8d168 GPG guide: digitalize page 2. 2012-06-03 12:38:22 +03:00
Mikaela Suomalainen
83af5a8fa1 articles/guides/GPG/GPG: digitalize page 1. 2012-06-03 12:27:21 +03:00
Mikaela Suomalainen
8c10863250 index: cadoth mirror isn't hosted on HTTP root of cadoth. 2012-06-02 18:44:31 +03:00
Mikaela Suomalainen
d2c2744889 index: I don't have file called hydrogen.neonirc.net. 2012-06-02 18:42:59 +03:00
Mikaela Suomalainen
1f0c33990a index: cadoth has got other address than IP now.
So the punishment for cadoth is over.
EDIT: fix typo in commit message.
2012-06-02 18:24:34 +03:00
Mikaela Suomalainen
1acb7de1b5 index: Punish Cadoth and V1 for not having any other addresses than IPs. (Break links to them.)
Links will be fixed when nyuszika7h and xy or onewhohelps get other addresses.
2012-06-02 12:08:38 +03:00
Mikaela Suomalainen
b43c7d50ce PGP/key.txt: add whole public key (including signatures).
Even if it contains only selfsigs.
REASON: pgp-clean stips out encryption subkey.
2012-06-02 12:05:42 +03:00
Mikaela Suomalainen
04413ed3f4 Index: add list of official mirrors.
To get attention from search bots :P.

Complaiments:
nyuszika7h: cadoth is missing other address than IP.
xy: v1 —||—
2012-05-28 18:53:49 +03:00
Mikaela Suomalainen
887e9a86e9 make links in root portable & add notice about mirror in index. 2012-05-26 12:54:30 +03:00
Mikaela Suomalainen
686362e522 no time to do anything, quick notes to self
Add mirror notice
Make portable
See issues
2012-05-25 18:59:35 +03:00
Mikaela Suomalainen
3d94d91a37 README: Add URL. 2012-05-24 12:58:00 +03:00
Mikaela Suomalainen
3b5276b1ad README.md: make it look better, I hope. 2012-05-24 12:56:09 +03:00
Mikaela Suomalainen
873d6b07b1 Add README.
To get away from complainment

> We recommend adding a README to this repository. Visit github/markup for details on what formats we support.
2012-05-24 12:54:11 +03:00
Mikaela Suomalainen
097637388a 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 :).
2012-05-24 12:44:07 +03:00
Mikaela Suomalainen
c6dcd29cd1 index.html.md: fix typo
fix --> find
2012-05-24 12:42:41 +03:00
Mikaela Suomalainen
a30fd4a028 index.html.md: add SF. 2012-05-24 12:41:15 +03:00
Mikaela Suomalainen
553f9ed465 index.html.md: fix typo. 2012-05-24 12:38:28 +03:00
Mikaela Suomalainen
c1aab17c6a index.html.md: add IRC section. 2012-05-24 12:37:29 +03:00
Mikaela Suomalainen
40bcb04bd5 index: add spaces. 2012-05-21 18:58:16 +03:00
Mikaela Suomalainen
06709d2915 index: continue listing of my profiles etc. 2012-05-21 18:56:04 +03:00
Mikaela Suomalainen
edcf21c074 Prey: fix topics. 2012-05-19 13:55:06 +03:00
Mikaela Suomalainen
4e313d88ab index.html.md: add little todo. 2012-05-18 18:32:38 +03:00
Mikaela Suomalainen
cb27f1cb46 PGP/WhyDoISignEmails.html: Write clear explanation about why I sign my emails. 2012-05-09 11:40:15 +03:00
Mikaela Suomalainen
92ac625686 PGP/Clearsigning: Mention mailing lists, which have problems with PGP/MIME. 2012-05-08 19:17:41 +03:00