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 91988ad9d94a6ae3645d8034f83b8d1e83912c19..5e2b3c736ad780a6dab54ccd510e9103ea76d2b9 100644 (file)
--- a/doc/logo.mdwn
+++ b/doc/logo.mdwn
@@ -1,30 +1,41 @@
 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
 added).
 
 * [[ikiwiki_logo|ikiwiki.png]]  
 
 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
 added).
 
 * [[ikiwiki_logo|ikiwiki.png]]  

-  [[ikiwiki_logo_large|ikiwiki_large.png]]
-  [[ikiwiki_icon|ikiwiki_icon.png]]
+  [[ikiwiki_logo_large|ikiwiki_large.png]]  
+  [[ikiwiki_button|ikiwiki_button.png]]

 
   [[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 icon can also be generated as follows:
+  The button can also be generated as follows:

 
 

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

 
 

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


@@ -32,11 +43,17 @@ added).
 
   LaTeX source to an image approximating the above:
 
 
   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]]