[SCM] Website for Isaac project branch, ikiwiki, updated. 1567fcf04cd9972f8766691fe003a77d82fba14c

[Mildred Ki'Lya]

The following commit has been merged in the ikiwiki branch:
commit 1567fcf04cd9972f8766691fe003a77d82fba14c
Author: Mildred Ki'Lya <silkensedai at online.fr>
Date:   Wed Sep 9 23:29:15 2009 +0200

    Update ikiwiki site

diff --git a/.ikiwiki/ikiwiki.setup b/.ikiwiki/ikiwiki.setup
index 985d7c7..53aeaa4 100644
--- a/.ikiwiki/ikiwiki.setup
+++ b/.ikiwiki/ikiwiki.setup
@@ -17,7 +17,7 @@ use IkiWiki::Setup::Standard {
 	# where the source of the wiki is located
 	srcdir => '.',
 	# where to build the wiki
-	destdir => '.',
+	destdir => 'html',
 	# base url to the wiki
 	url => '',
 	# url to the ikiwiki.cgi
@@ -76,7 +76,8 @@ use IkiWiki::Setup::Standard {
 	# environment variables
 	ENV => {},
 	# regexp of source files to ignore
-	#exclude => '\\.wav$',
+        exclude => '^(html/.*|.*~)$',
+        #exclude => '\\.wav$',
 	# specifies the characters that are allowed in source filenames
 	wiki_file_chars => '-[:alnum:]+/.:_',
 	# allow symlinks in the path leading to the srcdir (potentially insecure)
diff --git a/Makefile b/Makefile
index 0def82c..508c848 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
 
-ikiwiki: clean
-	ikiwiki --setup .ikiwiki/ikiwiki.setup . .
+ikiwiki:
+	ikiwiki --setup .ikiwiki/ikiwiki.setup
+	#rm -rf html/html
 
 clean:
 	find . -name "*~" | xargs rm -f
 
-send: clean
-	sed "s|destdir => '.'|destdir => 'html'|" .ikiwiki/ikiwiki.setup > .ikiwiki/ikiwiki.setup.send
-	ikiwiki --setup .ikiwiki/ikiwiki.setup.send
-	rm -rf html/html
+send:
+	ikiwiki --setup .ikiwiki/ikiwiki.setup
+	#rm -rf html/html
 	cd html && git add -A
 	cd html && git commit -m "Refresh `date`"
-	cd html && git push origin mildred-compiled
-	git push origin mildred-compiled
+	cd html && git update-ref refs/heads/ikiwiki-compiled HEAD
+	cd html && git push -f origin ikiwiki-compiled
+	git push -f origin ikiwiki-compiled
 
 .PHONY: ikiwiki clean send
diff --git a/html b/html
index 815166a..c08a7f3 160000
--- a/html
+++ b/html
@@ -1 +1 @@
-Subproject commit 815166add43f3747e5ef344aa914e4ba34818905
+Subproject commit c08a7f3f40dd0103f9d4aef35c82a043a72f4931
diff --git a/sidebar/community.mdwn b/sidebar/community.mdwn
index 7690707..b193897 100644
--- a/sidebar/community.mdwn
+++ b/sidebar/community.mdwn
@@ -1,3 +1,3 @@
 [[Community|community]]
-=========
+=======================
 
diff --git a/sidebar/language.mdwn b/sidebar/language.mdwn
index 08d67a8..f45cb6e 100644
--- a/sidebar/language.mdwn
+++ b/sidebar/language.mdwn
@@ -1,5 +1,5 @@
-Language
-========
+[[Language|/language]]
+======================
 
 * [[About|/language]]
 * [[Documentation|/language/docs]]

-- 
Website for Isaac project