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 339457d2fc92c39e03f771e371fd731381ebb126..5e2b3c736ad780a6dab54ccd510e9103ea76d2b9 100644 (file)
--- a/doc/logo.mdwn
+++ b/doc/logo.mdwn
@@ -1,6 +1,6 @@
 The ikiwiki logo *reflects* ikiwiki turning the regular wiki concept 
 on its head by being a wiki compiler. Or maybe just the fact that "ikiwiki"
 The ikiwiki logo *reflects* ikiwiki turning the regular wiki concept 
 on its head by being a wiki compiler. Or maybe just the fact that "ikiwiki"

-is an anagram. 
+is an palindrome. 

 
 Anyway, if you have this logo in other fonts or colors, feel free to send
 it to [[Joey]] for inclusion here. (Or upload it, once that feature is
 
 Anyway, if you have this logo in other fonts or colors, feel free to send
 it to [[Joey]] for inclusion here. (Or upload it, once that feature is


@@ -13,30 +13,47 @@ added).
   [[SVG_source|ikiwiki.svgz]], can be used to generate a logo at any size
   with a command like:  
 
   [[SVG_source|ikiwiki.svgz]], can be used to generate a logo at any size
   with a command like:  
 

-       inkscape -w 90 -i logo -e ikiwiki.png ikiwiki.svgz
+        inkscape -w 90 -i logo -e ikiwiki.png ikiwiki.svgz  
+        inkscape -w 150 -i logo -e ikiwiki_large.png ikiwiki.svgz

 
   The [[favicon.ico]] can also be generated from this file, as follows:
 
 
   The [[favicon.ico]] can also be generated from this file, as follows:
 

-       inkscape -w 16 -i favicon -e favicon.ico ikiwiki.svgz
+        inkscape -w 16 -i favicon -e favicon.ico ikiwiki.svgz

 
   The button can also be generated as follows:
 
 
   The button can also be generated as follows:
 

-       inkscape -w 80 -i button -e ikiwiki_button.png ikiwiki.svgz
+        inkscape -w 80 -i button -e ikiwiki_button.png ikiwiki.svgz

 
   Some other alternate icons and buttons are also included in the svg file
   and can be extracted by specifying their names.
 
   Contributed by Recai Oktaş
 
 
   Some other alternate icons and buttons are also included in the svg file
   and can be extracted by specifying their names.
 
   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.
+
+  Contributed by Recai Oktaş
+

 * [[ikiwiki_logo|ikiwiki_old.png]] 
 
   LaTeX source to an image approximating the above:
 
 * [[ikiwiki_logo|ikiwiki_old.png]] 
 
   LaTeX source to an image approximating the above:
 

-       \documentclass{article}
-       \usepackage{graphicx}
-       \begin{document}
-       \pagestyle{empty}
-       \huge\reflectbox{iki}wiki
-       \end{document}
+        \documentclass{article}
+        \usepackage{graphicx}
+        \begin{document}
+        \pagestyle{empty}
+        \huge\reflectbox{iki}wiki
+        \end{document}

 
   Contributed by [[JeroenSchot]]
 
   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]]