svn commit: r42980 - in head: en_US.ISO8859-1/htdocs en_US.ISO8859-1/htdocs/community share/xml

[Eitan Adler]

Author: eadler
Date: Thu Oct 17 04:33:22 2013
New Revision: 42980
URL: http://svnweb.freebsd.org/changeset/doc/42980

Log:
  - The "social" page was kind of lonely so combine it with the "community" page.
  - While here remove an old (circa 2009) twitter account.
  
  Further work needs to be done on the community, support, and events pages.
  
  Discussed with:	bjk
  Reviewed by:	Allan Jude <freebsd at allanjude.com>

Deleted:
  head/en_US.ISO8859-1/htdocs/community/social.xml
Modified:
  head/en_US.ISO8859-1/htdocs/community.xsl
  head/en_US.ISO8859-1/htdocs/community/Makefile
  head/share/xml/navibar.ent

Modified: head/en_US.ISO8859-1/htdocs/community.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/community.xsl	Thu Oct 17 01:53:43 2013	(r42979)
+++ head/en_US.ISO8859-1/htdocs/community.xsl	Thu Oct 17 04:33:22 2013	(r42980)
@@ -27,9 +27,6 @@
   </xsl:template>
 
   <xsl:template name="process.contentwrap">
-	      <p>&os; is well supported by its active
-		community.</p>
-
 	      <p>There are more than one hundred <a
 		href="&base;/community/mailinglists.html">mailing
 		lists</a>, dozens of web-based <a
@@ -130,5 +127,37 @@
     GSearch.setOnLoadCallback(LoadVideoBar);
   </script>
               </div> <!-- Latest Videos -->
+	      <h2>Social Networking</h2>
+	      <p>&os; is represented on a number of different social
+	        networks.</p>
+
+	      <ul>
+
+	        <li>Thousands of users have tagged nearly 30,000
+	        unique web pages with the '<a
+	        href="http://del.icio.us/tag/freebsd">freebsd</a>' tag
+	        on <a href="http://del.icio.us">del.icio.us</a>.</li>
+
+		<li>There are thousands of photos from user group
+		meetings, conferences, and hackathons tagged as '<a
+		href="http://flickr.com/search/?z=t&ss=2&w=all&q=freebsd&m=text">freebsd</a>'
+		on <a href="http://www.flickr.com">flickr</a>.</li>
+
+		<li>There are hundreds of videos from conferences,
+		screencasts, and demonstrations relating to <a
+		href="http://www.youtube.com/results?search_query=freebsd&search_type=&aq=f">FreeBSD</a>
+		on <a href="http://www.youtube.com">YouTube</a>.  In particular, there is a new <a href="http://www.youtube.com/bsdconferences">BSD Conferences</a> channel with full length 1 hour taped presentations from FreeBSD technical conferences.</li>
+
+		<li>There is a <a
+		href="http://www.facebook.com/home.php#/group.php?gid=2204657214">FreeBSD
+		Users Group</a> on <a
+		href="http://www.facebook.com">Facebook</a> and a <a href="http://www.linkedin.com/groups?gid=47628">FreeBSD Group</a> on <a href="http://www.linkedin.com">LinkedIn</a>.</li>
+
+		<li>You can follow
+		<a href="http://twitter.com/freebsdblogs">@freebsdblogs</a>,
+		<a href="http://twitter.com/freebsd">@freebsd</a>, or
+		<a href="http://twitter.com/bsdevents">@bsdevents</a>
+		on <a href="http://twitter.com">Twitter</a>.</li>
+	      </ul>
   </xsl:template>
 </xsl:stylesheet>

Modified: head/en_US.ISO8859-1/htdocs/community/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/community/Makefile	Thu Oct 17 01:53:43 2013	(r42979)
+++ head/en_US.ISO8859-1/htdocs/community/Makefile	Thu Oct 17 04:33:22 2013	(r42980)
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.xml mailinglists.xml newsgroups.xml social.xml webresources.xml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

Modified: head/share/xml/navibar.ent
==============================================================================
--- head/share/xml/navibar.ent	Thu Oct 17 01:53:43 2013	(r42979)
+++ head/share/xml/navibar.ent	Thu Oct 17 04:33:22 2013	(r42980)
@@ -37,7 +37,6 @@
     <li><a href="&base;/usergroups.html">User Groups</a></li>
     <li><a href="&base;/events/events.html">Events</a></li>
     <li><a href="&base;/community/webresources.html">Web Resources</a></li>
-    <li><a href="&base;/community/social.html">Social Networks</a></li>
     <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&A (external)</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>