Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/logo.mdwn b/doc/logo.mdwn
index 9e33aa516b626fabfb739c99f3743f37e967d232..5e2b3c736ad780a6dab54ccd510e9103ea76d2b9 100644 (file)
--- a/doc/logo.mdwn
+++ b/doc/logo.mdwn
@@ -29,6 +29,10 @@ added).
 
   Contributed by Recai Oktaş
 
 
   Contributed by Recai Oktaş
 

+* [[favicon.svgz]] is used to generate the favicon.ico:
+
+        inkscape -w 16 -i favicon -e favicon.ico favicon.svgz
+

 * [[ikiwiki_logo|ikiwiki_old2.png]]
 
   [[SVG_source|ikiwiki_old2.svgz]] to this older version of the logo.
 * [[ikiwiki_logo|ikiwiki_old2.png]]
 
   [[SVG_source|ikiwiki_old2.svgz]] to this older version of the logo.


@@ -47,3 +51,9 @@ added).
         \end{document}
 
   Contributed by [[JeroenSchot]]
         \end{document}
 
   Contributed by [[JeroenSchot]]

+
+* [iki.svg](http://jblevins.org/svg/iki.svg)
+
+  A simplified (442 byte) plain SVG version of the ikiwiki favicon.
+
+  Contributed by [[JasonBlevins]]