Skip to content

Commit

Permalink
Item12093 : fix manifest and update documentation
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@15437 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Sep 26, 2012
1 parent dbc3640 commit bd57629
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 17 deletions.
30 changes: 19 additions & 11 deletions core/data/System/ProjectLogos.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
%META:TOPICINFO{author="ProjectContributor" date="1282570594" format="1.1" version="1"}%
%META:TOPICINFO{author="BaseUserMapping_999" comment="reprev" date="1348666060" format="1.1" reprev="1" version="1"}%
%META:TOPICPARENT{name="UserDocumentationCategory"}%
---+ Logos
---+ Foswiki brand material

The official Foswiki logo is attached to this page.
The official Foswiki logo and derivatives are attached to this page.

---++ Logo Artwork
---++ Logo artwork

%STARTINCLUDE%
<img src="%ATTACHURLPATH%/foswiki-logo.gif" alt="The Free and Open Source Wiki" title="The Free and Open Source Wiki" />
Expand All @@ -13,7 +13,7 @@ The official Foswiki logo is attached to this page.

%STOPINCLUDE%

---++ Logo Customization
---++ Logo customization

The logo can be changed by redefining the =WIKILOGOIMG= [[%SYSTEMWEB%.PreferenceSettings][preference setting]].

Expand All @@ -29,16 +29,24 @@ If you use the official artwork on your own site you must link back to Foswiki.o

If you create your own skin you are encouraged to add this small logo at the bottom of your skin.

---++ Right to use Artwork
---++ Right to use artwork

The logo artwork of Foswiki.org should be used "as is" in order to get consistent branding for Foswiki.

You may NOT use any original artwork from Foswiki.org, nor make or use modified versions of such artwork, except under the following conditions:
* You may use the Foswiki artwork on a web site, in product description and promotional material IF and ONLY IF such use can in no way be interpreted as anything other than an attribution. Using the Foswiki name and artwork in a manner that implies endorsement of a product or service is not allowed.
<!-- %JQREQUIRE{"chili"}% -->


%META:FILEATTACHMENT{name="favicon.ico" attachment="favicon.ico" attr="" comment="" date="1227691956" path="favicon.ico" size="1150" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki-badge.gif" attachment="foswiki-badge.png" attr="" comment="" date="1227691956" path="foswiki-badge.png" size="4807" user="ProjectContributor" version="2"}%
%META:FILEATTACHMENT{name="foswiki-logo.gif" attachment="foswiki-logo.gif" attr="" comment="" date="1227691994" path="foswiki-logo.gif" size="7537" user="ProjectContributor" version="2"}%
%META:FILEATTACHMENT{name="foswiki-logo.xcf" attachment="foswiki-logo.xcf" attr="" date="1227691956" path="foswiki-logo.xcf" size="45514" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="favicon-logo.ico" attr="" comment="" date="1348614818" path="favicon-logo.ico" size="1150" version=""}%
%META:FILEATTACHMENT{name="foswiki-badge.gif" attr="" comment="" date="1348665285" path="foswiki-badge.gif" size="2765" version=""}%
%META:FILEATTACHMENT{name="favicon-logo.png" attr="" comment="" date="1348614459" path="favicon-logo.png" size="1448" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo-large.png" attr="" comment="" date="1348665098" path="foswiki-logo-large.png" size="74663" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo.png" attr="" comment="" date="1348665070" path="foswiki-logo.png" size="4815" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo-outlines.svg" attr="" comment="" date="1348665423" path="foswiki-logo-outlines.svg" size="3791" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo.gif" attr="" comment="" date="1348665037" path="foswiki-logo.gif" size="3906" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo.ai" attr="" comment="" date="1348665350" path="foswiki-logo.ai" size="66282" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo.pdf" attr="" comment="" date="1348665325" path="foswiki-logo.pdf" size="64117" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo.svg" attr="" comment="" date="1348665846" path="foswiki-logo.svg" size="1874" version=""}%
%META:FILEATTACHMENT{name="favicon.ico" attr="" comment="" date="1348665612" path="favicon.ico" size="1150" version=""}%
%META:FILEATTACHMENT{name="foswiki-logo-outlines.pdf" attr="" comment="" date="1348665442" path="foswiki-logo-outlines.pdf" size="59700" version=""}%
%META:FILEATTACHMENT{name="favicon.png" attr="" comment="" date="1348665532" path="favicon.png" size="1166" version=""}%
15 changes: 9 additions & 6 deletions core/lib/Foswiki/Contrib/core/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -943,16 +943,19 @@ pub/System/PreviewBackground/preview2bg.gif 0644
pub/System/PreviewBackground/previewbg.gif 0644
pub/System/PrintSkin/fullscreen.gif 0644
pub/System/PrintSkin/screenshot.gif 0644
pub/System/ProjectLogos/favicon-f.ico 0644
pub/System/ProjectLogos/favicon.ico 0644
pub/System/ProjectLogos/foswiki-badge.gif 0644
pub/System/ProjectLogos/foswiki-logo-site.png 0644
pub/System/ProjectLogos/foswiki-logo.png 0644
pub/System/ProjectLogos/favicon-logo.ico 0644
pub/System/ProjectLogos/favicon.ico 0644
pub/System/ProjectLogos/favicon.png 0644
pub/System/ProjectLogos/foswiki-logo-outlines.pdf 0644
pub/System/ProjectLogos/foswiki-logo-outlines.svg 0644
pub/System/ProjectLogos/foswiki-logo.svg 0644
pub/System/ProjectLogos/foswiki-logo.ai 0644
pub/System/ProjectLogos/foswiki-logo.pdf 0644
pub/System/ProjectLogos/foswiki-badge.gif 0644
pub/System/ProjectLogos/foswiki-logo-large.png 0644
pub/System/ProjectLogos/foswiki-logo.png 0644
pub/System/ProjectLogos/foswiki-logo.gif 0644
pub/System/ProjectLogos/favicon-logo.ico 0644
pub/System/ProjectLogos/favicon-logo.png 0644
pub/System/SkinTemplates/base.css 0644
pub/System/SkinTemplates/base.css.gz 0644
pub/System/SkinTemplates/base_src.css 0644
Expand Down

0 comments on commit bd57629

Please sign in to comment.