Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / ikiwiki / formatting.mdwn

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index f809fff0041b5df08c2f85d77b00c56d4ca04f75..befbce9aa421b3255bf8bb4012c898e38030e1b9 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -10,9 +10,6 @@ Leave blank lines between paragraphs.
 You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
 in single or double asterisks.
 
 You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
 in single or double asterisks.
 

------
-**Open-source software** may be developed in a *collaborative* public manner.
----

 To create a list, start each line with an asterisk:
 
 * "* this is my list"
 To create a list, start each line with an asterisk:
 
 * "* this is my list"