From 9301524c500e7e7567d5da54b3f3d7d07e53d921 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Oct 2009 13:22:43 +0000
Subject: * Fontconfig updated to 2.7.3.  Use /etc/fonts as the default  
 configuration directory so that users on other distributions don't   need to
 set $FONTCONFIG_FILE (NIXPKGS-29).  Also use   /var/cache/fontconfig for the
 cache to prevent programs run by root   from writing into the Nix store.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
---
 doc/meta.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'doc/meta.xml')

diff --git a/doc/meta.xml b/doc/meta.xml
index 691bb4019bde..91f5f20498e5 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -164,6 +164,18 @@ following:
     3 or higher.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>bsd</varname></term>
+    <listitem><para>Catch-all for licenses that are essentially
+    similar to <link
+    xlink:href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">the
+    original BSD license with the advertising clause removed</link>,
+    i.e. permissive non-copyleft free software licenses.  This
+    includes the <link
+    xlink:href="http://www.gnu.org/licenses/license-list.html#X11License">X11
+    (“MIT”) License</link>.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>free</varname></term>
     <listitem><para>Catch-all for free software licenses not listed
-- 
cgit v1.2.3