Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.23
diff -u -r1.23 zonedata.c
--- zonedata.c	23 Oct 2004 20:41:05 -0000	1.23
+++ zonedata.c	27 Oct 2004 17:16:52 -0000
@@ -262,17 +262,22 @@
 		/* STUTTER not specified */
 		{ ZT_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" } },
 	},
-	{ 18, "sg", "Singapore", { 400, 200, 400, 2000 },
-	{
-		{ ZT_TONE_DIALTONE, "425" },
-		{ ZT_TONE_BUSY, "425/750,0/750" },
-		{ ZT_TONE_RINGTONE, "400+450/400,0/200,400+450/400,0/2000" },
+	{ 18, "sg", "Singapore",
+		/* Reference: http://www.ida.gov.sg/idaweb/doc/download/I397/ida_ts_pstn1_i4r2.pdf */
+		{ 400, 200, 400, 2000 },
+		{
+		{ ZT_TONE_DIALTONE,   "425" },
+		{ ZT_TONE_BUSY,       "425/750,0/750" },
+		{ ZT_TONE_RINGTONE,   "425*24/400,0/200,425*24/400,0/2000" },
 		{ ZT_TONE_CONGESTION, "425/250,0/250" },
-		{ ZT_TONE_CALLWAIT, "!425/200,!0/600,!425/200,!0/3000,!425/200,!0/600,!425/200" },
-		{ ZT_TONE_DIALRECALL, "400+450/100,0/500,425/500,0/2500" },
-		{ ZT_TONE_RECORDTONE, "1400/425,0/15000" },
-		{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
-		{ ZT_TONE_STUTTER, "!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200," } },
+		{ ZT_TONE_CALLWAIT,   "425*24/300,0/200,425*24/300,0/3200" },
+		{ ZT_TONE_STUTTER,    "!425/200,!0/200,!425/600,!0/200,"
+				      "!425/200,!0/200,!425/600,!0/200,"
+				      "!425/200,!0/200,!425/600,!0/200,"
+				      "!425/200,!0/200,!425/600,!0/200,425" },
+		{ ZT_TONE_INFO,       "950/330,1400/330,1800/330,0/1000" },	/* Special Information Tone (not in use) */
+		{ ZT_TONE_DIALRECALL, "425*24/500,0/500,425/500,0/2500" },	/* unspecified in IDA reference, use repeating Holding Tone A,B */
+		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" } },			/* unspecified in IDA reference, use 0.5s tone every 15s */
 	}, 	
 	{ 19, "il", "Israel", { 1000, 3000 },
 	{