Skip to content

Commit e1563f7

Browse files
committed
snmp: fix XML to remove useless wrapping para tags via script
1 parent ee44826 commit e1563f7

26 files changed

Lines changed: 843 additions & 974 deletions

reference/snmp/functions/snmp-get-quick-print.xml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 9f7b578adf85bcbc94397c11a7a813d1d3d0cc56 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: 017ddc051b8136cc9116b57ce51f655fe681bb82 Maintainer: hirokawa Status: ready -->
44
<!-- Credits: mumumu -->
5-
<refentry xml:id="function.snmp-get-quick-print" xmlns="http://docbook.org/ns/docbook">
5+
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.snmp-get-quick-print">
66
<refnamediv>
77
<refname>snmp_get_quick_print</refname>
88
<refpurpose>
@@ -35,34 +35,29 @@
3535

3636
<refsect1 role="examples">
3737
&reftitle.examples;
38-
<para>
39-
<example>
40-
<title><function>snmp_get_quick_print</function> の例</title>
41-
<programlisting role="php">
38+
<example>
39+
<title><function>snmp_get_quick_print</function> の例</title>
40+
<programlisting role="php">
4241
<![CDATA[
4342
<?php
4443
$quickprint = snmp_get_quick_print();
4544
?>
4645
]]>
47-
</programlisting>
48-
</example>
49-
</para>
46+
</programlisting>
47+
</example>
5048
</refsect1>
5149

5250
<refsect1 role="seealso">
5351
&reftitle.seealso;
54-
<para>
55-
<simplelist>
56-
<member>
57-
quick_print の役割に関する詳細な説明は、
58-
<function>snmp_set_quick_print</function> を参照ください。
59-
</member>
60-
</simplelist>
61-
</para>
52+
<simplelist>
53+
<member>
54+
quick_print の役割に関する詳細な説明は、
55+
<function>snmp_set_quick_print</function> を参照ください。
56+
</member>
57+
</simplelist>
6258
</refsect1>
6359

6460
</refentry>
65-
6661
<!-- Keep this comment at the end of the file
6762
Local variables:
6863
mode: sgml
Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 64bab6321fe7aec300303dcedfddfcb31fb053c2 Maintainer: takagi Status: ready -->
4-
<refentry xml:id="function.snmp-get-valueretrieval" xmlns="http://docbook.org/ns/docbook">
3+
<!-- EN-Revision: 017ddc051b8136cc9116b57ce51f655fe681bb82 Maintainer: takagi Status: ready -->
4+
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.snmp-get-valueretrieval">
55
<refnamediv>
66
<refname>snmp_get_valueretrieval</refname>
77
<refpurpose>
88
SNMP の値が返される方法を返す
99
</refpurpose>
1010
</refnamediv>
11-
11+
1212
<refsect1 role="description">
1313
&reftitle.description;
1414
<methodsynopsis>
@@ -22,7 +22,7 @@
2222
&reftitle.parameters;
2323
&no.function.parameters;
2424
</refsect1>
25-
25+
2626
<refsect1 role="returnvalues">
2727
&reftitle.returnvalues;
2828
<para>
@@ -31,13 +31,12 @@
3131
に、場合によって SNMP_VALUE_OBJECT を組み合わせて返します。
3232
</para>
3333
</refsect1>
34-
34+
3535
<refsect1 role="examples">
3636
&reftitle.examples;
37-
<para>
38-
<example>
39-
<title><function>snmp_get_valueretrieval</function> の使用法</title>
40-
<programlisting role="php">
37+
<example>
38+
<title><function>snmp_get_valueretrieval</function> の使用法</title>
39+
<programlisting role="php">
4140
<![CDATA[
4241
<?php
4342
$ret = snmpget('localhost', 'public', 'IF-MIB::ifName.1');
@@ -48,25 +47,21 @@
4847
}
4948
?>
5049
]]>
51-
</programlisting>
52-
</example>
53-
</para>
50+
</programlisting>
51+
</example>
5452
</refsect1>
55-
53+
5654
<refsect1 role="seealso">
5755
&reftitle.seealso;
58-
<para>
59-
<simplelist>
60-
<member>
61-
<function>snmp_set_valueretrieval</function>
62-
</member>
63-
<member><xref linkend="snmp.constants" /></member>
64-
</simplelist>
65-
</para>
56+
<simplelist>
57+
<member>
58+
<function>snmp_set_valueretrieval</function>
59+
</member>
60+
<member><xref linkend="snmp.constants"/></member>
61+
</simplelist>
6662
</refsect1>
67-
68-
</refentry>
6963

