[MERGE]: Merge with latest trunk-addons

bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5

1 files changed, 35 insertions, 0 deletions

diff --git a/addons/document_page/static/src/lib/wiky/input_complete b/addons/document_page/static/src/lib/wiky/input_complete
new file mode 100755
index 00000000000..c7e860cccf9
--- /dev/null
+++ b/addons/document_page/static/src/lib/wiky/input_complete
@@ -0,0 +1,35 @@
+=== Heading ===
+Some content
+I would like to add another line
+
+== Subheading ==
+Some more content
+Some more lines1
+:A line with indent
+:: A 2-indented line
+:: more
+:back to 1-indented line
+
+This is Taeyeon.
+[[File:http://www.oknation.net/blog/home/blog_data/12/2012/images/ty4.jpg Taeyeon]]
+Taeyeon is so cute.
+
+This is a link:[http://www.google.com Google].
+This is a bold link:'''[http://www.google.com Google]'''.
+This is a bold-italic link:'''''[http://www.google.com Google]'''''.
+This is '''bold''', '''''bold-italic''''', and ''italic''
+
+
+# First
+# second
+## Second-First
+*** First Point
+*** Second Point
+#### z
+#### y
+#### x
+*** Third Point
+## Second-Second [ftp://www.facebook.com FacebookFTP]
+## Second-Third [http://www.google.com Google Here] 
+# third
+