diff --git a/Manual/Introduction/authors.texi b/Manual/Introduction/authors.texi index 08da524..f62bdd3 100755 --- a/Manual/Introduction/authors.texi +++ b/Manual/Introduction/authors.texi @@ -3,8 +3,6 @@ Repository along the years: @subheading Graphic Design -Work line: @ref{Directories trunk Identity} - @itemize @item Guideon de Kok @item @email{al@@art.centos.org,Alain Reguera Delgado} @@ -13,8 +11,6 @@ Work line: @ref{Directories trunk Identity} @subheading Documentation -Work line: @ref{Directories trunk Manual} - @itemize @item @email{al@@art.centos.org,Alain Reguera Delgado} @item @email{ralph@@dev.centos.org,Ralph Angenendt} @@ -22,16 +18,12 @@ Work line: @ref{Directories trunk Manual} @subheading Localization -Work line: @ref{Directories trunk Locales} - @itemize @item @email{al@@art.centos.org,Alain Reguera Delgado} (Spanish) @end itemize @subheading Automation -Work line: @ref{Directories trunk Scripts} - @itemize @item @email{al@@art.centos.org,Alain Reguera Delgado} @end itemize diff --git a/Manual/Introduction/copying.texi b/Manual/Introduction/copying.texi index 442012f..5b82ea0 100755 --- a/Manual/Introduction/copying.texi +++ b/Manual/Introduction/copying.texi @@ -1,17 +1,11 @@ -Inside the CentOS Artwork Repository you can find content branded by -The CentOS Project and content not branded at all. Contents branded by -The CentOS Project contain either The CentOS Trademark, The CentOS -Logo or The CentOS Symbol. Content branded by The CentOS Project -cannot be redistributed without previous conversation with The CentOS -Project. However, you can study and modify both content branded by -The CentOS Project and content not branded at all in the sake of -proposing improvements to The CentOS Project corporate visual -identity. - -If you are using the CentOS Artwork Repository for producing your own -corporate visual identity, you should remove all The CentOS Trademarks -from your contents and rename the repository to something different -from CentOS Artwork Repository. +@verbatim +Copyright (C) 2009, 2010, 2011 The CentOS Project +@end verbatim + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +@subheading Preamble The CentOS Artwork Repository organizes files in a very specific way to implement The CentOS Project corporate visual identity. This very @@ -19,8 +13,6 @@ specific organization of files is part of @command{centos-art.sh} script, a bash script that automates most of the frequent tasks inside the repository. -@subheading The @command{centos-art.sh} script - The @command{centos-art.sh} script and the organization of files it needs to work are not in the public domain; they are copyrighted and there are restrictions on their distribution, but these restrictions @@ -49,9 +41,32 @@ their recipients to know that what they have is not what we distributed, so that any problems introduced by others will not reflect on our reputation. +The centos-art.sh script is released as a GPL work. Individual +packages used by centos-art.sh script include their own licenses and +the centos-art.sh script license applies to all packages that it does +not clash with. If there is a clash between the centos-art.sh script +license and individual package licenses, the individual package +license applies instead. + The precise conditions of the license for the @command{centos-art.sh} -script are found in the General Public Licenses that accompany it (see -file -@url{file:///home/centos/artwork/trunk/Scripts/COPYING,trunk/Scripts/COPYING}). -This manual specifically is covered by the GNU Free Documentation -License. +script are found in the General Public Licenses (@pxref{GNU General +Public License}). This manual specifically is covered by the GNU Free +Documentation License (@pxref{GNU Free Documentation License}). + +@subheading 1. The CentOS Brand + +The CentOS Brand (@pxref{Directories trunk Identity Models Brands}) is +the main visual manifestaion of The CentOS Project. The CentOS Project +uses The CentOS Brand to connect all its visual manifestions (e.g., +GNU/Linux Distributions, Websites, Stationery, etc.) and, this way, +provide recognition among other similar projects. + +Both The CentOS Brand and all the visual manifestations that derivate +from it are available for you to be able to study and improve them +around a good citizen's will inside The CentOS Community environment, +but you are not allowed to redistribute them elsewhere, without the +given permission of The CentOS Project. + +If you need to redistribute either The CentOS Brand or any the visual +manifestatinos that derivate from it, write your intentions to the +@email{centos-devel@@centos.org} mailing list. diff --git a/Manual/Introduction/feedback.texi b/Manual/Introduction/feedback.texi index a3fd751..1c7f597 100644 --- a/Manual/Introduction/feedback.texi +++ b/Manual/Introduction/feedback.texi @@ -1,8 +1,9 @@ -If you find an error in the @emph{CentOS Artwork Repository Manual}, -or if you have thought of a way to make this manual better, we would -like to hear from you! Create a new ticket in The CentOS Artwork SIG -web site (@url{https://projects.centos.org/trac/artwork/}). +If you find an error in the @emph{CentOS Artwork Repository}, or if +you have thought of a way to make this manual better, we would like to +hear from you! Share your suggestions in the appropriate mailing list +(@url{http://lists.centos.org/}) and/or bug tracker +(@url{http://bugs.centos.org/}). -If you have a suggestion for improving the documentation, try to be as -specific as possible. If you have found an error, include the section +When you make suggestion, try to be as specific as possible. For +example, if you have found an error in the manual, include the section number and some of the surrounding text so we can find it easily. diff --git a/Manual/Introduction/repo-convenctions.texi b/Manual/Introduction/repo-convenctions.texi index 01d825b..ccab922 100644 --- a/Manual/Introduction/repo-convenctions.texi +++ b/Manual/Introduction/repo-convenctions.texi @@ -52,9 +52,8 @@ Identity is built and maintained from The CentOS Community itself. It is also important to remember that all source files inside CentOS Artwork Repository should comply the terms of GNU General Public -License in order for them to remain inside the repository. See file -@url{file:///home/centos/artwork/trunk/Scripts/COPYING,trunk/Scripts/COPYING}, -for a complete license description. +License (@pxref{GNU General Public License}) in order for them to +remain inside the repository. @subsection Repository organization @cindex Repository organization