From: Michael Wallner <mike@php.net>
Date: Tue, 29 Sep 2015 15:03:31 +0000 (+0200)
Subject: Merge branch 'R_1_0'
X-Git-Tag: release-2.0.0RC1~12
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-propro;a=commitdiff_plain;h=ac900495e2e232c7a2f3e9f226421a4f457ce7b9

Merge branch 'R_1_0'
---

ac900495e2e232c7a2f3e9f226421a4f457ce7b9
diff --cc README.md
index b10e13c,88242d9..333d2c1
--- a/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 --cc package.xml
index ca4cc70,60f0d38..b4118df
--- a/package.xml
+++ b/package.xml
@@@ -28,8 -28,9 +28,8 @@@ http://pear.php.net/dtd/package-2.0.xsd
    <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="/">