Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / bugs / Problem_with_displaying_smileys_on_inline_page.mdwn

diff --git a/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn b/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn
index f81a7e6d0eb994529ff11e7b962edfa21aa71509..db244457dc381905ff22b3a3d87aa9e9081f6222 100644 (file)
--- a/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn
+++ b/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn
@@ -21,5 +21,5 @@ Do you have any idea how to fix it? I dont't want to have multiple
 
 >> Great! Thank you very much, Joey!
 
->> BTW, I love Git (and another distributed SCM) commit id. It's so human
+>> BTW, I love Git (and another distributed SCMs) commit id. It's so human
 >> friendly ;) --[[Paweł|ptecza]]