svn: /phpdoc/ru/trunk/reference/tidy/ functions/tidy-access-count.xml functions/tidy-config-count.xml functions/tidy-error-count.xml functions/tidy-get-output.xml functions/tidy-warning-count.xml tidy/body.xml tidy/cleanrepair.xml tidy/construct.xml tidy/diagnose.xml tidy/errorbuffer.xml tidy/getconfig.xml tidy/gethtmlver.xml tidy/getopt.xml tidy/getoptdoc.xml tidy/getrelease.xml tidy/getstatus.xml tidy/head.xml tidy/html.xml tidy/isxhtml.xml tidy/isxml.xml tidy/parsefile.xml tidy/parsestring.xm
[email protected] (Sergey Panteleev) Tue, 01 Dec 2020 12:41:03 +0000
| Newsgroups | php.doc.ru |
|---|---|
| Message-ID | <[email protected]> |
sergey Tue, 01 Dec 2020 12:41:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=351817
Log:
docs(ru): Updated to English revision
Changed paths:
U phpdoc/ru/trunk/reference/tidy/functions/tidy-access-count.xml
U phpdoc/ru/trunk/reference/tidy/functions/tidy-config-count.xml
U phpdoc/ru/trunk/reference/tidy/functions/tidy-error-count.xml
U phpdoc/ru/trunk/reference/tidy/functions/tidy-get-output.xml
U phpdoc/ru/trunk/reference/tidy/functions/tidy-warning-count.xml
U phpdoc/ru/trunk/reference/tidy/tidy/body.xml
U phpdoc/ru/trunk/reference/tidy/tidy/cleanrepair.xml
U phpdoc/ru/trunk/reference/tidy/tidy/construct.xml
U phpdoc/ru/trunk/reference/tidy/tidy/diagnose.xml
U phpdoc/ru/trunk/reference/tidy/tidy/errorbuffer.xml
U phpdoc/ru/trunk/reference/tidy/tidy/getconfig.xml
U phpdoc/ru/trunk/reference/tidy/tidy/gethtmlver.xml
U phpdoc/ru/trunk/reference/tidy/tidy/getopt.xml
U phpdoc/ru/trunk/reference/tidy/tidy/getoptdoc.xml
U phpdoc/ru/trunk/reference/tidy/tidy/getrelease.xml
U phpdoc/ru/trunk/reference/tidy/tidy/getstatus.xml
U phpdoc/ru/trunk/reference/tidy/tidy/head.xml
U phpdoc/ru/trunk/reference/tidy/tidy/html.xml
U phpdoc/ru/trunk/reference/tidy/tidy/isxhtml.xml
U phpdoc/ru/trunk/reference/tidy/tidy/isxml.xml
U phpdoc/ru/trunk/reference/tidy/tidy/parsefile.xml
U phpdoc/ru/trunk/reference/tidy/tidy/parsestring.xml
U phpdoc/ru/trunk/reference/tidy/tidy/repairfile.xml
U phpdoc/ru/trunk/reference/tidy/tidy/repairstring.xml
U phpdoc/ru/trunk/reference/tidy/tidy/root.xml
svn-diffs-351817.txt
(text/x-diff, 56.9 KB)
Modified: phpdoc/ru/trunk/reference/tidy/functions/tidy-access-count.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/functions/tidy-access-count.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/functions/tidy-access-count.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 334762 Maintainer: aur Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: aur Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xml:id="function.tidy-access-count" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>int</type><methodname>tidy_access_count</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
<function>tidy_access_count</function> возвращает число доступных предупреждений, найденных в рассмотренном
@@ -23,7 +23,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -95,7 +95,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/functions/tidy-config-count.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/functions/tidy-config-count.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/functions/tidy-config-count.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 334762 Maintainer: aur Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: aur Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xml:id="function.tidy-config-count" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>int</type><methodname>tidy_config_count</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает число ошибок в конфигурации заданного объекта <parameter>tidy</parameter>.
@@ -23,7 +23,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -64,7 +64,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/functions/tidy-error-count.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/functions/tidy-error-count.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/functions/tidy-error-count.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 334762 Maintainer: aur Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: aur Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xml:id="function.tidy-error-count" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>int</type><methodname>tidy_error_count</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает число ошибок Tidy, встретившихся при рассмотрении документа.
@@ -23,7 +23,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -84,7 +84,6 @@
</simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/functions/tidy-get-output.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/functions/tidy-get-output.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/functions/tidy-get-output.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 334762 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="function.tidy-get-output" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>string</type><methodname>tidy_get_output</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Получить строку с восстановленным html.
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -74,7 +74,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/functions/tidy-warning-count.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/functions/tidy-warning-count.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/functions/tidy-warning-count.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 334762 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="function.tidy-warning-count" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>int</type><methodname>tidy_warning_count</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает число Tidy-предупреждений, встреченных в указанном документе.
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -69,7 +69,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/body.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/body.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/body.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.body" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,14 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::body</methodname>
- <void />
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::body</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>tidyNode</type><methodname>tidy_get_body</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_body</methodname>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает объект <classname>tidyNode</classname>, начиная с тега
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -96,7 +96,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/cleanrepair.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/cleanrepair.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/cleanrepair.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.cleanrepair" xmlns="http://docbook.org/ns/docbook">
@@ -11,18 +11,18 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>bool</type><methodname>tidy::cleanRepair</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>tidy_clean_repair</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Функция очищает и восстанавливает полученный tidy-объект
- <parameter>object</parameter>.
+ <parameter>tidy</parameter>.
</para>
</refsect1>
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -92,7 +92,6 @@
</simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/construct.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/construct.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/construct.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
-<refentry xml:id="tidy.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="tidy.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>tidy::__construct</refname>
<refpurpose>Создает новый <classname>tidy</classname>-объект</refpurpose>
@@ -9,13 +9,13 @@
</refnamediv>
<refsect1 role="description">
&reftitle.description;
- <methodsynopsis>
+ <constructorsynopsis>
<modifier>public</modifier> <methodname>tidy::__construct</methodname>
- <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter></methodparam>
- </methodsynopsis>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>filename</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
+ </constructorsynopsis>
<para>
Создает новый <classname>tidy</classname>-объект.
</para>
@@ -65,7 +65,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>use_include_path</parameter></term>
+ <term><parameter>useIncludePath</parameter></term>
<listitem>
<para>
Поиск файла в <link linkend="ini.include-path">include_path</link>.
@@ -82,6 +82,29 @@
Возвращает новый экземпляр <classname>tidy</classname>.
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>filename</parameter>, <parameter>config</parameter>,
+ <parameter>encoding</parameter> и <parameter>useIncludePath</parameter> теперь допускают значение null.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
@@ -140,7 +163,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/diagnose.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/diagnose.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/diagnose.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.diagnose" xmlns="http://docbook.org/ns/docbook">
@@ -11,17 +11,17 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>bool</type><methodname>tidy::diagnose</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>tidy_diagnose</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
- Выполняет диагностические тесты полученного tidy-объекта <parameter>object</parameter>,
+ Выполняет диагностические тесты полученного tidy-объекта <parameter>tidy</parameter>,
добавляя некоторую информацию о документе в буфер ошибок.
</para>
</refsect1>
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -101,7 +101,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/errorbuffer.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/errorbuffer.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/errorbuffer.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.props.errorbuffer" xmlns="http://docbook.org/ns/docbook">
@@ -12,10 +12,10 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop; (property):</para>
- <fieldsynopsis><modifier>public</modifier> <type>string</type><varname linkend="tidy.props.errorbuffer">tidy->errorBuffer</varname></fieldsynopsis>
+ <fieldsynopsis><modifier>public</modifier> <type>string</type><varname linkend="tidy.props.errorbuffer">tidy->errorBuffer</varname></fieldsynopsis>
<para>&style.procedural;:</para>
- <methodsynopsis role="procedural">
- <type>string</type><methodname>tidy_get_error_buffer</methodname>
+ <methodsynopsis>
+ <type class="union"><type>string</type><type>false</type></type><methodname>tidy_get_error_buffer</methodname>
<methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
@@ -42,7 +42,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Возвращает буфер ошибки в виде строки.
+ Возвращает буфер ошибки в виде строки или &false;, если буфер пустой.
</para>
</refsect1>
@@ -84,7 +84,6 @@
</simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/getconfig.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/getconfig.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/getconfig.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.getconfig" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -11,18 +11,18 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>array</type><methodname>tidy::getConfig</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>array</type><methodname>tidy_get_config</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Получает список используемых опций конфигурации в указанном объекте tidy
- <parameter>object</parameter>.
+ <parameter>tidy</parameter>.
</para>
</refsect1>
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -175,7 +175,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/gethtmlver.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/gethtmlver.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/gethtmlver.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.gethtmlver" xmlns="http://docbook.org/ns/docbook">
@@ -11,18 +11,18 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>int</type><methodname>tidy::getHtmlVer</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>int</type><methodname>tidy_get_html_ver</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает обнаруженную HTML версию для указанного объекта tidy
- <parameter>object</parameter>.
+ <parameter>tidy</parameter>.
</para>
</refsect1>
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -56,7 +56,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/getopt.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/getopt.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/getopt.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.getopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -11,19 +11,19 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>mixed</type><methodname>tidy::getOpt</methodname>
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <type class="union"><type>string</type><type>int</type><type>bool</type></type><methodname>tidy::getOpt</methodname>
<methodparam><type>string</type><parameter>option</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mixed</type><methodname>tidy_getopt</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>string</type><type>int</type><type>bool</type></type><methodname>tidy_getopt</methodname>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
<methodparam><type>string</type><parameter>option</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает значение указанного параметра <parameter>option</parameter> для
- указанного объекта tidy <parameter>object</parameter>.
+ указанного объекта tidy <parameter>tidy</parameter>.
</para>
</refsect1>
@@ -32,7 +32,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -103,7 +103,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/getoptdoc.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/getoptdoc.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/getoptdoc.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.getoptdoc" xmlns="http://docbook.org/ns/docbook">
@@ -13,15 +13,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>tidy::getOptDoc</methodname>
- <methodparam><type>string</type><parameter>optname</parameter></methodparam>
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>tidy::getOptDoc</methodname>
+ <methodparam><type>string</type><parameter>option</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>string</type><methodname>tidy_get_opt_doc</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
- <methodparam><type>string</type><parameter>optname</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>string</type><type>false</type></type><methodname>tidy_get_opt_doc</methodname>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
+ <methodparam><type>string</type><parameter>option</parameter></methodparam>
</methodsynopsis>
<para>
Функция <function>tidy_get_opt_doc</function> возвращает описание для опции с
@@ -40,7 +40,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -110,7 +110,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/getrelease.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/getrelease.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/getrelease.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.getrelease" xmlns="http://docbook.org/ns/docbook">
@@ -11,12 +11,12 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>string</type><methodname>tidy::getRelease</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>string</type><methodname>tidy_get_release</methodname>
<void/>
</methodsynopsis>
@@ -33,7 +33,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/getstatus.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/getstatus.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/getstatus.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.getstatus" xmlns="http://docbook.org/ns/docbook">
@@ -11,17 +11,17 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>int</type><methodname>tidy::getStatus</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>int</type><methodname>tidy_get_status</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
- Возвращает статус указанного tidy-объекта <parameter>object</parameter>.
+ Возвращает статус указанного tidy-объекта <parameter>tidy</parameter>.
</para>
</refsect1>
@@ -30,7 +30,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -75,7 +75,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/head.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/head.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/head.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.head" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,14 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::head</methodname>
- <void />
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::head</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>tidyNode</type><methodname>tidy_get_head</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_head</methodname>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает объект <classname>tidyNode</classname>, начиная с тега
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -95,7 +95,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/html.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/html.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/html.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.html" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,14 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::html</methodname>
- <void />
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::html</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>tidyNode</type><methodname>tidy_get_html</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_html</methodname>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает объект <classname>tidyNode</classname>, начиная с тега
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -99,7 +99,6 @@
</simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/isxhtml.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/isxhtml.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/isxhtml.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.isxhtml" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,14 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>bool</type><methodname>tidy::isXhtml</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>tidy_is_xhtml</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Определяет, является ли документ XHTML-документом.
@@ -30,7 +30,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -44,8 +44,8 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Эта функция возвращает &true;, если указанный tidy-объект
- <parameter>object</parameter> является XHTML-документом, или &false; в противном случае.
+ Функция возвращает &true;, если указанный tidy-объект
+ <parameter>tidy</parameter> является XHTML-документом, или &false; в противном случае.
</para>
<warning>
<para>
@@ -56,7 +56,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/isxml.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/isxml.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/isxml.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.isxml" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,14 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
+ <methodsynopsis role="oop">
<modifier>public</modifier> <type>bool</type><methodname>tidy::isXml</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>tidy_is_xml</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Определяет, является ли документ общим XML-документом (не HTML/XHTML).
@@ -30,7 +30,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -45,7 +45,7 @@
&reftitle.returnvalues;
<para>
Эта функция возвращает &true;, если указанный tidy-объект
- <parameter>object</parameter> является общим XML-документом (не HTML/XHTML),
+ <parameter>tidy</parameter> является общим XML-документом (не HTML/XHTML),
или &false; в противном случае.
</para>
<warning>
@@ -57,7 +57,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/parsefile.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/parsefile.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/parsefile.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
-<refentry xml:id="tidy.parsefile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="tidy.parsefile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>tidy::parseFile</refname>
<refname>tidy_parse_file</refname>
@@ -14,17 +14,17 @@
<methodsynopsis>
<modifier>public</modifier> <type>bool</type><methodname>tidy::parseFile</methodname>
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
- <type>tidy</type><methodname>tidy_parse_file</methodname>
+ <type class="union"><type>tidy</type><type>false</type></type><methodname>tidy_parse_file</methodname>
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
</methodsynopsis>
<para>
Разбор полученного файла.
@@ -75,7 +75,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>use_include_path</parameter></term>
+ <term><parameter>useIncludePath</parameter></term>
<listitem>
<para>
Поиск файла в <link linkend="ini.include-path">include_path</link>.
@@ -89,9 +89,33 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- &return.success;
+ <methodname>tidy::parseFile</methodname> возвращает &true; в случае успешного выполнения.
+ <function>tidy_parse_file</function> возвращает новый экземпляр <classname>tidy</classname> в случае успешного выполнения.
+ И метод, и функция возвращают &false; в случае возникновения ошибки.
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>config</parameter> и <parameter>encoding</parameter> теперь допускают значение null.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
@@ -127,7 +151,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/parsestring.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/parsestring.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/parsestring.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
-<refentry xml:id="tidy.parsestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="tidy.parsestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>tidy::parseString</refname>
<refname>tidy_parse_string</refname>
@@ -13,16 +13,16 @@
<para>&style.oop;</para>
<methodsynopsis>
<modifier>public</modifier> <type>bool</type><methodname>tidy::parseString</methodname>
- <methodparam><type>string</type><parameter>input</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+ <methodparam><type>string</type><parameter>string</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
- <type>tidy</type><methodname>tidy_parse_string</methodname>
- <methodparam><type>string</type><parameter>input</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+ <type class="union"><type>tidy</type><type>false</type></type><methodname>tidy_parse_string</methodname>
+ <methodparam><type>string</type><parameter>string</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Разбор документа, хранимого в строке.
@@ -34,7 +34,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>input</parameter></term>
+ <term><parameter>string</parameter></term>
<listitem>
<para>
Данные для разбора.
@@ -77,9 +77,33 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Возвращает новый экземпляр <classname>tidy</classname>.
+ <methodname>tidy::parseString</methodname> возвращает &true; в случае успешного выполнения.
+ <function>tidy_parse_string</function> возвращает новый экземпляр <classname>tidy</classname> в случае успешного выполнения.
+ И метод, и функция возвращают &false; в случае возникновения ошибки.
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>config</parameter> и <parameter>encoding</parameter> теперь допускают значение null.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
@@ -149,7 +173,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/repairfile.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/repairfile.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/repairfile.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.repairfile" xmlns="http://docbook.org/ns/docbook">
@@ -11,20 +11,20 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>tidy::repairFile</methodname>
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>tidy::repairFile</methodname>
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>string</type><methodname>tidy_repair_file</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>string</type><type>false</type></type><methodname>tidy_repair_file</methodname>
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
</methodsynopsis>
<para>
@@ -74,7 +74,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>use_include_path</parameter></term>
+ <term><parameter>useIncludePath</parameter></term>
<listitem>
<para>
Поиск файла в <link linkend="ini.include-path">include_path</link>.
@@ -88,9 +88,37 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Возвращает восстановленный документ в виде строки.
+ Возвращает восстановленный документ в виде строки, &return.falseforfailure;.
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <methodname>tidy::repairFile</methodname> теперь статичный метод.
+ </entry>
+ </row>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>config</parameter> и <parameter>encoding</parameter> теперь допускают значение null.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
@@ -124,7 +152,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/repairstring.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/repairstring.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/repairstring.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.repairstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -11,18 +11,18 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>tidy::repairString</methodname>
- <methodparam><type>string</type><parameter>data</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>tidy::repairString</methodname>
+ <methodparam><type>string</type><parameter>string</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>string</type><methodname>tidy_repair_string</methodname>
- <methodparam><type>string</type><parameter>data</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>string</type><type>false</type></type><methodname>tidy_repair_string</methodname>
+ <methodparam><type>string</type><parameter>string</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Восстанавливает полученную строку.
@@ -34,7 +34,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>data</parameter></term>
+ <term><parameter>string</parameter></term>
<listitem>
<para>
Данные для восстановления.
@@ -77,9 +77,43 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Возвращает восстановленную строку.
+ Возвращает восстановленную строку, &return.falseforfailure;.
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <methodname>tidy::repairString</methodname> теперь статичный метод.
+ </entry>
+ </row>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>config</parameter> и <parameter>encoding</parameter> теперь допускают значение null.
+ </entry>
+ </row>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ Функция больше не принимает параметр <parameter>useIncludePath</parameter>.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
@@ -138,7 +172,6 @@
</simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ru/trunk/reference/tidy/tidy/root.xml
===================================================================
--- phpdoc/ru/trunk/reference/tidy/tidy/root.xml 2020-12-01 12:20:13 UTC (rev 351816)
+++ phpdoc/ru/trunk/reference/tidy/tidy/root.xml 2020-12-01 12:41:03 UTC (rev 351817)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 345872 Maintainer: mch Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: mch Status: ready -->
<!-- $Revision$ -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xml:id="tidy.root" xmlns="http://docbook.org/ns/docbook">
@@ -11,14 +11,14 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <methodsynopsis>
- <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::root</methodname>
- <void />
+ <methodsynopsis role="oop">
+ <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::root</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>tidyNode</type><methodname>tidy_get_root</methodname>
- <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_root</methodname>
+ <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
</methodsynopsis>
<para>
Возвращает объект <classname>tidyNode</classname>, представляющий
@@ -31,7 +31,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>object</parameter></term>
+ <term><parameter>tidy</parameter></term>
<listitem>
<para>
&tidy.object;
@@ -101,7 +101,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml