diff options
author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-24 02:40:58 +0000 |
---|---|---|
committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-24 02:40:58 +0000 |
commit | 16221f1ea98dc9cb904a043cb447a18e429c7b19 (patch) | |
tree | 97983c60da09adb6a1c6f871ee1b106760e15533 /DOCS | |
parent | bf95ce4db54f23b4369af820a166f19cb235bded (diff) | |
download | mpv-16221f1ea98dc9cb904a043cb447a18e429c7b19.tar.bz2 mpv-16221f1ea98dc9cb904a043cb447a18e429c7b19.tar.xz |
r23578: Fix license header.
r23579: Activate license notice.
r23594: added some carriage returns and full stops, plus a missing 'option'
r23608: Nico claims to never have had any problems with X11 compilation on Mandrake.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23616 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/xml/ru/documentation.xml | 10 | ||||
-rw-r--r-- | DOCS/xml/ru/faq.xml | 8 | ||||
-rw-r--r-- | DOCS/xml/ru/video.xml | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/DOCS/xml/ru/documentation.xml b/DOCS/xml/ru/documentation.xml index bf208934d4..1da01f713e 100644 --- a/DOCS/xml/ru/documentation.xml +++ b/DOCS/xml/ru/documentation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- synced with r21867 --> +<!-- synced with r23579 --> <bookinfo id="toc"> <title><application>MPlayer</application> - The Movie Player</title> @@ -16,24 +16,22 @@ <year>2007</year> <holder>команда MPlayer[MPlayer team]</holder> </copyright> -<!-- <legalnotice> <title>License</title> - <para>This program is free software; you can redistribute it and/or modify + <para>MPlayer is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</para> - <para>This program is distributed in the hope that it will be useful, but + <para>MPlayer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</para> <para>You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, + along with MPlayer; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</para> </legalnotice> ---> </bookinfo> diff --git a/DOCS/xml/ru/faq.xml b/DOCS/xml/ru/faq.xml index bc5341fedd..405f155fca 100644 --- a/DOCS/xml/ru/faq.xml +++ b/DOCS/xml/ru/faq.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- synced with r21930 --> +<!-- synced with r23608 --> <chapter id="faq" xreflabel="FAQ"> <title>Часто Задаваемые вопросы</title> @@ -146,14 +146,14 @@ Configure завершается с указанным сообщением, и <filename>xlibs-dev</filename> в Debian Woody и <filename>libx11-dev</filename> в Debian Sarge. Также проверьте существуют ли символические ссылки <filename class="directory">/usr/X11</filename> и -<filename class="directory">/usr/include/X11</filename> (это может быть -проблемой в Mandrake). +<filename class="directory">/usr/include/X11</filename>. </para></answer> </qandaentry> <qandaentry> <question><para> -Сборка в Mac OS 10.3 приводит к нескольким ошибкам линковки</para></question> +Сборка в Mac OS 10.3 приводит к нескольким ошибкам линковки +</para></question> <answer> <para> Как правило, ошибка линковки выглядит так: diff --git a/DOCS/xml/ru/video.xml b/DOCS/xml/ru/video.xml index ba4a01a30c..7101c862ac 100644 --- a/DOCS/xml/ru/video.xml +++ b/DOCS/xml/ru/video.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- synced with r23272 --> +<!-- synced with r23594 --> <chapter id="video"> <title>Устройства вывода видео</title> @@ -317,7 +317,7 @@ EndSection<!-- <para> Если хотите использовать Xv с картами на базе Kyro (например, Hercules Prophet 4000XT), следует скачать драйверы с -<ulink url="http://www.powervr.com/">сайта PowerVR</ulink> +<ulink url="http://www.powervr.com/">сайта PowerVR</ulink>. </para> </sect2> </sect1> |