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
This commit is contained in:
voroshil 2007-06-24 02:40:58 +00:00
parent bf95ce4db5
commit 16221f1ea9
3 changed files with 10 additions and 12 deletions

View File

@ -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>

View File

@ -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>
Как правило, ошибка линковки выглядит так:

View File

@ -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>