Merge branch 'R_1_0'

diff --combined README.md
index b10e13ce59e713f7e7b3adeff94db6e3ea8cc9ee,88242d95dc28b18d5f7383176b70da63515e2091..333d2c1d5d77213b5d6fb25c674605980b673eac
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -1,23 -1,46 +1,46 @@@
- # pecl/propro
+ # ext-propro
  
- ## About:
 -[![Build Status](https://travis-ci.org/m6w6/ext-propro.svg?branch=R_1_0)](https://travis-ci.org/m6w6/ext-propro)
++[![Build Status](https://travis-ci.org/m6w6/ext-propro.svg?branch=master)](https://travis-ci.org/m6w6/ext-propro)
  
- The "Property Proxy" extension provides a fairly transparent proxy for internal object properties hidden in custom non-zval implementations.
+ Property Proxy
  
- ## Installation:
+ ## Documentation
  
- This extension is hosted at [PECL](http://pecl.php.net) and can be installed with [PEAR](http://pear.php.net)'s pecl command:
+ See the [online markdown reference](https://mdref.m6w6.name/propro).
  
-     # pecl install propro
+ ## Installing
  
- Also, watch out for self-installing [pharext](https://github.com/m6w6/pharext) packages attached to [releases](https://github.com/m6w6/ext-propro/releases).
+ ### PECL
  
- ## Internals:
+       pecl install propro
  
- > ***NOTE:***
-   This extension mostly only provides infrastructure for other extensions.
-   See the [API docs here](http://m6w6.github.io/ext-propro/).
+ ### PHARext
  
- ## Documentation
+ Watch out for [PECL replicates](https://replicator.pharext.org?propro)
+ and pharext packages attached to [releases](./releases).
+ 
+ ### Checkout
+ 
+       git clone github.com:m6w6/ext-propro
+       cd ext-propro
+       /path/to/phpize
+       ./configure --with-php-config=/path/to/php-config
+       make
+       sudo make install
+ 
+ ## ChangeLog
+ 
+ A comprehensive list of changes can be obtained from the
+ [PECL website](https://pecl.php.net/package-changelog.php?package=propro).
+ 
+ ## License
+ 
+ ext-propro is licensed under the 2-Clause-BSD license, which can be found in
+ the accompanying [LICENSE](./LICENSE) file.
+ 
+ ## Contributing
+ 
+ All forms of contribution are welcome! Please see the bundled
+ [CONTRIBUTING](./CONTRIBUTING.md) note for the general principles followed.
  
- Userland documentation can be found at https://mdref.m6w6.name/propro
+ The list of past and current contributors is maintained in [THANKS](./THANKS).

diff --combined package.xml
index ca4cc70524111990092b4feee15bc5f34836f743,60f0d38ace98bdb98bc45d1e2ba8111de10db3b0..b4118dfa5df974ecd6ba45ddf76cdaa38d7d28b9
--- 1/package.xml
--- 2/package.xml
+++ b/package.xml
@@@ -1,10 -1,10 +1,10 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <package 
-  packagerversion="1.4.11" 
-  version="2.0" 
-  xmlns="http://pear.php.net/dtd/package-2.0" 
-  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ <package
+  packagerversion="1.4.11"
+  version="2.0"
+  xmlns="http://pear.php.net/dtd/package-2.0"
+  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
  http://pear.php.net/dtd/tasks-1.0.xsd
  http://pear.php.net/dtd/package-2.0
@@@ -21,37 -21,44 +21,42 @@@ http://pear.php.net/dtd/package-2.0.xsd
   </lead>
   <date>2013-12-05</date>
   <version>
 -  <release>1.0.1</release>
 -  <api>1.0.0</api>
 +  <release>2.0.0-dev</release>
 +  <api>2.0.0</api>
   </version>
   <stability>
    <release>stable</release>
    <api>stable</api>
   </stability>
-  <license>BSD, revised</license>
+  <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
   <notes><![CDATA[
 -* Internals documentation at http://php.github.io/php/pecl-php-propro
  ]]></notes>
   <contents>
    <dir name="/">
-    <file role="doc" name="CREDITS" />
-    <file role="doc" name="LICENSE" />
-    <file role="doc" name="Doxyfile" />
-    <file role="src" name="config.m4" />
+    <file role="doc" name="AUTHORS"/>
+    <file role="doc" name="CONTRIBUTING.md"/>
+    <file role="doc" name="CREDITS"/>
+    <file role="doc" name="LICENSE"/>
+    <file role="doc" name="README.md"/>
+    <file role="doc" name="THANKS"/>
+    <file role="src" name="config.m4"/>
     <file role="src" name="config.w32" />
+    <file role="doc" name="Doxyfile" />
     <file role="src" name="php_propro.h" />
     <file role="src" name="php_propro_api.h" />
     <file role="src" name="php_propro.c" />
+ 
     <dir name="tests">
      <file role="test" name="001.phpt" />
      <file role="test" name="002.phpt" />
 +    <file role="test" name="003.phpt" />
     </dir>
    </dir>
   </contents>
   <dependencies>
    <required>
     <php>
 -    <min>5.3.0</min>
 -    <max>7.0.0</max>
 -    <exclude>7.0.0</exclude>
 +    <min>7.0.0</min>
     </php>
     <pearinstaller>
      <min>1.4.0</min>