Skip to content

Commit fd4fa11

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into nonstatic
2 parents dd01ed1 + 6c3d1e7 commit fd4fa11

File tree

239 files changed

+287
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+287
-324
lines changed

docs/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ No Windows operating system is needed for usage because the resulting
1616
DOCX, ODT, or RTF files can be opened by all major `word processing
1717
softwares <http://en.wikipedia.org/wiki/List_of_word_processors>`__.
1818

19-
PHPWord is an open source project licensed under LGPL. PHPWord is `unit
19+
PHPWord is an open source project licensed under LGPL version 3. PHPWord is `unit
2020
tested <https://travis-ci.org/PHPOffice/PHPWord>`__ to make sure that
2121
the released versions are stable.
2222

docs/src/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ PHPWord is a library written in pure PHP that provides a set of classes to write
4949

5050
No Windows operating system is needed for usage because the resulting DOCX, ODT, or RTF files can be opened by all major [word processing softwares](http://en.wikipedia.org/wiki/List_of_word_processors).
5151

52-
PHPWord is an open source project licensed under LGPL. PHPWord is [unit tested](https://travis-ci.org/PHPOffice/PHPWord) to make sure that the released versions are stable.
52+
PHPWord is an open source project licensed under LGPL version 3. PHPWord is [unit tested](https://travis-ci.org/PHPOffice/PHPWord) to make sure that the released versions are stable.
5353

5454
**Want to contribute?** [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us.
5555

src/PhpWord/Autoloader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;

src/PhpWord/DocumentProperties.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;

src/PhpWord/Element/AbstractContainer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;
1111

12-
use PhpOffice\PhpWord\PhpWord;
13-
use PhpOffice\PhpWord\Media;
1412
use PhpOffice\PhpWord\Element\CheckBox;
1513
use PhpOffice\PhpWord\Element\Image;
1614
use PhpOffice\PhpWord\Element\Link;
1715
use PhpOffice\PhpWord\Element\ListItem;
1816
use PhpOffice\PhpWord\Element\Object;
1917
use PhpOffice\PhpWord\Element\TextBreak;
2018
use PhpOffice\PhpWord\Element\TextRun;
19+
use PhpOffice\PhpWord\Media;
20+
use PhpOffice\PhpWord\PhpWord;
2121

2222
/**
2323
* Container abstract class

src/PhpWord/Element/AbstractElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

src/PhpWord/Element/Cell.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

src/PhpWord/Element/CheckBox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

src/PhpWord/Element/Endnote.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

src/PhpWord/Element/Footer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

0 commit comments

Comments
 (0)