64+
</refentry>
7065
<!-- Keep this comment at the end of the file
7166
Local variables:
7267
mode: sgml
@@ -87,4 +82,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
8782
vim: et tw=78 syn=sgml
8883
vi: ts=1 sw=1
8984
-->
90-

reference/snmp/functions/snmp-read-mib.xml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 73fae4ee51b644b72028e610abefefced57c18ad Maintainer: takagi Status: ready -->
4-
<refentry xml:id="function.snmp-read-mib" xmlns="http://docbook.org/ns/docbook">
3+
<!-- EN-Revision: 017ddc051b8136cc9116b57ce51f655fe681bb82 Maintainer: takagi Status: ready -->
4+
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.snmp-read-mib">
55
<refnamediv>
66
<refname>snmp_read_mib</refname>
77
<refpurpose>
@@ -14,7 +14,7 @@
1414
<type>bool</type><methodname>snmp_read_mib</methodname>
1515
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
1616
</methodsynopsis>
17-
17+
1818
<para>
1919
この関数は、ベンダー固有などの追加の MIB を読み込んで、
2020
<literal>VENDOR-MIB::foo.1</literal>
@@ -24,19 +24,17 @@
2424
MIB を読み込む順序は重要で、参照先のオブジェクトが解決できなければ
2525
Net-SNMP ライブラリが警告を表示します。
2626
</para>
27-
27+
2828
</refsect1>
29-
29+
3030
<refsect1 role="parameters">
3131
&reftitle.parameters;
32-
<para>
33-
<variablelist>
34-
<varlistentry>
35-
<term><parameter>filename</parameter></term>
36-
<listitem><para><acronym>MIB</acronym> のファイル名。</para></listitem>
37-
</varlistentry>
38-
</variablelist>
39-
</para>
32+
<variablelist>
33+
<varlistentry>
34+
<term><parameter>filename</parameter></term>
35+
<listitem><para><acronym>MIB</acronym> のファイル名。</para></listitem>
36+
</varlistentry>
37+
</variablelist>
4038
</refsect1>
4139

