Realign with f11-xo1-0.88

1 files changed, 9 insertions, 11 deletions

diff --git a/examples/f11-xo1.5-0.88.ini b/examples/f11-xo1.5-0.88.ini
index 5e9c349..968f960 100644
--- a/examples/f11-xo1.5-0.88.ini
+++ b/examples/f11-xo1.5-0.88.ini
@@ -18,11 +18,10 @@ modules=
 	sugarlabs_activities,
 	sugar_activities_extra,
 	custom_packages,
+	gnome,
 	oats_cfg,
 	signing
 
-;gnome,
-
 [sd_card_image]
 ; 4GB image
 size_1=3865470566
@@ -68,7 +67,6 @@ del_packages=
 	nafees-web-naskh-fonts,
 	nss_ldap,
 	quota,
-	olpc-update,
 	pam_ccreds,
 	pam_passwdqc,
 	pam_smb,
@@ -124,6 +122,7 @@ activities=
 	org.gnome.Labyrinth,
 	com.jotaro.ImplodeActivity,
 	org.laptop.AbiWordActivity,
+	org.laptop.Arithmetic,
 	org.laptop.Analyze,
 	org.laptop.Calculate,
 	org.laptop.Chat,
@@ -141,12 +140,13 @@ activities=
 	org.laptop.TamTamSynthLab,
 	org.laptop.Terminal,
 	org.laptop.TurtleArtActivity,
-	org.laptop.WebActivity,
+	org.laptop.Words,
 	org.laptop.community.Colors,
 	org.laptop.community.Finance,
 	org.laptop.community.TypingTurtle,
 	org.laptop.physics,
 	org.laptop.sugar.GetIABooksActivity,
+	org.laptop.sugar.GetBooksActivity,
 	org.laptop.sugar.Jukebox,
 	org.laptop.sugar.ReadActivity,
 	org.laptop.xoEditorActivity,
@@ -157,15 +157,10 @@ activities=
 	org.vpri.EtoysActivity,
 	vu.lux.olpc.Speak,
 
-; == activities missing on aslo ==
-;	org.laptop.Words,  => http://dev.laptop.org/~cjb/words/Words-4.xo
-;	org.laptop.sugar.GetBooksActivity, => http://dev.laptop.org/~sayamindu/GetBooks-5.xo
+;disabled because we're temporarily using Anish's fork with tabs
+;	org.laptop.WebActivity,
 
 ; == bad activities ==
-;
-;does not download from aslo
-;	org.tuxpaint,
-;	org.tuxpaint.sugar-is-lame,
 
 ;buggy on 0.84+
 ;	com.laptop.Ruler,
@@ -195,6 +190,9 @@ url_12=http://wiki.laptop.org/images/a/af/WorldFactbookMaps-6.xol
 url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
 url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol
 
+; m_anish's majestic Browse with tabs!
+url_42=http://people.sugarlabs.org/~anish/Browse-115.xo
+
 [buildnr_from_file]
 suffix=py
 path=oob-buildnr-0.88