updated artwork pages

mypaint · Mar 12, 2024 · 71c156b · 71c156b
1 parent b0788cf
commit 71c156b
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 60 deletions.
diff --git a/pages/docs/contributing/artwork.md b/pages/docs/contributing/artwork.md
@@ -1,31 +1,18 @@
 +++
 title = "Contributing Artwork"
+related = "licenses"
 +++
 
-The MyPaint project uses artwork contributed by the community to communicate to
-users and interested parties.
-functionality
+The MyPaint project uses artwork contributed by the community for communicating
+to users and interested parties.
 
-[list of open artwork requests][artissues].
-
-# Website & Promotional
-## MyPaint Screenshots
-Exclusive usage rights:
-- Promotional reasons like the website or social media
-*How to:*
-Artists:
-1
-2. Upload the image on the community forums
-3. In the post, give the project permission for where you want to let us use it.
-Maintainers:  Save the permission post on the Wayback machine. Link to the permission post when using the image.
-
-CC BY(-SA):
-- Distribution in MyPaint itself
-- All other purposes
+{{< button content="Open Artwork Requests"
+href="https://github.com/mypaint/mypaint/issues?q=is%3Aopen+is%3Aissue+label%3Atasks.Artwork" >}}
 
 # MyPaint
 MyPaint's interface is graphically fairly simple, but there are tasks which need
 an artist's eye.
+
 ## Icons
 MyPaint's icons are primarily SVG symbolic icons, rendered at 16x16 pixels. For
 certain uses such as the toolbar, we ask for 24x24 pixel versions too. Try to be
@@ -39,14 +26,3 @@ There is an Inkscape template for icon designers, and an extraction script in th
 
 ## Brush Packages
 Have you created some cool brushes for MyPaint? [[Share them with others|Brush Packages]]!
-
-# Licensing
-Our standard backgrounds and brush definitions really need to be usable by anyone,
-for any purpose, in any artwork, without royalty payments or legal encumbrances.
-This means we we have particularly stringent requirements of openness for the standard
-MyPaint brush packs and paper textures. See the [Licensing Policy][licensepol] in
-the wiki for details.
-
-
-[artissues]: https://github.com/mypaint/mypaint/issues?q=is%3Aopen+is%3Aissue+label%3Aartwork
-[licensepol]: https://github.com/mypaint/mypaint/wiki/Licensing-policy
diff --git a/pages/docs/contributing/licenses.md b/pages/docs/contributing/licenses.md
@@ -1,5 +1,6 @@
 +++
 title = "Licensing Works"
+related = "artwork"
 +++
 
 MyPaint is a [copyleft][wiki-copyleft], [open source][wiki-foss-def] project. Products
@@ -20,36 +21,30 @@ open licenses in order for us to be able to include it in our products.<!--more-
 - Users must have the right to freely license original works created using
 an unmodified MyPaint painting application distributed by the MyPaint project.
 
-# Types of works
-## Website (\*.md)
-> .md files are used to populate the body of pages in the MyPaint website (https://mypaint.org)
-
-To be included in the MyPaint website, .md files must be dedicated under the 
-[Creative Commons Attribution 4.0 International][CC-BY] license.
-
-## Backgrounds and palettes
+# Types of Works
+## Backgrounds and Palettes
 > It is highly probable that background images and palette files will become embedded
 in original works created using MyPaint.
 
 To be included in the MyPaint project, backgrounds and palettes must must be [public domain][wiki-public-domain].
-This may be accomplished using the the [Creative Commons CC0 1.0 Universal][CC-CC0] dedication.
-
-To apply this dedication on your work, follow [this guide][CC-guide] on declaring
-a license.
+This may be accomplished using the the [Creative Commons CC0 1.0 Universal][CC-CC0]
+dedication.
 
 The declaration may appear in a README file, embedded in the image metadata or comments
-fields. GIMP palette files have a description field which can be used for the same purpose.
+fields. GIMP palette files have a description field which can be used for the same
+purpose.
 
-## Brush packs
-### Raw brush settings (\*.myb)
+## Brush Packs
+### Raw Brush Settings (\*.myb)
 > Raw brush settings in a brush pack are copied around very enthusiastically by
 the MyPaint program. It is highly probable that raw brush settings will become embedded
 in original works created using MyPaint.
 
 To be included in the MyPaint project, brush settings must be [public domain][wiki-public-domain].
-This may be accomplished using the the [Creative Commons CC0 1.0 Universal][CC-CC0] dedication.
+This may be accomplished using the the [Creative Commons CC0 1.0 Universal][CC-CC0]
+dedication.
 
-### Other files
+### Other Files
 Other files (files that do not follow the pattern "\*.myb") are not raw brush settings.
 Such files include preview packages and supplemental cover-type artwork.
 
@@ -63,28 +58,27 @@ using one of the following dedications:
 - [Creative Commons Attribution 4.0 International][CC-BY]
 - [Creative Commons Attribution-ShareAlike 4.0 International][CC-BY-SA]
 
-## Supplemental artwork or promotional material
-> Supplemental artwork and promotional material is content distributed with the
-intent of being used miscellaneously by the MyPaint project, or by third-parties
-when referencing MyPaint and the MyPaint project. 
+## Supplemental Artwork & Promotional Material
+> Supplemental artwork and promotional material is content distributed by the MyPaint
+project, but not *within* MyPaint.
 
 To be included in the MyPaint project, supplemental artwork and promotional material
-must be distributed [openly][wiki-open-license] using one of the following dedications:
+must be distributed using one of the following dedications:
+- [Exclusive usage rights]({{< relref "#exclusive-usage-rights" >}})
 - [Creative Commons Attribution 4.0 International][CC-BY]
 - [Creative Commons Attribution-ShareAlike 4.0 International][CC-BY-SA]
 
-To apply one of these dedication on your work, follow [this guide][CC-guide] on
-declaring a license.
-
 The declaration may appear in human-readable form on a website (such as GitHub or
 the MyPaint community forums) alongside the work, or embedded into the work's metadata.
 
-We suggest marking images intended for use as promotional screenshots with the text “© \<\<YEAR\>\> \<\<YOUR NAME\>>, CC BY-SA 4.0”, in a readable but unobtrusive fashion.
+## Website (\*.md)
+> .md files are used to populate the body of pages in the MyPaint website (https://mypaint.org)
 
-## MyPaint source code
-> Application source code, icons, and artwork for display within the program.
+To be included in the MyPaint website, .md files must be dedicated under the
+[Creative Commons Attribution 4.0 International][CC-BY] license.
 
-To be included in the MyPaint website, .md files must be dedicated under the 
+## Source Code
+To be included in MyPaint, source code must be dedicated under the
 [GNU General Public License, version 2 or any later version][GNU-GPLv2] license.
 **Please note** that the "or any later version" clause is mandatory.
 
@@ -93,11 +87,22 @@ When working with source code:
 - Begin new files with a boilerplate header in the format recommended by
 the license itself.
 
-This includes program icons and artwork for display within the program.
 
+## MyPaint Assets
+Program icons and artwork for display within the program.
 
+To be included in MyPaint, assets must be dedicated under the [Creative Commons
+Attribution-ShareAlike 4.0 International][CC-BY-SA] license.
 
 # Using licenses
+## Exclusive Usage Rights
+### Artists
+1. Upload the image on the community forums
+2. In the post, give the project permission for where you want to let us use it.
+
+### Maintainers
+- Archive the permission post on the Wayback machine.
+- Link to the permission post when using the image.
 
 ## Creative Commons
 https://creativecommons.org/choose/