master is the new default branch
`master` is now the only permanent branch. Features and fixes should be merged into `master` when stable. Pull requests should be forked from `master`. `develop` branch disappear entirely in favor of temporary features/fixes branches.
This commit is contained in:
parent
a771de75b9
commit
d2c6b9f790
2
.github/ISSUE_TEMPLATE/how-to-use.md
vendored
2
.github/ISSUE_TEMPLATE/how-to-use.md
vendored
@ -9,6 +9,6 @@ labels: WontFix
|
||||
|
||||
Documentation is available on [Read the Docs](https://phpword.readthedocs.io/en/latest/).
|
||||
|
||||
Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/develop/samples).
|
||||
Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/master/samples).
|
||||
|
||||
Usage questions belong on [Stack Overflow](https://stackoverflow.com/questions/tagged/phpword).
|
||||
|
||||
15
README.md
15
README.md
@ -1,6 +1,5 @@
|
||||
# 
|
||||
|
||||
Master:
|
||||
[](https://packagist.org/packages/phpoffice/phpword)
|
||||
[](https://travis-ci.org/PHPOffice/PHPWord)
|
||||
[](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
|
||||
@ -9,15 +8,9 @@ Master:
|
||||
[](https://packagist.org/packages/phpoffice/phpword)
|
||||
[](https://gitter.im/PHPOffice/PHPWord)
|
||||
|
||||
Develop:
|
||||
[](https://packagist.org/packages/phpoffice/phpword#dev-develop)
|
||||
[](https://travis-ci.org/PHPOffice/PHPWord/branches)
|
||||
[](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/?branch=develop)
|
||||
[](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop)
|
||||
|
||||
PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF), HTML, and PDF.
|
||||
|
||||
PHPWord is an open source project licensed under the terms of [LGPL version 3](COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/).
|
||||
PHPWord is an open source project licensed under the terms of [LGPL version 3](COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://github.com/PHPOffice/PHPWord/actions) and unit testing. You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/).
|
||||
|
||||
If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpword)
|
||||
|
||||
@ -78,9 +71,9 @@ Run the following to use the latest stable version
|
||||
```sh
|
||||
composer require phpoffice/phpword
|
||||
```
|
||||
or if you want the latest develop version
|
||||
or if you want the latest unreleased version
|
||||
```sh
|
||||
composer require phpoffice/phpword:dev-develop
|
||||
composer require phpoffice/phpword:dev-master
|
||||
```
|
||||
|
||||
## Getting started
|
||||
@ -165,6 +158,6 @@ You can also read the [Developers' Documentation](http://phpword.readthedocs.org
|
||||
We welcome everyone to contribute to PHPWord. Below are some of the things that you can do to contribute.
|
||||
|
||||
- Read [our contributing guide](CONTRIBUTING.md).
|
||||
- [Fork us](https://github.com/PHPOffice/PHPWord/fork) and [request a pull](https://github.com/PHPOffice/PHPWord/pulls) to the [develop](https://github.com/PHPOffice/PHPWord/tree/develop) branch.
|
||||
- [Fork us](https://github.com/PHPOffice/PHPWord/fork) and [request a pull](https://github.com/PHPOffice/PHPWord/pulls) to the [master](https://github.com/PHPOffice/PHPWord/tree/master) branch.
|
||||
- Submit [bug reports or feature requests](https://github.com/PHPOffice/PHPWord/issues) to GitHub.
|
||||
- Follow [@PHPWord](https://twitter.com/PHPWord) and [@PHPOffice](https://twitter.com/PHPOffice) on Twitter.
|
||||
|
||||
@ -92,10 +92,5 @@
|
||||
"psr-4": {
|
||||
"PhpOffice\\PhpWordTests\\": "tests/PhpWordTests"
|
||||
}
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-develop": "0.19-dev"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
composer require phpoffice/phpword:dev-develop
|
||||
composer require phpoffice/phpword:dev-master
|
||||
|
||||
Using samples
|
||||
-------------
|
||||
|
||||
@ -13,13 +13,10 @@ Applications <http://en.wikipedia.org/wiki/OpenDocument>`__
|
||||
Format <http://en.wikipedia.org/wiki/Rich_Text_Format>`__ (RTF).
|
||||
|
||||
PHPWord is an open source project licensed under the terms of `LGPL
|
||||
version 3 <https://github.com/PHPOffice/PHPWord/blob/develop/COPYING.LESSER>`__.
|
||||
PHPWord is aimed to be a high quality software product by incorporating
|
||||
`continuous integration <https://travis-ci.org/PHPOffice/PHPWord>`__ and
|
||||
`unit testing <http://phpoffice.github.io/PHPWord/coverage/develop/>`__.
|
||||
version 3 <https://github.com/PHPOffice/PHPWord/blob/master/COPYING.LESSER>`__.
|
||||
PHPWord is aimed to be a high quality software product.
|
||||
You can learn more about PHPWord by reading this Developers'
|
||||
Documentation and the `API
|
||||
Documentation <http://phpoffice.github.io/PHPWord/docs/develop/>`__.
|
||||
Documentation.
|
||||
|
||||
Features
|
||||
--------
|
||||
@ -191,7 +188,7 @@ things that you can do to contribute.
|
||||
guide <https://github.com/PHPOffice/PHPWord/blob/master/CONTRIBUTING.md>`__.
|
||||
- `Fork us <https://github.com/PHPOffice/PHPWord/fork>`__ and `request
|
||||
a pull <https://github.com/PHPOffice/PHPWord/pulls>`__ to the
|
||||
`develop <https://github.com/PHPOffice/PHPWord/tree/develop>`__
|
||||
`master <https://github.com/PHPOffice/PHPWord/tree/master>`__
|
||||
branch.
|
||||
- Submit `bug reports or feature
|
||||
requests <https://github.com/PHPOffice/PHPWord/issues>`__ to GitHub.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user