branch merge RCL_2_2
authorfturovic <frank.turovich@nokia.com>
Wed, 07 Oct 2009 15:24:54 -0500
branchRCL_2_2
changeset 525 700285552e33
parent 524 227eeddd4067 (diff)
parent 523 a37ccf171aa2 (current diff)
child 526 607d9c31901b
branch merge
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Geneva, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,28 +51,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.bugreport/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.bugreport/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,28 +51,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp.codescanner/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,28 +51,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 10px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Verdana, Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,27 +51,28 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
-	/* margin: 10px  0px; */
+	/* margin: 10px 0px; */
 	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FFC550;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FDCB2F;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp.doc.user/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Verdana, Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,21 +51,22 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FFC550;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FDCB2F;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Oct 07 15:24:54 2009 -0500
@@ -22,7 +22,7 @@
 </ul>
 <h3><a name="bugs230" id="bugs6"></a>Bugs Fixed in v2.3.0</h3>
 <ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5391">0</a> - ???</li>
+  <li><i>none</i></li>
 </ul>
 <h3><a name="bugs220" id="bugs7"></a>Bugs Fixed in v2.2.0</h3>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Wed Oct 07 15:24:54 2009 -0500
@@ -12,7 +12,7 @@
 .style1 {font-family: "Courier New", Courier, mono}
 .style5 {color: #FF0000}
 .style6 {font-weight: bold}
-  .style8 {color: #000000; font-weight: bold; }
+.style8 {color: #000000; font-weight: bold; }
   </style>
 </head>
 <body bgcolor="#ffffff">
@@ -41,10 +41,8 @@
   <li>P2 update services now supported. Updating Carbide.c++ should be more flexible and easier than before.</li>
 </ul>
 <h4><a name="220" id="2102"></a>2.2.0</h4>
-<blockquote>
-  <p><b>Eclipse 3.5 </b>&#8212; The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.5</a> for more information.</p>
-</blockquote>
 <ul>
+  <li><b>Eclipse 3.5 </b>&#8212; The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.5</a> for more information.</li>
   <li><b>CDT 6.0 </b>&#8212; The final version of CDT included as part of the Galileo release. See the <a href="http://wiki.eclipse.org/CDT/User/NewIn60">CDT 6.0 News and Noteworthy</a> page for more information.</li>
   <li><b>Java 6.0 </b>&#8212; Due to the above changes Carbide has also updated to use the Java Runtime Environment (JRE) 6.0. See <a href="http://java.sun.com/javase/6/webnotes/features.html">Java SE 6 Release Notes</a> page for more information.</li>
   <li><b>SBSv2 arguments field</b> - added a text field to the <a href="reference/wnd_build_prefs.htm">Build &gt; SBSv2</a> panel to allow parameter passing to Raptor builds.</li>
@@ -52,7 +50,7 @@
 </ul>
 <h4><a name="210" id="210"></a>2.1.0</h4>
 <ul>
-  <li><b>Performance inprovements</b> - the following areas of Carbide have been optimized to improve performance:
+  <li><b>Performance improvements</b> - the following areas of Carbide have been optimized to improve performance:
     <ul>
       <li><b>Importing large projects</b>   - Importing large projects is one of our primary points of performance improvements. When too many project roots were used the more source and include paths were brought into the project, up to an including entire SDKs. Generally, we found that once a project root contains over 15-20K files Carbide became extremely sluggish. We have improved some edge cases where project roots were calculated incorrectly and now include only what's really needed. </li>
       <li><b>Modifying Project Settings and Build Configuration Data</b>-    This is quite a significant improvement as modifying MMP files and switching build configurations are a couple of the most common operations done by end-users and because the time spent processing project and configuration data is done on the main thread, locking the UI. With optimization in one CDT function we were able to bring most project-related and configuration switch changes from 20 seconds to less than 3 seconds. You should also see improvements when saving MMP and INF files (the &quot;Refreshing Configuration Job&quot;). </li>
@@ -90,7 +88,7 @@
   <li><b>Executables view improvements</b> &#8212; The <a href="reference/view_executables.htm">Executables</a> view now supports the loading of some additional DLL cases to ensure that the DLLs you want to debug are available during a debug session. In addition,  a Remove button has been added to the view's toolbar that makes it easier for you to remove any executables from the list.</li>
   <li><b>More indexer improvements </b>&#8212; Speed improvements for code completion, syntax coloring, and much more.</li>
   <li><b>Remote Connections view</b> &#8212; A visual list of <a href="reference/trk/view_remote_connection.htm">remote connections</a> and their state for managing multiple and diverse device connections.</li>
-  <li><b>Partial upgrade SIS file support</b> &#8212; Carbide now supports the generation of partial upgrade  SIS/SISX files. This increases debugger turnaround by only generating new files for changes and uploading these smaller executables to the device.</li>
+  <li><b>Partial upgrade SIS file support</b> &#8212; Carbide now supports the generation of partial upgrade SIS/SISX files. This increases debugger turnaround by only generating new files for changes and uploading these smaller executables to the device.</li>
   <li><b>More Program Counter support </b>&#8212; Added a Move to Line command for the debugger that enables you to move the PC to a new line while debugging without executing any intermediate lines or resuming execution.</li>
   <li>Multiple<b> TRK</b> improvements including:
     <ul>
@@ -240,11 +238,7 @@
       <td style="vertical-align: top;"> If you are in doubt about the contents select the folder in question, then hit F5 to refresh the directory from the file system.</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">Synergy 6.3 Installations will
-always crash Eclipse file navigation dialogs - The solution for this is
-to un-register cmexplorer.dll then reboot your machine. Un-registering
-this feature will only effect users that use Synergy integration to
-Windows Explorer. This issue is known to be fixed with Synergy 6.4.</td>
+      <td style="vertical-align: top;">Synergy 6.3 Installations will always crash Eclipse file navigation dialogs - The solution for this is to un-register cmexplorer.dll then reboot your machine. Un-registering this feature will only effect users that use Synergy integration to Windows Explorer. This issue is known to be fixed with Synergy 6.4.</td>
       <td style="vertical-align: top;">The un-register command is:<br />
       <br />
       <font size="-1"><span class="code"
@@ -374,9 +368,7 @@
 </table>
 <h3><a name="support" id="support"></a>Technical support </h3>
 <p>The following support services are available:</p>
-<ul><li>Visit the <a href="http://discussion.forum.nokia.com/forum/forumdisplay.php?s=&amp;forumid=95">Forum Nokia Developer Discussion Board</a> for lively Carbide.c++ discussions </li>
-  <li>Forum Nokia Wiki - visit <a href="http://wiki.forum.nokia.com/index.php/Carbide.c++">wiki.forum.nokia.com/index.php/Carbide.c++</a> for updated information, downloads and tips </li>
-  <li>Customer feedback - send your comments and suggestions to <a href="mailto:feedback.carbide@nokia.com">feedback.carbide@nokia.com</a></li>
+<ul><li>Visit the <a href="http://web-dev.foundationhost.org/">Symbian Foundation</a> for Carbide.c++ and Symbian development information </li>
   <li>Read the <a href="http://sw.nokia.com/id/d11442a8-4eb1-4c01-97f2-fd8be139b93f/Carbide_cpp_On_Device_Debugging_v1_0_en.pdf">Carbide.c++ On-device Debugging</a> whitepaper or an introduction to on-device debugging for S60 3rd Edition devices<br />
   </li>
 </ul>
--- a/core/com.nokia.carbide.cpp/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -48,28 +47,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +88,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +96,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +114,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +124,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +135,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +156,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +172,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+aa:hover 	{ color: #FFD62C }
--- a/uidesigner/com.nokia.carbide.cpp.uiq.doc.user/book.css	Wed Oct 07 10:44:09 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.doc.user/book.css	Wed Oct 07 15:24:54 2009 -0500
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,28 +51,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }