Merge remote branch 'sem/simply' into slinux

branding.spec

@@ -7,7 +7,7 @@
 
 Name: branding-simply-linux
 Version: 6.0.0
-Release: alt11
+Release: alt12
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
@@ -399,6 +399,11 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 /etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
 
 %changelog
+* Thu Jun 16 2011 Mikhail Efremov <sem@altlinux.org> 6.0.0-alt12
+- indexhtml: change link to user manual (by Artem Zolochevskiy).
+- menu: Drop unneeded desktop files.
+- etcscel: Changed display type of xkb plugin.
+
 * Tue Jun 14 2011 Mikhail Efremov <sem@altlinux.org> 6.0.0-alt11
 - new desktop files for libreoffice and xkill (by Alexandra Panyukova).
 - new images for installer steps (by Alexandra Panyukova).

components/indexhtml/index-en.html.in

@@ -54,8 +54,7 @@
 <div id="documentation">
 <h2>Documentation</h2>
 <ul>
- <li><a href="../alt-docs/index.html">User manual</a></li>
- <li><a href="../alt-docs/modules/index.html">Additional documentation</a></li>
+ <li><a href="../@DOCDIR@/index.html">User manual</a></li>
 </ul>
 </div>
 

components/indexhtml/index-ru.html.in

@@ -56,8 +56,7 @@
 <div id="documentation">
 <h2>Документация</h2>
 <ul>
- <li><a href="../alt-docs/index.html">Руководство пользователя</a></li>
- <li><a href="../alt-docs/modules/index.html">Дополнительная документация</a></li>
+ <li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
 </ul>
 </div>
 

configure.ac

@@ -10,10 +10,13 @@ LIGHT_LABELS_HEX=FFFFFF
 DARK_LABELS_HEX=000000
 MIDDLE_LABELS_HEX=4d4d4f
 
+DOCDIR=documentation
+
 AC_SUBST(THEME)
 AC_SUBST(NAME)
 AC_SUBST(STATUS)
 AC_SUBST(VERSION)
+AC_SUBST(DOCDIR)
 AC_SUBST(PROGRESS_COLOR)
 AC_SUBST(LIGHT_COLOR_HEX)
 AC_SUBST(MIDDLE_COLOR_HEX)