From e1fd44920a5ce340673edb8c85637c793adee638 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@somosazucar.org>
Date: Wed, 02 Oct 2013 13:26:44 +0000
Subject: pre-release

---
diff --git a/etc/sweets.conf b/etc/sweets.conf
index ff5aa11..6780755 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -1,15 +1,15 @@
-[main]
+#[main]
 # Helps while debugging
-debug = 3
+#debug = 3
 
 [shell]
 # Space separated list of plugins to enable.
 # To upload users' stats to a Sugar Network node, add "stats" plugin.
 plugins = telepathy proxy sn stats
 
-[webui]
+#[webui]
 # this is for testing only, allows for easier automatic testing
-webui-host = 0.0.0.0
+#webui-host = 0.0.0.0
 
 [blacklist]
 cpsection =
@@ -23,7 +23,7 @@ cpsection =
 # http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
 [client]
 # url to connect to Sugar Network server API
-api-url = http://node-testing.sugarlabs.org
+api-url = http://node.sugarlabs.org
 # space separated list of layers to restrict Sugar Network content by
 # for now, "pilot" layer is being used to QA most useful/stable activities
 layers = pilot
@@ -48,4 +48,4 @@ stats-timeout = 3600
 # Default parameters for sugar-plugin-upgrade package
 [sugar-plugin-upgrade]
 # if more than 0, do regular unattended system update with specified delay in seconds
-upgrade-timeout = 86400
+upgrade-timeout = 0
diff --git a/image/common.ini b/image/common.ini
index 4d7de74..4e1517e 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -67,32 +67,32 @@ offline_activities =
     org.laptop.WebActivity,
     org.laptop.Calculate,
     org.laptop.Chat,
-#    org.vpri.EtoysActivity,
+    org.vpri.EtoysActivity,
     org.laptop.ImageViewerActivity,
-#    org.laptop.sugar.Jukebox,
-#    org.laptop.sugar.ReadActivity,
+    org.laptop.sugar.Jukebox,
+    org.laptop.sugar.ReadActivity,
     org.laptop.Terminal,
-#   org.laptop.TurtleArtActivity,
+    org.laptop.TurtleArtActivity,
     org.laptop.AbiWordActivity,
-#    org.worldwideworkshop.olpc.JigsawPuzzle,
-#    org.laptop.TamTamMini,
-#    org.laptop.Memorize,
+    org.worldwideworkshop.olpc.JigsawPuzzle,
+    org.laptop.TamTamMini,
+    org.laptop.Memorize,
     org.gnome.Labyrinth,
     org.laptop.RecordActivity,
     org.laptop.Oficina,
     com.jotaro.ImplodeActivity,
-#    org.laptop.physics,
+    org.laptop.physics,
     org.laptop.MeasureActivity,
-#    org.somosazucar.ServidorVNC,
+    org.somosazucar.ServidorVNC,
 #net.gcompris,
-#    edu.mit.media.ScratchActivity,
-#    org.ceibaljam.conozcoamerica,
+    edu.mit.media.ScratchActivity,
+    org.ceibaljam.conozcoamerica,
     org.sugarlabs.ICanReadActivity,
     org.sugarlabs.SimpleGraph,
     org.laptop.TurtleArtButia,
-#    vu.lux.olpc.Speak,
-#    org.laptop.WikipediaActivity,
-#    org.laptop.WikipediaActivityQU,
+    vu.lux.olpc.Speak,
+    org.laptop.WikipediaActivity,
+#org.laptop.WikipediaActivityQU,
     mulawa.Sudoku
 
 # List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
@@ -100,16 +100,16 @@ offline_activities =
 # to be mentioned in `offline_activities` option as well.
 favorite_activities =
     org.laptop.WebActivity,
-#    org.laptop.WikipediaActivity,
+    org.laptop.WikipediaActivity,
     org.laptop.RecordActivity,
     org.laptop.Calculate,
     org.laptop.Chat,
-#    org.laptop.TurtleArtActivity,
+    org.laptop.TurtleArtActivity,
     org.laptop.AbiWordActivity,
-#    org.laptop.physics,
-#    org.laptop.TamTamMini,
-#    org.ceibaljam.conozcoamerica,
-#    vu.lux.olpc.Speak,
+    org.laptop.physics,
+    org.laptop.TamTamMini,
+    org.ceibaljam.conozcoamerica,
+    vu.lux.olpc.Speak,
     org.laptop.Terminal
 
 [custom_packages]
--
cgit v0.9.1