Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert MongoDB from set to book #986

Closed
wants to merge 1 commit into from
Closed

Convert MongoDB from set to book #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion language-snippets.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4050,7 +4050,7 @@ local: {
</para>
<note>
<simpara>
При вычислении критериев запроса MongoDB сравнивает типы и значения в соответствии с собственными <link xlink:href="&url.mongodb.docs;reference/bson-type-comparison-order/" xmlns:xlink="http://www.w3.org/1999/xlink">правилами сравнения типов BSON</link>, отличных от правил <link linkend="types.comparisons">сравнения</link> и <link linkend="language.types.type-juggling">приведения типов</link> PHP. Когда указан специальный тип BSON, критерия запроса должна соответствовать <link linkend="book.bson">классу BSON</link> (т.е. использовать <classname>MongoDB\BSON\ObjectId</classname> для выборке по <link xlink:href="&url.mongodb.docs.objectid;" xmlns:xlink="http://www.w3.org/1999/xlink">ObjectId</link>).
При вычислении критериев запроса MongoDB сравнивает типы и значения в соответствии с собственными <link xlink:href="&url.mongodb.docs;reference/bson-type-comparison-order/" xmlns:xlink="http://www.w3.org/1999/xlink">правилами сравнения типов BSON</link>, отличных от правил <link linkend="types.comparisons">сравнения</link> и <link linkend="language.types.type-juggling">приведения типов</link> PHP. Когда указан специальный тип BSON, критерия запроса должна соответствовать <link linkend="mongodb.bson">классу BSON</link> (т.е. использовать <classname>MongoDB\BSON\ObjectId</classname> для выборке по <link xlink:href="&url.mongodb.docs.objectid;" xmlns:xlink="http://www.w3.org/1999/xlink">ObjectId</link>).
</simpara>
</note>
</listitem>
Expand Down
16 changes: 8 additions & 8 deletions reference/mongodb/architecture.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 22eb2f39973a06dd565e0030f173f8460d2f2811 Maintainer: sergey Status: ready -->
<!-- Reviewed: no -->
<book xml:id="mongodb.architecture" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter xml:id="mongodb.architecture" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<titleabbrev>Архитектура и внутреннее устройство драйвера</titleabbrev>
<title>Обзор архитектуры драйвера и её особенностей</title>

<article xml:id="mongodb.overview">
<section xml:id="mongodb.overview">
<titleabbrev>Архитектура</titleabbrev>
<title>Обзор архитектуры</title>

Expand Down Expand Up @@ -86,9 +86,9 @@
</tgroup>
</table>
</para>
</article>
</section>

<article xml:id="mongodb.connection-handling">
<section xml:id="mongodb.connection-handling">
<titleabbrev>Соединения</titleabbrev>
<title>Обработка и сохранение соединения</title>

