[gentoo-commits] gentoo commit in xml/htdocs/foundation/en/minutes/2011: 201112_trustees_agenda.xml

[David Abbott (dabbott)]

dabbott     11/11/20 21:25:14

  Modified:             201112_trustees_agenda.xml
  Log:
  added ubuntu license info links to agenda

Revision  Changes    Path
1.2                  xml/htdocs/foundation/en/minutes/2011/201112_trustees_agenda.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/foundation/en/minutes/2011/201112_trustees_agenda.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/foundation/en/minutes/2011/201112_trustees_agenda.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/foundation/en/minutes/2011/201112_trustees_agenda.xml?r1=1.1&r2=1.2

Index: 201112_trustees_agenda.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/foundation/en/minutes/2011/201112_trustees_agenda.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 201112_trustees_agenda.xml	20 Nov 2011 20:53:12 -0000	1.1
+++ 201112_trustees_agenda.xml	20 Nov 2011 21:25:14 -0000	1.2
@@ -44,6 +44,29 @@
 <ul>
 	<li><e>Trustees</e>
 <ul>
+  <li>Gentoo Logo Usage Policy
+<ul>
+  <li><uri link="/main/en/name-logo.xml">
+      Current Policy</uri></li>
+  <li><uri link="http://www.debian.org/logos/"
+      >Debian Open Use Logo Policy</uri></li>
+  <li><uri
+      link="http://en.opensuse.org/openSUSE:Trademark_guidelines#Advertising_and_Marketing_Materials.2C_including_Business_Cards">
+      OpenSUSE Advertising and Marketing Materials</uri></li>
+  <li><uri link="http://fedoraproject.org/wiki/Logo/UsageGuidelines">
+      Fedora Logo Usage Guidelines</uri></li>
+  <li><uri link="https://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy#Logo_Usage_Guidelines">
+      Arch Linux Logo Usage Guidelines</uri></li>
+  <li>Ubuntu
+    <ul>
+      <li><uri link="http://www.ubuntu.com/aboutus/trademarkpolicy">
+          Trademark Policy</uri></li>
+        <li><uri link="http://design.canonical.com/the-toolkit/ubuntu-brand-guidelines/">
+            Ubuntu Brand Guidelines</uri></li>
+    </ul>
+  </li>
+</ul>
+  </li>
   <li>SFLC Update</li>
 </ul>
 </li>
@@ -93,24 +116,9 @@
   </li>
   <li><b>New Business</b>
 <ul>
-  <li>George Boyce <b>|</b> Use of Gentoo Artwork
+  <li> ---
 <ul>
-  <li><uri link="http://dev.cowabductors.org/">Alien Cow Abductors</uri></li>
-</ul>
-  </li>
-  <li>Gentoo Logo Usage Policy
-<ul>
-  <li><uri link="/main/en/name-logo.xml">
-      Current Policy</uri></li>
-  <li><uri link="http://www.debian.org/logos/"
-      >Debian Open Use Logo Policy</uri></li>
-  <li><uri
-      link="http://en.opensuse.org/openSUSE:Trademark_guidelines#Advertising_and_Marketing_Materials.2C_including_Business_Cards">
-      OpenSUSE Advertising and Marketing Materials</uri></li>
-  <li><uri link="http://fedoraproject.org/wiki/Logo/UsageGuidelines">
-      Fedora Logo Usage Guidelines</uri></li>
-  <li><uri link="https://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy#Logo_Usage_Guidelines">
-      Arch Linux Logo Usage Guidelines</uri></li>
+  <li> --- </li>
 </ul>
   </li>
 </ul>