...

...

@@ -9,10 +9,10 @@

9

9

</refnamediv>

10

10

<refsect1 role="description">

11

11

&reftitle.description;

12

-

<methodsynopsis>

13

-

<modifier>public</modifier> <type>DOMNodeList</type><methodname>DOMXPath::query</methodname>

12

+

<methodsynopsis role="DOMXPath">

13

+

<modifier>public</modifier> <type>mixed</type><methodname>DOMXPath::query</methodname>

14

14

<methodparam><type>string</type><parameter>expression</parameter></methodparam>

15

-

<methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>

15

+

<methodparam choice="opt"><type class="union"><type>DOMNode</type><type>null</type></type><parameter>contextNode</parameter><initializer>&null;</initializer></methodparam>

16

16

<methodparam choice="opt"><type>bool</type><parameter>registerNodeNS</parameter><initializer>&true;</initializer></methodparam>

17

17

</methodsynopsis>

18

18

<para>

...

...

@@ -32,24 +32,16 @@

32

32

</listitem>

33

33

</varlistentry>

34

34

<varlistentry>

35

-

<term><parameter>contextnode</parameter></term>

35

+

<term><parameter>contextNode</parameter></term>

36

36

<listitem>

37

37

<para>

38

-

The optional <parameter>contextnode</parameter> can be specified for

38

+

The optional <parameter>contextNode</parameter> can be specified for

39

39

doing relative XPath queries. By default, the queries are relative to

40

40

the root element.

41

41

</para>

42

42

</listitem>

43

43

</varlistentry>

44

-

<varlistentry>

45

-

<term><parameter>registerNodeNS</parameter></term>

46

-

<listitem>

47

-

<para>

48

-

The optional <parameter>registerNodeNS</parameter> can be specified to

49

-

disable automatic registration of the context node.

50

-

</para>

51

-

</listitem>

52

-

</varlistentry>

44

+

&dom.parameters.register_node_ns;

53

45

</variablelist>

54

46

</para>

55

47

</refsect1>

...

...

@@ -63,33 +55,10 @@

63

55

</para>

64

56

<para>

65

57

If the <parameter>expression</parameter> is malformed or the

66

-

<parameter>contextnode</parameter> is invalid,

58

+

<parameter>contextNode</parameter> is invalid,

67

59

<methodname>DOMXPath::query</methodname> returns &false;.

68

60

</para>

69

61

</refsect1>

70

-

<refsect1 role="changelog">

71

-

&reftitle.changelog;

72

-

<para>

73

-

<informaltable>

74

-

<tgroup cols="2">

75

-

<thead>

76

-

<row>

77

-

<entry>&Version;</entry>

78

-

<entry>&Description;</entry>

79

-

</row>

80

-

</thead>

81

-

<tbody>

82

-

<row>

83

-

<entry>5.3.3</entry>

84

-

<entry>

85

-

The <parameter>registerNodeNS</parameter> parameter was added.

86

-

</entry>

87

-

</row>

88

-

</tbody>

89

-

</tgroup>

90

-

</informaltable>

91

-

</para>

92

-

</refsect1>

93

62

<refsect1 role="examples">

94

63

&reftitle.examples;

95

64

<para>

...

...

@@ -128,7 +97,7 @@ Found The Pearl, by John Steinbeck

128

97

]]>

129

98

</screen>

130

99

<para>

131

-

We can also use the <parameter>contextnode</parameter> parameter to shorten

100

+

We can also use the <parameter>contextNode</parameter> parameter to shorten

132

101

our expression:

133

102

</para>

134

103

<programlisting role="php">

...

...

@@ -168,7 +137,6 @@ foreach ($entries as $entry) {

168

137

</para>

169

138

</refsect1>

170

139

</refentry>

171

-

172

140

<!-- Keep this comment at the end of the file

173

141

Local variables:

174

142

mode: sgml

175

143