diff --git a/docs/source/contributing-philosophy.rst b/docs/source/contributing-philosophy.rst index 8d1eeab10d..dbed0dc099 100644 --- a/docs/source/contributing-philosophy.rst +++ b/docs/source/contributing-philosophy.rst @@ -11,8 +11,7 @@ modern business transactions. It is unique in its aim to build a platform for b retaining strict privacy. Corda provides an implementation of this vision in a code base which others are free to build on, contribute to or innovate around. The mission of Corda is further detailed in the `Corda introductory white paper`_. -The project is supported and maintained by the `R3 Alliance `_, or R3 for short, which consists of over two hundred firms -working together to build and maintain this open source enterprise-grade blockchain platform. +The project is supported and maintained by `R3 `_. Community Locations ------------------- @@ -44,12 +43,12 @@ Community maintainers ^^^^^^^^^^^^^^^^^^^^^ Current community maintainers: -* `Joel Dudley `_ - Contact me: +* `Rick Parker `_ - Contact me: * On the `Corda Slack team `_, either in the ``#community`` channel or by direct message using the handle - ``@joel`` + ``@parkri`` - * By email: joel.dudley at r3.com + * By email: rick.parker at r3.com We anticipate additional maintainers joining the project in the future from across the community. @@ -60,13 +59,12 @@ Over two hundred individuals have contributed to the development of Corda. You c Transparency and Conflict Policy -------------------------------- -The project is supported and maintained by the `R3 Alliance `_, which consists of over two hundred firms working together -to build and maintain this open source enterprise-grade blockchain platform. We develop in the open and publish our +The project is supported and maintained by `R3 `_. We develop in the open and publish our `Jira `_ to give everyone visibility. R3 also maintains and distributes a commercial distribution of Corda. Our vision is that distributions of Corda be compatible and interoperable, and our contribution and code review guidelines are designed in part to enable this. -As the R3 Alliance is maintainer of the project and also develops a commercial distribution of Corda, what happens if a member of the +As R3 is maintainer of the project and also develops a commercial distribution of Corda, what happens if a member of the community contributes a feature which the R3 team have implemented only in their commercial product? How is this apparent conflict managed? Our approach is simple: if the contribution meets the standards for the project (see above), then the existence of a competing commercial implementation will not be used as a reason to reject it. In other words, it is our policy that should a community feature be contributed