merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

24
phpDoc/phpdoc.dist.xml Normal file
View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpdoc>
<title><![CDATA[XpressEngine]]></title>
<parser>
<default-package-name>XE</default-package-name>
<target>.</target>
</parser>
<transformer>
<target>output</target>
</transformer>
<transformations>
<template name="new-black" />
</transformations>
<files>
<file>../index.php</file>
<directory>../classes</directory>
<directory>../config</directory>
<directory>../modules</directory>
<ignore>config/config.user.inc.php</ignore>
<ignore>config/package.inc.php</ignore>
<ignore>classes/security/htmlpurifier/*</ignore>
<ignore>modules/member/php-openid-1.2.3/*</ignore>
</files>
</phpdoc>