Merge branch 'simply' of git.alt:/people/cas/packages/branding into simply

branding.spec

@@ -7,7 +7,7 @@
 
 Name: branding-simply-linux
 Version: 6.0.0
-Release: alt24
+Release: alt26
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
@@ -200,6 +200,8 @@ Conflicts: indexhtml-school-server
 Conflicts: branding-altlinux-backup-server-indexhtml
 
 Requires: xdg-utils 
+Requires: docs-simply-linux
+Requires: docs-linux_intro
 Requires(post): indexhtml-common
 
 %description indexhtml
@@ -399,6 +401,13 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 /etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
 
 %changelog
+* Fri Sep 16 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt26
+- Add requires for documentation
+
+* Thu Sep 15 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt25
+- Use russian license text for Ukrainian
+- Fix English text in indexhtml
+
 * Tue Sep 13 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt24
 - Add project web-site
 - Fix ALT Linux web-site in English version

components/indexhtml/index-en.html.in

@@ -76,7 +76,7 @@
 </td></tr>
 
 <!-- Social networks -->
-<tr><td colspan="3" id="social">We will be glade to meet you in social networks:</td></tr>
+<tr><td colspan="3" id="social">We will be glade to meet you on the following social networks:</td></tr>
 <tr>
 <th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
 <th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>

notes/license.uk.html.in

@@ -0,0 +1 @@
+license.ru.html.in

notes/livecd-start.uk.html

@@ -0,0 +1 @@
+livecd-start.ru.html