4 Commits

Author SHA1 Message Date
Elena Mishina
ccc722c090 added image 2016-01-19 14:00:15 +02:00
Elena Mishina
ea979ed0ae update 2016-01-15 08:15:16 +02:00
Alexandr Boltris
aef761f767 Merge branch 'master' into kdesktop
Take all from master branch.

Conflicts:
	Makefile
	admin-basics/index.txt
	asciidoc.conf
	desktop-kde/images/kde-desktop-with-widgets.png
	desktop-kde/images/kde-desktop.png
	desktop-kde/images/kde-helpcenter.png
	desktop-kde/images/kde-menu.png
	desktop-kde/images/kde-panel.png
	desktop-kde/images/kde-settings.png
	desktop-kde/images/kde-widgets-rotate.png
	desktop-kde/images/kde-widgets-select.png
	desktop-kde/images/kde-widgets-unlock.png
	desktop-software/file-manager/dolphin/images/dolphin-address.png
	desktop-software/file-manager/dolphin/images/dolphin-places.png
	desktop-software/file-manager/dolphin/images/dolphin.png
	desktop-software/file-manager/index.txt
	desktop-software/graphics/index.txt
	desktop-software/index.txt
	desktop-software/internet/im/index.txt
	desktop-software/internet/im/telepathy/images/telepathy-settings.png
	desktop-software/internet/im/telepathy/images/telepathy.png
	desktop-software/internet/mail/index.txt
	desktop-software/internet/mail/kmail/images/kmail-message.png
	desktop-software/internet/mail/kmail/images/kmail.png
	desktop-software/internet/mail/kmail/index.txt
	desktop-software/internet/web/index.txt
	desktop-software/internet/web/konqueror/images/konqueror.png
	desktop-software/multimedia/index.txt
	desktop-software/multimedia/kde/index.txt
	desktop-software/office/index.txt
	desktop-software/others/index.txt
	desktop-software/others/k3b/images/k3b.png
	docs.spec
	index.txt
	install-guide/alternative-install.txt
	install-guide/images/boot.png
	install-guide/images/installer-preinstall.png
	install-guide/images/pkg-groups.png
	install-guide/images/sysconfig.png
	install-guide/images/vm.png
	install-guide/vm.txt
	packages/apt-get.txt
	ru-RU/images/boot-live.png
	ru-RU/images/desktop-xfce.png
	ru-RU/images/hello.png
	ru-RU/images/live-system.png
	ru-RU/images/nm-applet-help.png
	ru-RU/images/pidgin-settings.png
	ru-RU/images/pidgin.png
	ru-RU/images/pkg-0.png
	ru-RU/images/prepare-hdd.png
	ru-RU/images/set-language.png
	ru-RU/images/small_cd-writer.png
	ru-RU/images/thunar.png
	ru-RU/images/thunderbird-message.png
	ru-RU/images/thunderbird.png
	ru-RU/images/xfce-setting-manager.png
	system-management/acc/gui.txt
	system-management/network/images/knetworkmanager-settings.png
	system-management/network/networkmanager.txt
	system-start/system-login-dm.txt
	whatis-distro/index.txt
2014-07-15 08:59:43 +03:00
Alexandr Boltris
4d2081954d change format: asciidoc -> docbook 2014-05-07 13:48:09 +03:00