From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 30 May 2012 07:50:05 +0000 (+0200)
Subject: Merge branch 'master' of git://git.indexdata.com/id-docbook-common
X-Git-Url: http://git.indexdata.com/?p=id-docbook-common-moved-to-github.git;a=commitdiff_plain;h=c6e4db90ce6779ee42fafd38e776176d38c2844b

Merge branch 'master' of git://git.indexdata.com/id-docbook-common

Conflicts:
	common.ent
---

c6e4db90ce6779ee42fafd38e776176d38c2844b
diff --cc common.ent
index 8af5d33,bb59c11..909ac85
--- a/common.ent
+++ b/common.ent
@@@ -176,33 -178,35 +176,34 @@@
  <!ENTITY url.bzip2 "http://sources.redat.com/bzip2/">
  <!ENTITY url.tcl "http://www.tcl.tk/">
  <!ENTITY url.perl "http://www.perl.com/">
 -<!ENTITY url.gcc "http://gcc.gnu.org/">
 +<!ENTITY url.gcc "http://gcc.gnu.org">
  <!ENTITY url.vstudio "http://msdn.microsoft.com/vstudio/">
 -<!ENTITY url.boost "http://www.boost.org/">
 -<!ENTITY url.boost.windows.download 
 -        "http://www.boost-consulting.com/products/free">
 +<!ENTITY url.boost "http://www.boost.org">
 +<!ENTITY url.boost.windows.download "http://www.boostpro.com/download/">
  <!ENTITY url.boost.getting.started "http://www.boost.org/more/getting_started.html">
  <!ENTITY url.boost.compilers.status "http://www.boost.org/status/compiler_status.html">
 -<!ENTITY url.openssl "http://www.openssl.org/">
 +<!ENTITY url.openssl "http://www.openssl.org">
  <!ENTITY url.gnutls "http://www.gnu.org/software/gnutls/">
  <!ENTITY url.unxutils "http://sourceforge.net/projects/unxutils/">
 -<!ENTITY url.tcpwrapper "ftp://ftp.porcupine.org/pub/security/index.html">
 +<!ENTITY url.tcpwrapper "http://ftp.porcupine.org/pub/security/index.html">
  
  <!-- Operating Systems -->
- <!ENTITY url.linux.kernel "http://www.kernel.org">
- <!ENTITY url.debian "http://www.debian.org">
- <!ENTITY url.redhat "http://www.redhat.com">
- <!ENTITY url.gentoo "http://www.gentoo.org">
+ <!ENTITY url.linux.kernel "http://www.kernel.org/">
+ <!ENTITY url.debian "http://www.debian.org/">
+ <!ENTITY url.redhat "http://www.redhat.com/">
+ <!ENTITY url.centos "http://www.centos.org/">
+ <!ENTITY url.gentoo "http://www.gentoo.org/">
  <!ENTITY url.freebsd "http://www.freebsd.org/">
 -<!ENTITY url.suse "http://www.novell.com/linux/">
 +<!ENTITY url.suse "http://www.suse.com">
  <!ENTITY url.macosx "http://www.apple.com/macosx/">
- <!ENTITY url.solaris "http://www.oracle.com/us/products/servers-storage/solaris/overview/index.html">
+ <!ENTITY url.solaris "http://www.oracle.com/us/products/servers-storage/solaris/overview/">
 -<!ENTITY url.ubuntu "http://www.ubuntu.com/">
 +<!ENTITY url.ubuntu "http://www.ubuntu.com">
  <!ENTITY url.windows2000 "http://www.microsoft.com/windows2000/">
  <!ENTITY url.windows2003server "http://www.microsoft.com/windowsserver2003/default.mspx">
 -<!ENTITY url.netbsd "http://www.netbsd.org/">
 -<!ENTITY url.openbsd "http://www.openbsd.org/">
 -<!ENTITY url.docbook "http://docbook.org/">
 -<!ENTITY url.usemarcon "http://www.bl.uk/bibliographic/usemarcon.html">
 -<!ENTITY url.libpcap "http://www.tcpdump.org/">
 +<!ENTITY url.netbsd "http://www.netbsd.org">
 +<!ENTITY url.openbsd "http://www.openbsd.org">
 +<!ENTITY url.docbook "http://docbook.org">
 +<!ENTITY url.usemarcon "http://www.nationallibrary.fi/libraries/format/usemarcon.html">
 +<!ENTITY url.libpcap "http://www.tcpdump.org">
  <!ENTITY url.solr "http://lucene.apache.org/solr/">