Skip to content

Commit d2c6b9f

Browse files
committed
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.
1 parent a771de7 commit d2c6b9f

File tree

5 files changed

+10
-25
lines changed

5 files changed

+10
-25
lines changed

.github/ISSUE_TEMPLATE/how-to-use.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ labels: WontFix
99

1010
Documentation is available on [Read the Docs](https://phpword.readthedocs.io/en/latest/).
1111

12-
Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/develop/samples).
12+
Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/master/samples).
1313

1414
Usage questions belong on [Stack Overflow](https://stackoverflow.com/questions/tagged/phpword).

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
22

3-
Master:
43
[![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
54
[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
65
[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
@@ -9,15 +8,9 @@ Master:
98
[![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
109
[![Join the chat at https://gitter.im/PHPOffice/PHPWord](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPWord)
1110

12-
Develop:
13-
[![Latest Development Version](https://img.shields.io/badge/unstable-dev--develop-orange.svg)](https://packagist.org/packages/phpoffice/phpword#dev-develop)
14-
[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=develop)](https://travis-ci.org/PHPOffice/PHPWord/branches)
15-
[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/?branch=develop)
16-
[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=develop)](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop)
17-
1811
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.
1912

20-
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/).
13+
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/).
2114

2215
If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpword)
2316

@@ -78,9 +71,9 @@ Run the following to use the latest stable version
7871
```sh
7972
composer require phpoffice/phpword
8073
```
81-
or if you want the latest develop version
74+
or if you want the latest unreleased version
8275
```sh
83-
composer require phpoffice/phpword:dev-develop
76+
composer require phpoffice/phpword:dev-master
8477
```
8578

8679
## Getting started
@@ -165,6 +158,6 @@ You can also read the [Developers' Documentation](http://phpword.readthedocs.org
165158
We welcome everyone to contribute to PHPWord. Below are some of the things that you can do to contribute.
166159

167160
- Read [our contributing guide](CONTRIBUTING.md).
168-
- [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.
161+
- [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.
169162
- Submit [bug reports or feature requests](https://github.com/PHPOffice/PHPWord/issues) to GitHub.
170163
- Follow [@PHPWord](https://twitter.com/PHPWord) and [@PHPOffice](https://twitter.com/PHPOffice) on Twitter.

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,5 @@
9292
"psr-4": {
9393
"PhpOffice\\PhpWordTests\\": "tests/PhpWordTests"
9494
}
95-
},
96-
"extra": {
97-
"branch-alias": {
98-
"dev-develop": "0.19-dev"
99-
}
10095
}
10196
}

docs/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Example:
3939

4040
.. code-block:: bash
4141
42-
composer require phpoffice/phpword:dev-develop
42+
composer require phpoffice/phpword:dev-master
4343
4444
Using samples
4545
-------------

docs/intro.rst

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ Applications <http://en.wikipedia.org/wiki/OpenDocument>`__
1313
Format <http://en.wikipedia.org/wiki/Rich_Text_Format>`__ (RTF).
1414

1515
PHPWord is an open source project licensed under the terms of `LGPL
16-
version 3 <https://github.com/PHPOffice/PHPWord/blob/develop/COPYING.LESSER>`__.
17-
PHPWord is aimed to be a high quality software product by incorporating
18-
`continuous integration <https://travis-ci.org/PHPOffice/PHPWord>`__ and
19-
`unit testing <http://phpoffice.github.io/PHPWord/coverage/develop/>`__.
16+
version 3 <https://github.com/PHPOffice/PHPWord/blob/master/COPYING.LESSER>`__.
17+
PHPWord is aimed to be a high quality software product.
2018
You can learn more about PHPWord by reading this Developers'
21-
Documentation and the `API
22-
Documentation <http://phpoffice.github.io/PHPWord/docs/develop/>`__.
19+
Documentation.
2320

2421
Features
2522
--------
@@ -191,7 +188,7 @@ things that you can do to contribute.
191188
guide <https://github.com/PHPOffice/PHPWord/blob/master/CONTRIBUTING.md>`__.
192189
- `Fork us <https://github.com/PHPOffice/PHPWord/fork>`__ and `request
193190
a pull <https://github.com/PHPOffice/PHPWord/pulls>`__ to the
194-
`develop <https://github.com/PHPOffice/PHPWord/tree/develop>`__
191+
`master <https://github.com/PHPOffice/PHPWord/tree/master>`__
195192
branch.
196193
- Submit `bug reports or feature
197194
requests <https://github.com/PHPOffice/PHPWord/issues>`__ to GitHub.

0 commit comments

Comments
 (0)