svn commit: r39005 - in head: fr_FR.ISO8859-1/htdocs/advocacy zh_CN.GB2312/htdocs/advocacy

[Isabell Long]

Author: issyl0
Date: Thu Jun  7 09:13:00 2012
New Revision: 39005
URL: http://svn.freebsd.org/changeset/doc/39005

Log:
  - Remove out-of-date references to the Halloween letter on the zh_CN and fr_FR
  advocacy pages of the website.
  - Remove letter.sgml itself in zh_CN.
  - Remove references to letter.sgml from the advocacy directory's Makefile in
  zh_CN.
  
  Approved by:	blackend, delphij, gabor (mentor)

Deleted:
  head/zh_CN.GB2312/htdocs/advocacy/letter.sgml
Modified:
  head/fr_FR.ISO8859-1/htdocs/advocacy/index.sgml
  head/zh_CN.GB2312/htdocs/advocacy/Makefile
  head/zh_CN.GB2312/htdocs/advocacy/index.sgml

Modified: head/fr_FR.ISO8859-1/htdocs/advocacy/index.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/advocacy/index.sgml	Thu Jun  7 08:31:43 2012	(r39004)
+++ head/fr_FR.ISO8859-1/htdocs/advocacy/index.sgml	Thu Jun  7 09:13:00 2012	(r39005)
@@ -36,14 +36,6 @@
 	<p>D&eacute;crit et d&eacute;monte certains des mythes qui entourent les projets
 	  *BSD.</p></li>
 
-        <li><p><a href="&enbase;/advocacy/letter.html">L'&eacute;vang&eacute;lisation de FreeBSD et le
-	    m&eacute;mo Halloween</a></p>
-
-	<p>La r&eacute;ponse de Jordan Hubbard &agrave; l'infamant m&eacute;mo Halloween, post&eacute;e sur
-	  la liste de diffusion FreeBSD-Advocacy (et reprise avec la
-	  permission de l'auteur).</p>
-
-      </li>
         <li><p><a href="&base;/news/press.html">FreeBSD dans la Presse</a></p>
 
 	<p>Contient de nombreux liens sur des articles publi&eacute;s et qui mentionnent

Modified: head/zh_CN.GB2312/htdocs/advocacy/Makefile
==============================================================================
--- head/zh_CN.GB2312/htdocs/advocacy/Makefile	Thu Jun  7 08:31:43 2012	(r39004)
+++ head/zh_CN.GB2312/htdocs/advocacy/Makefile	Thu Jun  7 09:13:00 2012	(r39005)
@@ -11,6 +11,5 @@
 
 DOCS=   index.sgml
 DOCS+=	myths.sgml
-DOCS+=	letter.sgml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

Modified: head/zh_CN.GB2312/htdocs/advocacy/index.sgml
==============================================================================
--- head/zh_CN.GB2312/htdocs/advocacy/index.sgml	Thu Jun  7 08:31:43 2012	(r39004)
+++ head/zh_CN.GB2312/htdocs/advocacy/index.sgml	Thu Jun  7 09:13:00 2012	(r39005)
@@ -30,12 +30,6 @@
 
 	<p>½éÉܲ¢²ð´©Ò»Ð©¹ØÓÚ *BSD ÏîÄ¿µÄÃÔ˼¡£</p></li>
 
-        <li><p><a href="letter.html">¹ØÓÚ´Ù½ø FreeBSD ºÍÍòÊ¥½Ú±¸Íü¼</a></p>
-
-	<p>Jordan Hubbard ¹ØÓÚ·¢µ½ FreeBSD-Advocacy ÓʼþÁбíµÄ£¬
-	  ÖøÃûµÄÍòÊ¥½Ú±¸Íü¼µÄ»ØÓ¦ (Ôڵõ½ËûµÄÊÚȨ֮ºó£¬ ÔÚ´ËÔٴη¢²¼)¡£</p>
-
-      </li>
         <li><p><a href="&base;/news/press.html">ýÌ屨µÀÖÐµÄ FreeBSD</a></p>
 
 	<p>ÌṩÁËÐí¶àÌáµ½ FreeBSD µÄýÌ屨µÀÎÄÕµÄÁ´½Ó¡£</p></li>