# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1275245082 -10800
# Node ID 88c6e9fe19cd62c2cd7aa692f2727205ecb15e19
# Parent  8bfad2e06bb66f9776c36979f1849bd180c56096# Parent  e6bf3cb4bb93e4034646739dd826257d8f3582a6
Automated merge with file:///cygdrive/e/srv/hg/admin-doc

diff -r 8bfad2e06bb6 -r 88c6e9fe19cd mail.rst
--- a/mail.rst	Thu May 27 15:18:39 2010 +0300
+++ b/mail.rst	Sun May 30 21:44:42 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 8bfad2e06bb6 -r 88c6e9fe19cd midi.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/midi.rst	Sun May 30 21:44:42 2010 +0300
@@ -0,0 +1,7 @@
+-*- mode: outline; coding: utf-8 -*-
+
+* Midi player.
+
+** TiMidity++.
+
+  https://sourceforge.net/projects/timidity