Major rewrite of phone, adding sub-page android.

2 files changed, 73 insertions, 3 deletions

diff --git a/phone.mdwm b/phone.mdwm
index 8d131d4..5386941 100644
--- a/phone.mdwm
+++ b/phone.mdwm
@@ -1,7 +1,53 @@
 # Phones
 
-We use [refurbished phones][], Samsung Galaxy S series with free software (Android) system [Replicant][].
+We mostly use cellphones.
+Occationally we use a "real" stationary phone with SIP,
+or (quite rarely) a "virtual" softphone on laptop or desktop.
 
-[refurbished phones][http://www.bluecity.dk/elektronik/samsung-galaxy-s-ii-sort-156894.html]
 
-[Replicant][http://redmine.replicant.us/]
+## Cellphones
+
+We currently use Android phones with the libre [Replicant][] system,
+carefully [configured][] for our needs.
+
+These [refurbished][] ones (sorted by preference) are most actively used:
+
+  * [Samsung Galaxy S II][i9100]
+  * [Samsung Galaxy S][i9000]
+  * [Samsung Galaxy S III][i9300]
+
+[configured]: <android>
+  "our configuration of Android phones"
+
+[refurbished]: <http://www.bluecity.dk/elektronik/catalogsearch/result/?q=i9100>
+  "search for refurbished Samsung Galaxy S II phones at Blue City"
+
+[Replicant]: <https://www.replicant.us/>
+  "Free and open source operating system Replicant"
+
+[i9000]: <https://redmine.replicant.us/projects/replicant/wiki/GalaxySI9000>
+  "Samsung Galaxy S (GT-I9000)"
+
+[i9100]: <https://redmine.replicant.us/projects/replicant/wiki/GalaxyS2I9100>
+  "Samsung Galaxy S II (GT-I9100)"
+
+[i9300]: <https://redmine.replicant.us/projects/replicant/wiki/GalaxyS3I9300>
+  "Samsung Galaxy S III (GT-I9300)"
+
+
+## SIP
+
+We run an experimental SIP service at bitbase.dk,
+and connect also to homebase.dk, debian.org and ostel.net.
+
+
+## Providers
+
+We use [Unotel][] for GSM, internet and SIP-to-POTS services.
+notel sub-leases network from [TDC][].
+
+[Unotel]: <https://www.unotel.dk/>
+  "low-budget telephony company Unotel"
+
+[TDC]: <https://tdc.dk/>
+  "telephony company TDC"
diff --git a/phone/android.mdwn b/phone/android.mdwn
new file mode 100644
index 0000000..20ca5a5
--- /dev/null
+++ b/phone/android.mdwn
@@ -0,0 +1,24 @@
+# Android
+
+We use the libre [Replicant][] flavor of Android,
+with apps from the lire app-store F-Droid.
+
+
+## Messages
+
+Short messages are handled with the builtin tool,
+and mirrored to our own mail server with the app "SMS Backup+".
+
+We use Jabber for internet messaging (but only rarely),
+with the app "Conversations".
+
+
+## Email
+
+"K-9"
+
+
+## Events and tasks
+
+Builtin tools,
+sync'ed to our own CalDAV service with the app "DavDroid".