# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1388880238 -3600
# Node ID 941ba53b4335fcf34a033b958c77af1db43b7018
# Parent  9aa60a3557600c633e38b9a239e203463e9834d7
Add a desktop file and up doc about images

diff -r 9aa60a355760 -r 941ba53b4335 Makefile
--- a/Makefile	Sat Jan 04 20:21:17 2014 +0100
+++ b/Makefile	Sun Jan 05 01:03:58 2014 +0100
@@ -36,16 +36,17 @@
 	install -m 0700 -d $(DESTDIR)$(LOGIN)/auth
 	install -m 0755 -d $(DESTDIR)$(WEB)/content
 	install -m 0755 -d $(DESTDIR)$(WEB)/cache
-	#install -m 0777 -d $(DESTDIR)$(PREFIX)/share/applications
+	install -m 0777 -d $(DESTDIR)$(PREFIX)/share/applications
 	#install -m 0777 -d $(DESTDIR)$(PREFIX)/share/locale
 	
 	cp -a config.cgi favicon.ico index.cgi README style.css \
-		images lib plugins $(DESTDIR)$(WEB)
+		images lib plugins content $(DESTDIR)$(WEB)
 	
-	#install -m 0644 data/tinycm.desktop \
-	#	$(DESTDIR)$(PREFIX)/share/applications
+	install -m 0644 data/tinycm.desktop \
+		$(DESTDIR)$(PREFIX)/share/applications
 	#cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale
 	
+	# Auth system may be used by an other app
 	touch $(DESTDIR)$(LOGIN)/auth/people
 	chmod 0600 $(DESTDIR)$(LOGIN)/auth/people
 	chown -R www.www $(DESTDIR)$(LOGIN)/auth
@@ -55,4 +56,4 @@
 
 uninstall:
 	rm -rf $(DESTDIR)$(WEB)
-	#rm $(DESTDIR)$(PREFIX)/share/applications/tinycm.desktop
+	rm $(DESTDIR)$(PREFIX)/share/applications/tinycm.desktop
diff -r 9aa60a355760 -r 941ba53b4335 content/wiki/en/help.txt
--- a/content/wiki/en/help.txt	Sat Jan 04 20:21:17 2014 +0100
+++ b/content/wiki/en/help.txt	Sun Jan 05 01:03:58 2014 +0100
@@ -3,8 +3,10 @@
 <h2>Help</h2>
 
 <p>
-TinyCM lets you easily create nice web content. Clean, fast and CGI SHell powered!
-TinyCM provides a simple Wiki syntax, a JavaScript code helper, diff interface, dashboard, Hg integration and a plugin system. It can also be multi-user and a great collaboration tool.
+TinyCM lets you easily create nice web content. Clean, fast and CGI SHell
+powered! TinyCM provides a simple Wiki syntax, a JavaScript code helper, 
+diff interface, dashboard, Hg integration and a plugin system. It can also
+be multi-user and a great collaboration tool.
 </p>
 
 <h3>Titles</h3>
@@ -24,22 +26,27 @@
 
 <h3>Page link and URL</h3>
 <p>
-To create a new page you have to create a new link to it. Then you can edit and add content to your new page. First the link title then the path to a new or existing page:
+To create a new page you have to create a new link to it. Then you can edit 
+and add content to your new page. First the link title then the path to a 
+new or existing page:
 </p>
 <pre>
 [Help|en/help]
 </pre>
 <p>
-You can also copy/paste a full URL such as:
+You can also use a full URL. Thos time we separate the link name of the URL
+with an exclamation !
 </p>
 <pre>
-http://www.slitaz.org/
+[SliTaz!http://www.slitaz.org/]
 </pre>
 
 <h3>Images</h3>
 <p>
-You can have some images in your content folder or use one from the web. Just paste the URL to the PNG image:
+You can have some images in your content folder or use one from the web.
+Just paste the URL to the PNG image or use the image name:
 </p>
 <pre>
-http://site.com/path/image.png
+[http://site.com/path/image.png]
+[image.png]
 </pre>
diff -r 9aa60a355760 -r 941ba53b4335 data/tinycm.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/tinycm.desktop	Sun Jan 05 01:03:58 2014 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Content Manager
+Name[fr]=Gestionnaire de contenu
+Icon=slitaz-doc
+Exec=browser http://localhost/tinycm/index.cgi
+Type=Application
+Categories=Office;
+