diff --git a/readme.txt b/readme.txt
index 853a0f0d3..6b17d5fb3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,3 +1,12 @@
+/*
+ * Cocktail, HTML rendering engine
+ * http://haxe.org/com/libs/cocktail
+ *
+ * Copyright (c) Silex Labs
+ * Cocktail is available under the MIT license
+ * http://www.silexlabs.org/labs/cocktail-licensing/
+*/
+
== Cocktail, HTML rendering engine ==
Cocktail is cross-platform, embeddable and native.
@@ -14,59 +23,55 @@ Native
Cocktail do not require any virtual machine, it is not interpreted.
This has a positive impact on the performances and allows access to native functionnalities and libraries in native language such as objective C, C++, php, ActionScript…
-Silex Labs Cocktail library is released under GPL.
+Silex Labs Cocktail library is released under MIT.
== Links ==
-Articles and demos
+Tutorials
- * Getting started with Cocktail
- => http://haxe.org/com/libs/cocktail/getting_started_with_cocktail
- * Cocktail web app demo
- => http://haxe.org/com/libs/cocktail/cocktail_web_app_demo
- * Cocktail v1.0 Sunrise: progress report
- => http://www.silexlabs.org/?p=130892
- * Cocktail, for an open bar community !
- => http://www.silexlabs.org/the-blog
- * Combining Cocktail Haxe with PhoneGap
- => http://www.blog.elimak.com/2012/07/combining-cocktail-haxe-with-phonegap/
+* Getting started with Cocktail
+=> http://haxe.org/com/libs/cocktail/getting_started_with_cocktail
Developer resources
- * Main wiki on Haxe libs
- => http://haxe.org/com/libs/cocktail
- * Forums and working group
- => http://www.silexlabs.org/groups/labs/cocktail/forum/
- * Cocktail download and source code
- => https://github.com/silexlabs/Cocktail
+* Main wiki on Haxe libs
+=> http://haxe.org/com/libs/cocktail
+* Forums and working group
+=> http://www.silexlabs.org/groups/labs/cocktail/forum/
+* Cocktail download and source code
+=> https://github.com/silexlabs/Cocktail
+* Old Wiki on Git Hub
+=> https://github.com/silexlabs/Cocktail/wiki
Other resources
- * Cocktail supported platforms
- => http://haxe.org/com/libs/cocktail/supported_platforms
- * Cocktail future platforms
- => http://www.silexlabs.org/groups/labs/cocktail/docs/cocktail-future-platforms
- * Official Cocktail definition
- => http://www.silexlabs.org/groups/labs/cocktail/docs/official-cocktail-definition
- * Cocktail road map
- => https://github.com/silexlabs/Cocktail/wiki/Road-map
- * Cocktail GPL license
- => http://www.gnu.org/copyleft/gpl.html
+* Cocktail supported platforms
+=> http://haxe.org/com/libs/cocktail/supported_platforms
+* Cocktail future platforms
+=> http://www.silexlabs.org/groups/labs/cocktail/docs/cocktail-future-platforms
+* Official Cocktail definition
+=> http://www.silexlabs.org/groups/labs/cocktail/docs/official-cocktail-definition
+* Cocktail road map
+=> http://haxe.org/com/libs/cocktail/cocktail_s_road_map
+* Cocktail MIT license
+=> http://www.silexlabs.org/labs/cocktail-licensing/
+* W3C CSS unit tests
+=> http://haxe.org/com/libs/cocktail/w3c_css_unit_tests
Release notes
- * Cocktail Release notes - v1.0.0alpha1
- => http://www.silexlabs.org/groups/labs/cocktail/docs/cocktail-release-notes-v1-0-0alpha1
- * Cocktail Release notes - v1.0.0alpha2
- => http://www.silexlabs.org/groups/labs/cocktail/docs/cocktail-release-notes-v1-0-0alpha2
-
+* Cocktail Release notes – v1.0.0alpha1
+=> http://www.silexlabs.org/groups/labs/cocktail/docs/cocktail-release-notes-v1-0-0alpha1
+* Cocktail Release notes – v1.0.0alpha2
+=> http://www.silexlabs.org/groups/labs/cocktail/docs/cocktail-release-notes-v1-0-0alpha2
+Articles and demos
-== license ==
-
-Cocktail, HTML rendering engine
-http://haxe.org/com/libs/cocktail
-
-Copyright (c) Silex Labs
-Cocktail is available under the MIT license
-http://www.silexlabs.org/labs/cocktail-licensing/
\ No newline at end of file
+* Cocktail web app demo
+=> http://haxe.org/com/libs/cocktail/cocktail_web_app_demo
+* Cocktail v1.0 Sunrise: progress report
+=> http://www.silexlabs.org/?p=130892
+* Cocktail, for an open bar community !
+=> http://www.silexlabs.org/the-blog* Cocktail, for an open bar community !
+* Combining Cocktail with PhoneGap
+=> http://www.blog.elimak.com/2012/07/combining-cocktail-haxe-with-phonegap/
diff --git a/samples/01-HelloWorld/compile-nme.nmml b/samples/01-HelloWorld/compile-nme.nmml
index c9964f202..033294838 100644
--- a/samples/01-HelloWorld/compile-nme.nmml
+++ b/samples/01-HelloWorld/compile-nme.nmml
@@ -1,23 +1,23 @@
-
-
-
-
-
+
+
+
-
-
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/samples/02-load_picture/compile-nme.nmml b/samples/02-load_picture/compile-nme.nmml
index fd5de786a..ea449feaf 100644
--- a/samples/02-load_picture/compile-nme.nmml
+++ b/samples/02-load_picture/compile-nme.nmml
@@ -1,25 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/03-style_text/compile-nme.nmml b/samples/03-style_text/compile-nme.nmml
index c9964f202..54c9bb039 100644
--- a/samples/03-style_text/compile-nme.nmml
+++ b/samples/03-style_text/compile-nme.nmml
@@ -1,10 +1,10 @@
-
-
+
+
+
-
diff --git a/samples/04-inner_html/compile-nme.nmml b/samples/04-inner_html/compile-nme.nmml
index e924cd84c..738a7011b 100644
--- a/samples/04-inner_html/compile-nme.nmml
+++ b/samples/04-inner_html/compile-nme.nmml
@@ -1,10 +1,10 @@
-
-
+
+
+
-
diff --git a/samples/05-HaxeJS-vs-HTML/Main.hx b/samples/05-HaxeJS-vs-HTML/Main.hx
index 59c183f6d..ababe9fef 100644
--- a/samples/05-HaxeJS-vs-HTML/Main.hx
+++ b/samples/05-HaxeJS-vs-HTML/Main.hx
@@ -52,7 +52,7 @@ class Main
//HTML & semantics
var paragraph = Lib.document.createElement("p");
- paragraph.appendChild(Lib.document.createTextNode("Cocktail is a HTML rendering engine. It focuses on UIs and bridges the gap between all the targets supported by haXe."));
+ paragraph.appendChild(Lib.document.createTextNode("Cocktail is a HTML rendering engine."));
Lib.document.body.appendChild(paragraph);
//CSS text
@@ -87,7 +87,7 @@ class Main
function buildDomHtml()
{
//HxTML
- Lib.document.body.innerHTML = '
Hello Cocktail
Cocktail is a cross-platform library for the haXe programming language. It focuses on UIs and bridges the gap between all the targets supported by haXe.