Skip to content

Commit e4e6ec6

Browse files
authored
Merge branch 'php:master' into entities-split
2 parents 6657e21 + e6a8e42 commit e4e6ec6

File tree

4 files changed

+2
-137
lines changed

4 files changed

+2
-137
lines changed

configure.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,8 +635,6 @@ function getFileModificationHistory(): array {
635635
// Notice how doing it this way results in generating less than half as many files.
636636
$infiles = array(
637637
'manual.xml.in',
638-
'install-unix.xml.in',
639-
'install-win.xml.in',
640638
'scripts/file-entities.php.in',
641639
);
642640

install-unix.xml.in

Lines changed: 0 additions & 40 deletions
This file was deleted.

install-win.xml.in

Lines changed: 0 additions & 95 deletions
This file was deleted.

scripts/qa/section-order.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
'reference/oci8/oldaliases/ocifetchinto.xml',
4141
/* This page uses <xi:include> tags to include the docs from the OO version */
4242
'reference/parallel/functions/parallel.run.xml',
43+
/* This page uses <xi:include> tags to include the docs from the OO version */
44+
'reference/pdo/pdo/connect.xml',
4345
/* These pages use <xi:include> tags to include the docs from the interface version */
4446
'reference/dom/domcharacterdata/after.xml',
4547
'reference/dom/domcharacterdata/remove.xml',

0 commit comments

Comments
 (0)