Expand Down Expand Up @@ -207,9 +207,9 @@ foreach ($managers as $manager) {
API-интерфейс потоков PHP.
</para>
</section>
</article>
</section>

<article xml:id="mongodb.persistence">
<section xml:id="mongodb.persistence">
<titleabbrev>Сохранение данных</titleabbrev>
<title>Сериализация и десериализация PHP-переменных в модуле MongoDB</title>

Expand Down Expand Up @@ -960,8 +960,8 @@ function bsonUnserialize(array $map)
</section>
</section>

</article>
</book>
</section>
</chapter>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
8 changes: 5 additions & 3 deletions reference/mongodb/set.xml → reference/mongodb/book.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: e9214a2619efc5906fab59cd42fb7404c4dc49a5 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<set xml:id="set.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<book xml:id="book.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<?phpdoc extension-membership="pecl" ?>
<title>Модуль MongoDB</title>
<titleabbrev>MongoDB</titleabbrev>

Expand All @@ -16,7 +17,7 @@
<link linkend="class.mongodb-driver-query">запросы</link>,
<link linkend="class.mongodb-driver-bulkwrite">записи</link>,
<link linkend="class.mongodb-driver-manager">управление соединением</link>
и <link linkend="book.bson">сериализация BSON</link>.
и <link linkend="mongodb.bson">сериализация BSON</link>.
</simpara>
<simpara>
Самодельные библиотеки PHP, требующие этот модуль, могут предоставлять
Expand All @@ -32,6 +33,7 @@
</info>

&reference.mongodb.setup;
&reference.mongodb.constants;
&reference.mongodb.tutorial;
&reference.mongodb.architecture;
&reference.mongodb.security;
Expand All @@ -40,7 +42,7 @@
&reference.mongodb.bson;
&reference.mongodb.monitoring;
&reference.mongodb.exceptions;
</set>
</book>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/bson.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: dd9038795cefd9b08ce1453b770496cbf132782e Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<book xml:id="book.bson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<part xml:id="mongodb.bson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<?phpdoc extension-membership="pecl" ?>
<title>Классы и функции модуля MongoDB для работы с форматом BSON</title>
<titleabbrev>MongoDB\BSON</titleabbrev>
Expand Down Expand Up @@ -44,4 +44,4 @@
&reference.mongodb.bson.int64;
&reference.mongodb.bson.symbol;
&reference.mongodb.bson.undefined;
</book>
</part>
4 changes: 2 additions & 2 deletions reference/mongodb/configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 8c84a7f1fd238b71d31f315cc52b8b7771401fdd Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<article xml:id="mongodb.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<section xml:id="mongodb.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.install;

<section xml:id="mongodb.installation.pecl">
Expand Down Expand Up @@ -267,7 +267,7 @@ extension=mongodb.so
</para>
</section>

</article>
</section>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/exceptions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 4083e8f9523a60390960c52a7ab810dc7b096d40 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<book xml:id="mongodb.exceptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<part xml:id="mongodb.exceptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<titleabbrev>MongoDB\Driver\Exception</titleabbrev>
<title>Классы исключений</title>

Expand Down Expand Up @@ -83,4 +83,4 @@
</listitem>
</itemizedlist>
</article>
</book>
</part>
4 changes: 2 additions & 2 deletions reference/mongodb/ini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: e9214a2619efc5906fab59cd42fb7404c4dc49a5 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<article xml:id="mongodb.configuration" xmlns="http://docbook.org/ns/docbook">
<section xml:id="mongodb.configuration" xmlns="http://docbook.org/ns/docbook">
&reftitle.runtime;
&extension.runtime;
<para>
Expand Down Expand Up @@ -72,7 +72,7 @@

</variablelist>
</para>
</article>
</section>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/mongodb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: dd9038795cefd9b08ce1453b770496cbf132782e Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<book xml:id="book.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<part xml:id="mongodb.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<?phpdoc extension-membership="pecl" ?>
<title>Классы модуля MongoDB</title>
<titleabbrev>MongoDB\Driver</titleabbrev>
Expand Down Expand Up @@ -29,4 +29,4 @@
&reference.mongodb.mongodb.driver.writeconcernerror;
&reference.mongodb.mongodb.driver.writeerror;
&reference.mongodb.mongodb.driver.writeresult;
</book>
</part>
4 changes: 2 additions & 2 deletions reference/mongodb/monitoring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: b817c8855866acbb37c260cbc62235b8d2d88ea1 Maintainer: lex Status: ready -->
<!-- Reviewed: no -->
<book xml:id="mongodb.monitoring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<part xml:id="mongodb.monitoring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Классы мониторинга и функции подписчика</title>
<titleabbrev>MongoDB\Driver\Monitoring</titleabbrev>

Expand All @@ -28,4 +28,4 @@
&reference.mongodb.mongodb.driver.monitoring.logsubscriber;
&reference.mongodb.mongodb.driver.monitoring.sdamsubscriber;
&reference.mongodb.mongodb.driver.monitoring.subscriber;
</book>
</part>
12 changes: 6 additions & 6 deletions reference/mongodb/security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- EN-Revision: 4e0bf229045ff87d5f84469280bf0a6b195bfb8b Maintainer: sergey Status: ready -->
<!-- Reviewed: no -->

<book xml:id="mongodb.security" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter xml:id="mongodb.security" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Безопасность</title>

<article xml:id="mongodb.security.request_injection">
<section xml:id="mongodb.security.request_injection">
<title>Атака с помощью инъекций в запросе</title>
<para>
Если вы передаёте параметры <literal>$_GET</literal> (или <literal>$_POST</literal>)
Expand Down Expand Up @@ -44,9 +44,9 @@
Смотрите <link xlink:href="&url.mongodb.dochub.security;">основную документацию</link>
для получения дополнительной информации о проблемах SQL инъекций в MongoDB.
</para>
</article>
</section>

<article xml:id="mongodb.security.script_injection">
<section xml:id="mongodb.security.script_injection">
<title>Атака с помощью инъекций в скриптах</title>
<para>
Если вы используете JavaScript, убедитесь, что все переменные, которые пересекают границу
Expand Down Expand Up @@ -157,8 +157,8 @@ $r = $m->executeCommand( 'dramio', $cmd );
xlink:href="&url.mongodb.docs;reference/command/eval/">eval</link>
устарела с MongoDB 3.0, и её также следует избегать.
</para>
</article>
</book>
</section>
</chapter>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
13 changes: 6 additions & 7 deletions reference/mongodb/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: e9214a2619efc5906fab59cd42fb7404c4dc49a5 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<book xml:id="mongodb.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter xml:id="mongodb.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.setup;

<article xml:id="mongodb.requirements">
<section xml:id="mongodb.requirements">
&reftitle.required;
<para>
Начиная с версии 1.16.0 для работы модуля требуется PHP 7.2 или выше.
Expand Down Expand Up @@ -38,21 +38,20 @@
типа PHP.
</simpara>
</note>
</article>
</section>

&reference.mongodb.configure;
&reference.mongodb.ini;
<!--
<article xml:id="mongodb.resources">
<section xml:id="mongodb.resources">
&reftitle.resources;
<para>

</para>
</article>
</section>
-->
&reference.mongodb.constants;

</book>
</chapter>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/tutorial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 680b85d4cc40065d48ae1f918e7579d8eb244f85 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<book xml:id="mongodb.tutorial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter xml:id="mongodb.tutorial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Обучающие материалы</title>
<titleabbrev>Обучающие материалы</titleabbrev>

Expand All @@ -15,7 +15,7 @@
</info>
&reference.mongodb.tutorial.library;
&reference.mongodb.tutorial.apm;
</book>
</chapter>

<!-- Keep this comment at the end of the file
Local variables:
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/tutorial/apm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: af0472588c9f07f2f20533d80dc8b17018b224dd Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<chapter xml:id="mongodb.tutorial.apm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<section xml:id="mongodb.tutorial.apm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Мониторинг производительности приложения (Application Performance Monitoring, или APM)</title>

<para>
Expand Down Expand Up @@ -173,7 +173,7 @@ $cursor = $m->executeQuery('dramio.whisky', $query);
</programlisting>
</section>

</chapter>
</section>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/tutorial/library.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: e9214a2619efc5906fab59cd42fb7404c4dc49a5 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: no -->
<chapter xml:id="mongodb.tutorial.library" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<section xml:id="mongodb.tutorial.library" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Работа библиотеки PHP с драйвером MongoDB (PHPLIB)</title>

<para>
Expand Down Expand Up @@ -155,7 +155,7 @@ foreach ($result as $entry) {
<xref linkend="mongodb.persistence"/>.
</para>
</section>
</chapter><!-- Keep this comment at the end of the file
</section><!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
Expand Down
Loading