# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1275594180 -10800
# Node ID 9617dc568eaf8db7c427f7e0135eae49a0223750
# Parent  3f0531193caf3425de3f7f1afb44c89193f15e71# Parent  88c6e9fe19cd62c2cd7aa692f2727205ecb15e19
merged

diff -r 3f0531193caf -r 9617dc568eaf mail.rst
--- a/mail.rst	Wed Jun 02 10:45:03 2010 +0300
+++ b/mail.rst	Thu Jun 03 22:43:00 2010 +0300
@@ -56,4 +56,21 @@
 
 ** Stallman warn about Google.
 
-  http://www.mail-archive.com/gnu-emacs-sources@gnu.org/msg00302.html
\ No newline at end of file
+  http://www.mail-archive.com/gnu-emacs-sources@gnu.org/msg00302.html
+
+* Storage format for email.
+
+** mbox.
+
+  http://tools.ietf.org/html/rfc4155
+                The application/mbox Media Type (Category: Informational)
+  http://en.wikipedia.org/wiki/Mbox
+
+** maildir.
+
+  http://en.wikipedia.org/wiki/Maildir
+
+** MH mailbox format.
+
+  http://en.wikipedia.org/wiki/MH_Message_Handling_System
+
diff -r 3f0531193caf -r 9617dc568eaf midi.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/midi.rst	Thu Jun 03 22:43:00 2010 +0300
@@ -0,0 +1,7 @@
+-*- mode: outline; coding: utf-8 -*-
+
+* Midi player.
+
+** TiMidity++.
+
+  https://sourceforge.net/projects/timidity