Skip to content

Commit

Permalink
Merge pull request #6895 from python-pillow/alex-clark-jeffrey-a-clar…
Browse files Browse the repository at this point in the history
…k-alex

Alex Clark -> Jeffrey A. Clark (Alex)
  • Loading branch information
hugovk committed Jan 14, 2023
2 parents 43bb035 + 5a71fe8 commit 50f5ead
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The Python Imaging Library (PIL) is

Pillow is the friendly PIL fork. It is

Copyright © 2010-2023 by Alex Clark and contributors
Copyright © 2010-2023 by Jeffrey A. Clark (Alex) and contributors.

Like PIL, Pillow is licensed under the open source HPND License:

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

## Python Imaging Library (Fork)

Pillow is the friendly PIL fork by [Alex Clark and
Contributors](https://github.com/python-pillow/Pillow/graphs/contributors).
Pillow is the friendly PIL fork by [Jeffrey A. Clark (Alex) and
contributors](https://github.com/python-pillow/Pillow/graphs/contributors).
PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
As of 2019, Pillow development is
[supported by Tidelift](https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=readme&utm_campaign=enterprise).
Expand Down
2 changes: 1 addition & 1 deletion docs/COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The Python Imaging Library (PIL) is

Pillow is the friendly PIL fork. It is

Copyright © 2010-2023 by Alex Clark and contributors
Copyright © 2010-2023 by Jeffrey A. Clark (Alex) and contributors

Like PIL, Pillow is licensed under the open source PIL
Software License:
Expand Down
10 changes: 6 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@

# General information about the project.
project = "Pillow (PIL Fork)"
copyright = "1995-2011 Fredrik Lundh, 2010-2023 Alex Clark and Contributors"
author = "Fredrik Lundh, Alex Clark and Contributors"
copyright = (
"1995-2011 Fredrik Lundh, 2010-2023 Jeffrey A. Clark (Alex) and contributors"
)
author = "Fredrik Lundh, Jeffrey A. Clark (Alex), contributors"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -243,7 +245,7 @@
master_doc,
"PillowPILFork.tex",
"Pillow (PIL Fork) Documentation",
"Alex Clark",
"Jeffrey A. Clark (Alex)",
"manual",
)
]
Expand Down Expand Up @@ -293,7 +295,7 @@
"Pillow (PIL Fork) Documentation",
author,
"PillowPILFork",
"Pillow is the friendly PIL fork by Alex Clark and Contributors.",
"Pillow is the friendly PIL fork by Jeffrey A. Clark (Alex) and contributors.",
"Miscellaneous",
)
]
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pillow
======

Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.com/python-pillow/Pillow/graphs/contributors>`_. PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
Pillow is the friendly PIL fork by `Jeffrey A. Clark (Alex) and contributors <https://github.com/python-pillow/Pillow/graphs/contributors>`_. PIL is the Python Imaging Library by Fredrik Lundh and contributors.

Pillow for enterprise is available via the Tidelift Subscription. `Learn more <https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=docs&utm_campaign=enterprise>`_.

Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ description = Python Imaging Library (Fork)
long_description = file: README.md
long_description_content_type = text/markdown
url = https://python-pillow.org
author = Alex Clark (PIL Fork Author)
author_email = aclark@python-pillow.org
author = Jeffrey A. Clark (Alex)
author_email = aclark@aclark.net
license = HPND
classifiers =
Development Status :: 6 - Mature
Expand Down
4 changes: 2 additions & 2 deletions src/PIL/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Pillow (Fork of the Python Imaging Library)
Pillow is the friendly PIL fork by Alex Clark and Contributors.
Pillow is the friendly PIL fork by Jeffrey A. Clark (Alex) and contributors.
https://github.com/python-pillow/Pillow/
Pillow is forked from PIL 1.1.7.
PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
PIL is the Python Imaging Library by Fredrik Lundh and contributors.
Copyright (c) 1999 by Secret Labs AB.
Use PIL.__version__ for this Pillow version.
Expand Down

0 comments on commit 50f5ead

Please sign in to comment.