From d660ab34d4e77291db67c2d5c11173bf168f55db Mon Sep 17 00:00:00 2001
From: Brad Davis
Date: Thu, 2 Sep 2010 03:22:03 +0000
Subject: [PATCH] - Link to the new multimedia photos page. [1] - Remove the
old photo's page. - Sort the includes in the Makefile.
Noticed by: arundel@ [1]
---
en/internal/Makefile | 23 ++++-----
en/internal/internal.sgml | 4 +-
en/internal/photos.sgml | 102 --------------------------------------
3 files changed, 13 insertions(+), 116 deletions(-)
delete mode 100644 en/internal/photos.sgml
diff --git a/en/internal/Makefile b/en/internal/Makefile
index 07e2e03331..8bb947a07c 100644
--- a/en/internal/Makefile
+++ b/en/internal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/internal/Makefile,v 1.47 2007/02/18 12:40:45 simon Exp $
+# $FreeBSD: www/en/internal/Makefile,v 1.48 2009/10/19 07:26:46 murray Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -7,22 +7,21 @@
.include "../Makefile.inc"
.endif
-DOCS= photos.sgml
+DOCS= about.sgml
+DOCS+= bylaws.sgml
+DOCS+= core-vote.sgml
+DOCS+= developer.sgml
+DOCS+= doceng.sgml
+DOCS+= expire-bits.sgml
+DOCS+= fortunes.sgml
+DOCS+= i18n.sgml
DOCS+= internal.sgml
-DOCS+= about.sgml
DOCS+= machines.sgml
DOCS+= mirror.sgml
DOCS+= new-account.sgml
-DOCS+= statistic.sgml
-DOCS+= developer.sgml
-DOCS+= bylaws.sgml
-DOCS+= releng.sgml
-DOCS+= expire-bits.sgml
-DOCS+= core-vote.sgml
-DOCS+= doceng.sgml
DOCS+= policies.sgml
-DOCS+= fortunes.sgml
-DOCS+= i18n.sgml
+DOCS+= releng.sgml
+DOCS+= statistic.sgml
INDEXLINK= internal.html
diff --git a/en/internal/internal.sgml b/en/internal/internal.sgml
index 5a13e35b81..936971ffad 100644
--- a/en/internal/internal.sgml
+++ b/en/internal/internal.sgml
@@ -1,6 +1,6 @@
-
+
]>
@@ -48,7 +48,7 @@ the globe, there have to be some
Here are some
personal homepages
hosted at FreeBSD.org, as well as some
-photos from social events.
+photos from social events.
Resources
diff --git a/en/internal/photos.sgml b/en/internal/photos.sgml
deleted file mode 100644
index 44cd280943..0000000000
--- a/en/internal/photos.sgml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-]>
-
-
-&header;
-
-USENIX 2004, Boston, June 2004
Pictures from the
-event by Matt Dillon.
-
-20th Chaos Communication Congress, Berlin, Dec 2003
-Pictures from the
-event by Josef.
-
-FreeBSD 10 Year Anniversary Party, San Francisco, Nov 2003
-Pictures from
-the event by Matt Dillon.
-
-BSDCon 2003, San Mateo, Sept 2003
Pictures from the
-event by Matt Dillon.
-
-LinuxTag 2003, Karlsruhe, Jul 2003
-Pictures from Linuxtag
-by Josef.
-
-BSDCon Europe 2002, Amsterdam, Nov 2002
-Pictures
-Photos & comments by Wilko.
-
-USENIX 2002, Monterey, June 2002
Pictures from the
-event by Matt Dillon.
-
-BSDCon Europe 2001, Brighton, Nov 2001
-Pictures
-
-BSDCon 2000, Monterey, October 2000
-Photos by Will
-
-
-
-Photos by jkh.
-
-
-
-
-
-Photos and text by Nik. Organised
-by Paul Richards.
-
-Dutch FreeBSD meeting, October 1998
-Photos by Jordan and
-Wilko
-
-
-
-
-Aled Morris, Andre Oppermann, Andreas Klemm, Andrew Gordon, Christoph
-Badura, Dirk Meyer, Frank Nobis, Harald Klatte, Joerg Wunsch, Jonathan
-Laventhol, Lars Gerhard Kuehl, Martin Cracauer, Stefan Bethke, Stefan
-Esser, Stefan Huerter, Stefan Zehl, Stephan Forth, Thomas Gellekum
-
-
-
-
-
-Richard Stallman, Peter Wemm, Mark White, Andrew McRae, Greg Rose, many
-unidentified.
-
-
-
-
-Branson, David Greenman, David O'Brien, Greg Lehey, Guido van Rooij,
-John Polstra, Jonathan Bresler, Jordan Hubbard, Justin Gibbs, Luigi
-Rizzo, Mark Murray, Mike Smith, Monique van Rooij, Ollivier Robert,
-Philippe Regnauld, Poul-Henning Kamp, Sharon, Steve Mann
-
-
-
-
-
-Aled Morris, Christoph Kukulies, Guido van Rooij, Jonathan Leventhol,
-Jörg Wunsch, Martin Welk, Michael Reifenberger, Patrick Hausen, Paul
-Richard, Paul Richards, Poul-Henning Kamp, René de Vries, Stefan
-Esser, Ulf Kieber, Wilko Bulte
-
-
-FreeBSD Internal Home
-&footer;
-
-