Form 1023, as filed in
diff --git a/www/conservancy/static/about/license/index.html b/www/conservancy/static/about/license/index.html
index 8f84b785..572c55be 100644
--- a/www/conservancy/static/about/license/index.html
+++ b/www/conservancy/static/about/license/index.html
@@ -20,11 +20,9 @@
convenient to intermix the document with code.
Conservancy's Logo is also licensed
- under CC-By-SA-3.0
- Unported. A high
- quality PNG and an SVG
- version are available. We would like to
- thank Fabian A. Scherschel, who
- designed the Conservancy logo.
+ under CC-By-SA-3.0
+ USA. A Conservancy
+ logo package in ZIP format is available, which includes high quality SVG,
+ PNG and other formats.
{% endblock %}
diff --git a/www/conservancy/static/about/outside/index.html b/www/conservancy/static/about/outside/index.html
index 78421322..b69fff12 100644
--- a/www/conservancy/static/about/outside/index.html
+++ b/www/conservancy/static/about/outside/index.html
@@ -69,24 +69,9 @@ of the Public Patent Foundation.
the “Free as in Freedom”
podcast.
+Directors Emeriti
-Contractors
-
-Paul Visscher - Compliance Engineering & System Administration Contractor
-
-Paul Visscher was first exposed to the Free Software Movement in late
-1997. Paul has been a professional system administrator for most of his
-adult life, focusing primarily on GNU/Linux based systems. He began
-contracting with the Software Freedom Law Center on Compliance Engineering
-in December 2009 and continued his Compliance Engineering work with the
-Conservancy beginning in October 2010. He is actively involved in his
-local GNU/Linux user group, as well various local programming groups. He
-is a former Chief Webmaster and a former volunteer system administrator
-for the GNU project.
-
-Directors Emeritus
-
-Directors Emeritus of the Software Freedom Conservancy are former
+Directors Emeriti of the Software Freedom Conservancy are former
members of Conservancy's Board of
Directors who continue to support Conservancy's mission and
occasionally advise Conservancy.
diff --git a/www/conservancy/static/conservancy.css b/www/conservancy/static/conservancy.css
index e4d33cad..79de34e0 100644
--- a/www/conservancy/static/conservancy.css
+++ b/www/conservancy/static/conservancy.css
@@ -43,7 +43,7 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
/* background-color: #BDD8A2; */
/* background-color: #92cc58; */
/* background-color: #b5cd9d; */
- background-color: #afe578;
+ background-color: #ffffff;
border-bottom: 1px solid #808080;
}
#conservancyheader h1 {
@@ -52,7 +52,7 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
}
#logobutton {
display: block;
- position: absolute; left: 17px; top: 10px; height: 120px; width: 440px;
+ position: absolute; left: 17px; top: 10px; height: 120px; width: 933px;
background: url(/img/conservancy-header.png) left center no-repeat;
}
diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2011.pdf b/www/conservancy/static/docs/conservancy_CHAR-500_fy-2011.pdf
new file mode 100644
index 00000000..8ea77374
Binary files /dev/null and b/www/conservancy/static/docs/conservancy_CHAR-500_fy-2011.pdf differ
diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2011.pdf b/www/conservancy/static/docs/conservancy_Form-990_fy-2011.pdf
new file mode 100644
index 00000000..82d0cd7f
Binary files /dev/null and b/www/conservancy/static/docs/conservancy_Form-990_fy-2011.pdf differ
diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2011.odp b/www/conservancy/static/docs/conservancy_annual-report_fy-2011.odp
new file mode 100644
index 00000000..cd5cf806
Binary files /dev/null and b/www/conservancy/static/docs/conservancy_annual-report_fy-2011.odp differ
diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2011.pdf b/www/conservancy/static/docs/conservancy_annual-report_fy-2011.pdf
new file mode 100644
index 00000000..fad4dd59
Binary files /dev/null and b/www/conservancy/static/docs/conservancy_annual-report_fy-2011.pdf differ
diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2011.pdf b/www/conservancy/static/docs/conservancy_independent-audit_fy-2011.pdf
new file mode 100644
index 00000000..b9e98b37
Binary files /dev/null and b/www/conservancy/static/docs/conservancy_independent-audit_fy-2011.pdf differ
diff --git a/www/conservancy/static/favicon.ico b/www/conservancy/static/favicon.ico
index d2af916d..e66706c4 100644
Binary files a/www/conservancy/static/favicon.ico and b/www/conservancy/static/favicon.ico differ
diff --git a/www/conservancy/static/img/conservancy-header.png b/www/conservancy/static/img/conservancy-header.png
index c8c9db14..64c06afc 100644
Binary files a/www/conservancy/static/img/conservancy-header.png and b/www/conservancy/static/img/conservancy-header.png differ
diff --git a/www/conservancy/static/img/conservancy-logo-120px.png b/www/conservancy/static/img/conservancy-logo-120px.png
deleted file mode 100644
index 3d59fcc0..00000000
Binary files a/www/conservancy/static/img/conservancy-logo-120px.png and /dev/null differ
diff --git a/www/conservancy/static/img/conservancy-logo-75px.png b/www/conservancy/static/img/conservancy-logo-75px.png
deleted file mode 100644
index 02977077..00000000
Binary files a/www/conservancy/static/img/conservancy-logo-75px.png and /dev/null differ
diff --git a/www/conservancy/static/img/conservancy-logo.png b/www/conservancy/static/img/conservancy-logo.png
new file mode 100644
index 00000000..4da1cc7f
Binary files /dev/null and b/www/conservancy/static/img/conservancy-logo.png differ
diff --git a/www/conservancy/static/img/conservancy-logo.svg b/www/conservancy/static/img/conservancy-logo.svg
index 9c60b54b..84218625 100644
--- a/www/conservancy/static/img/conservancy-logo.svg
+++ b/www/conservancy/static/img/conservancy-logo.svg
@@ -9,17 +9,69 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
+ width="1052.3622"
+ height="744.09448"
+ id="svg3041"
version="1.1"
inkscape:version="0.47 r22583"
- width="1982.58"
- height="1982.58"
- sodipodi:docname="conservancy-logo-mk4.svg"
- inkscape:export-filename="/home/fabsh/Desktop/conservancy-logo2.png"
- inkscape:export-xdpi="21.852453"
- inkscape:export-ydpi="21.852453">
+ sodipodi:docname="Official-Conservancy-logo-package.svg"
+ inkscape:export-filename="C:\shampoo\business\AdoboArt\commissions\SoftwareFreedomConservancy\samples\batch5\b5_logo9.png"
+ inkscape:export-xdpi="102.62627"
+ inkscape:export-ydpi="102.62627">
+
+
+
+
+
+
+
+
+ id="metadata3046">
@@ -30,894 +82,663 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0110 01 10111001 110 110010 1000010111 0111 1 0 11 01111011111000111010111101110101 1010 100110101011110110100110110011111 01101010011101101101111001100100110111011 1 10 10010001101011100000010101010100001010110 011001100011101010101111001100001100001110000111 101010010111000011001010111000101010111101001 100110011110001011010101111100001110101010011 10 11001100110000111110011010101101001011100110001101 01 011100110101010101010111010011100101011110001111 11010101110101000110101000111101011010011011100101 10110010110111011011111100001010111010011011001100110010 101 011101101111011010111110101101101010111001110010101 011 1000011011010111000101011110110001111011101101110010 010 10000101010101011010100000100101011011100101111010 1101101 0110110111000111011011100101011011000101111000010101 100101001101011001100111101 100101010110001110110010110110 011 00 1110100 011 10 10 0 0100 00010110 0 10111010011010101 10 1 1001111 01101001001011011101010101 1000110111011010 011101110101110001101 0 0111000110101110011 1011 100011010 10 100110011001101110 0 1101100 10 101001 1100111 101 1001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/www/conservancy/static/img/conservancy-logo_7000x6960.png b/www/conservancy/static/img/conservancy-logo_7000x6960.png
deleted file mode 100644
index 688e73db..00000000
Binary files a/www/conservancy/static/img/conservancy-logo_7000x6960.png and /dev/null differ
diff --git a/www/conservancy/static/img/conservancy-logo_package.zip b/www/conservancy/static/img/conservancy-logo_package.zip
new file mode 100644
index 00000000..aaeb6f01
Binary files /dev/null and b/www/conservancy/static/img/conservancy-logo_package.zip differ
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 06b59707..739f1cf5 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -39,10 +39,10 @@
![Flattr us! Flattr us!](http://api.flattr.com/button/flattr-badge-large.png)
-
+
This page is licensed under a
- Creative
- Commons Attribution-ShareAlike 3.0 Unported License.
+ Creative
+ Commons Attribution-ShareAlike 3.0 USA License.