4240
<refsect1 role="returnvalues">
@@ -45,27 +43,25 @@
4543
&return.success;
4644
</para>
4745
</refsect1>
48-
46+
4947
<refsect1 role="examples">
5048
&reftitle.examples;
51-
<para>
52-
<example>
53-
<title><function>snmp_read_mib</function> の使用法</title>
54-
<programlisting role="php">
49+
<example>
50+
<title><function>snmp_read_mib</function> の使用法</title>
51+
<programlisting role="php">
5552
<![CDATA[
5653
<?php
5754
print_r( snmprealwalk('localhost', 'public', '.1.3.6.1.2.1.2.3.4.5') );
58-
55+
5956
snmp_read_mib('./FOO-BAR-MIB.txt');
6057
print_r( snmprealwalk('localhost', 'public', 'FOO-BAR-MIB::someTable') );
6158
?>
6259
]]>
63-
</programlisting>
64-
</example>
65-
</para>
60+
</programlisting>
61+
</example>
6662
<para>
6763
上の例の結果は次のようになります。
68-
<![CDATA[
64+
<![CDATA[
6965
Array
7066
(
7167
[iso.3.6.1.2.1.2.3.4.5.0] => Gauge32: 6
@@ -77,9 +73,8 @@ Array
7773
]]>
7874
</para>
7975
</refsect1>
80-
81-
</refentry>
8276

77+
</refentry>
8378
<!-- Keep this comment at the end of the file
8479
Local variables:
8580
mode: sgml

reference/snmp/functions/snmp-set-enum-print.xml

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 2ca090342977839edca2f7f4e52305a1b5da6095 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 017ddc051b8136cc9116b57ce51f655fe681bb82 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
5-
<refentry xml:id="function.snmp-set-enum-print" xmlns="http://docbook.org/ns/docbook">
5+
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.snmp-set-enum-print">
66
<refnamediv>
77
<refname>snmp_set_enum_print</refname>
88
<refpurpose>
@@ -19,7 +19,7 @@
1919
この関数は、snmpwalk/snmpget などが自動的に MIB の enum 値を探して可読形式の文字列で返すかどうかを切り替えます。
2020
</para>
2121
</refsect1>
22-
22+
2323
<refsect1 role="parameters">
2424
&reftitle.parameters;
2525
<variablelist>
@@ -43,29 +43,26 @@
4343

4444
<refsect1 role="changelog">
4545
&reftitle.changelog;
46-
<para>
47-
<informaltable>
48-
<tgroup cols="2">
49-
<thead>
50-
<row>
51-
<entry>&Version;</entry>
52-
<entry>&Description;</entry>
53-
</row>
54-
</thead>
55-
<tbody>
56-
&return.type.true;
57-
</tbody>
58-
</tgroup>
59-
</informaltable>
60-
</para>
46+
<informaltable>
47+
<tgroup cols="2">
48+
<thead>
49+
<row>
50+
<entry>&Version;</entry>
51+
<entry>&Description;</entry>
52+
</row>
53+
</thead>
54+
<tbody>
55+
&return.type.true;
56+
</tbody>
57+
</tgroup>
58+
</informaltable>
6159
</refsect1>
6260

6361
<refsect1 role="examples">
6462
&reftitle.examples;
65-
<para>
66-
<example>
67-
<title><function>snmp_set_enum_print</function> の使用法</title>
68-
<programlisting role="php">
63+
<example>
64+
<title><function>snmp_set_enum_print</function> の使用法</title>
65+
<programlisting role="php">
6966
<![CDATA[
7067
<?php
7168
snmp_set_enum_print(0);
@@ -74,18 +71,17 @@
7471
echo snmpget('localhost', 'public', 'IF-MIB::ifOperStatus.3') . "\n";
7572
?>
7673
]]>
77-
</programlisting>
78-
</example>
79-
</para>
74+
</programlisting>
75+
</example>
8076
<para>
8177
上の例の結果は次のようになります。
82-
<![CDATA[
78+
<![CDATA[
8379
INTEGER: up(1)
8480
INTEGER: 1
8581
]]>
8682
</para>
8783
</refsect1>
88-
84+
8985
</refentry>
9086
<!-- Keep this comment at the end of the file
9187
Local variables:

reference/snmp/functions/snmp-set-oid-numeric-print.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 00b214a0c59b1ace0dc975c66ac77ad57d1f01f9 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 017ddc051b8136cc9116b57ce51f655fe681bb82 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
5-
<refentry xml:id="function.snmp-set-oid-numeric-print" xmlns="http://docbook.org/ns/docbook">
5+
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.snmp-set-oid-numeric-print">
66
<refnamediv>
77
<refname>snmp_set_oid_numeric_print</refname>
88
<refpurpose><function>snmp_set_oid_output_format</function> &Alias;</refpurpose>
@@ -17,13 +17,11 @@
1717

1818
<refsect1 role="seealso">
1919
&reftitle.seealso;
20-
<para>
21-
<simplelist>
22-
<member><function>snmp_set_oid_output_format</function></member>
23-
</simplelist>
24-
</para>
25-
</refsect1>
26-
20+
<simplelist>
21+
<member><function>snmp_set_oid_output_format</function></member>
22+
</simplelist>
23+
</refsect1>
24+
2725
</refentry>
2826
<!-- Keep this comment at the end of the file
2927
Local variables:

0 commit comments

Comments
 (0)