From ab9c18e1c4fae269d7557b9f1f8dc183742bed8d Mon Sep 17 00:00:00 2001 From: reinhard Date: Thu, 28 Feb 2008 21:18:21 +0000 Subject: [PATCH] Moved fp6 stuff from "documents" dir to "projects" dir. svn path=/trunk/; revision=10097 --- documents/.htaccess | 2 + documents/fp6/fp6.cs.xhtml | 117 -------------- documents/fp6/fp6.en.xhtml | 133 ---------------- documents/fp6/fp6.fr.xhtml | 144 ------------------ documents/fp6/fp6.pt.xhtml | 133 ---------------- {documents => projects}/fp6/FOCAL.pdf | Bin {documents => projects}/fp6/LAFIS.pdf | Bin projects/fp6/document.de.xml | 6 +- projects/fp6/document.en.xml | 6 +- projects/fp6/document.fr.xml | 6 +- projects/fp6/document.it.xml | 6 +- projects/fp6/document.sq.xml | 6 +- {documents => projects}/fp6/focal.en.xhtml | 4 +- projects/fp6/fp6.en.xhtml | 96 ++++++++++-- {documents => projects}/fp6/lafis.en.xhtml | 4 +- .../fp6/more-support.en.xhtml | 0 .../fp6/reasoning.en.xhtml | 0 .../fp6/reasoning.pt.xhtml | 0 .../fp6/recommendation.en.xhtml | 4 +- .../fp6/recommendation.pdf | Bin .../fp6/recommendation.pt.pdf | Bin .../fp6/recommendation.pt.xhtml | 4 +- .../fp6/supporting-parties.en.xhtml | 0 .../fp6/supporting-parties.pt.xhtml | 0 24 files changed, 107 insertions(+), 564 deletions(-) create mode 100644 documents/.htaccess delete mode 100644 documents/fp6/fp6.cs.xhtml delete mode 100644 documents/fp6/fp6.en.xhtml delete mode 100644 documents/fp6/fp6.fr.xhtml delete mode 100644 documents/fp6/fp6.pt.xhtml rename {documents => projects}/fp6/FOCAL.pdf (100%) rename {documents => projects}/fp6/LAFIS.pdf (100%) rename {documents => projects}/fp6/focal.en.xhtml (99%) rename {documents => projects}/fp6/lafis.en.xhtml (99%) rename {documents => projects}/fp6/more-support.en.xhtml (100%) rename {documents => projects}/fp6/reasoning.en.xhtml (100%) rename {documents => projects}/fp6/reasoning.pt.xhtml (100%) rename {documents => projects}/fp6/recommendation.en.xhtml (97%) rename {documents => projects}/fp6/recommendation.pdf (100%) rename {documents => projects}/fp6/recommendation.pt.pdf (100%) rename {documents => projects}/fp6/recommendation.pt.xhtml (96%) rename {documents => projects}/fp6/supporting-parties.en.xhtml (100%) rename {documents => projects}/fp6/supporting-parties.pt.xhtml (100%) diff --git a/documents/.htaccess b/documents/.htaccess new file mode 100644 index 0000000000..39e4212cdf --- /dev/null +++ b/documents/.htaccess @@ -0,0 +1,2 @@ +RewriteEngine On +RewriteRule ^fp6(.*) /projects/fp6$1 [redirect=permanent] diff --git a/documents/fp6/fp6.cs.xhtml b/documents/fp6/fp6.cs.xhtml deleted file mode 100644 index 16b4ebc43e..0000000000 --- a/documents/fp6/fp6.cs.xhtml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - FSF Evropa - Dokumenty o 6. rámcovém programu EU - - - -
- - -
-

Dokumenty o 6. rámcovém programu EU

-
- -

Dokumenty zaslané Evropskou Nadací pro svobodný software pro 6. evropský -rámcový program 2002--2006 (FP6), který bude pokrývat financování -výzkumu a vývoje v prùbìhu let 2002-2006.

- -
- -

- - -
- - Last update: - - $Date$ $Author$ - - - - - diff --git a/documents/fp6/fp6.en.xhtml b/documents/fp6/fp6.en.xhtml deleted file mode 100644 index 0501f80dd2..0000000000 --- a/documents/fp6/fp6.en.xhtml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - FSFE - 6th EU Framework Programme Documents - - - -
- - -
-

6th Framework Programme Documents

-
- -

Documents by the FSF Europe for the 6th European -Community framework programme 2002--2006 (FP6), which will cover -funding by the European Commission for research and development during -the period 2002-2006.

- -
- -

- - - -
- - Last update: - - $Date$ $Author$ - - - - - diff --git a/documents/fp6/fp6.fr.xhtml b/documents/fp6/fp6.fr.xhtml deleted file mode 100644 index 6f74122c30..0000000000 --- a/documents/fp6/fp6.fr.xhtml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - FSFE - Documents du 6ème Programme Cadre de l'UE - - - -
- - -
-

Documents 6ème Programme Cadre de l'UE

-
- -

Documents rédigés par la FSF Europe pour le 6ème - programme cadre de la Communauté Européenne 2002--2006 - (FP6), qui règlera le financement par la Commission - Européenne de la recherche et développement pendant la - période 2002-2006.

- -
- -

- - - -
- - Mis à jour: - - $Date$ $Author$ - - - - - diff --git a/documents/fp6/fp6.pt.xhtml b/documents/fp6/fp6.pt.xhtml deleted file mode 100644 index f21b0947ff..0000000000 --- a/documents/fp6/fp6.pt.xhtml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - FSFE - Documentos do 6º Programa Quadro da UE - - - -
- - -
-

Documentos do 6º Programa Quadro

-
- -

Documentos da FSF Europe para o - 6º Programa Quadro -da Comunidade Europeia 2002--2006 (FP6), o qual cobrirá o financiamento -pela Comissão Europeia para investigação e desenvolvimento durante -o periodo 2002-2006.

- -
- -

- - - -
- - Last update: - - $Date$ $Author$ - - - - - diff --git a/documents/fp6/FOCAL.pdf b/projects/fp6/FOCAL.pdf similarity index 100% rename from documents/fp6/FOCAL.pdf rename to projects/fp6/FOCAL.pdf diff --git a/documents/fp6/LAFIS.pdf b/projects/fp6/LAFIS.pdf similarity index 100% rename from documents/fp6/LAFIS.pdf rename to projects/fp6/LAFIS.pdf diff --git a/projects/fp6/document.de.xml b/projects/fp6/document.de.xml index afeace02d6..5623eb82f4 100644 --- a/projects/fp6/document.de.xml +++ b/projects/fp6/document.de.xml @@ -4,18 +4,18 @@ FP6 EOI: LAFIS - LAying the Foundations for the Information Society - /documents/fp6/lafis.html + /projects/fp6/lafis.html FP6 EOI: FOCAL - FOcussing Competence for Advantages of Liberty - /documents/fp6/focal.html + /projects/fp6/focal.html Empfehlung der FSF Europe und unterstützender Parteien für das 6. Rahmenprogramm - /documents/fp6/recommendation.html + /projects/fp6/recommendation.html diff --git a/projects/fp6/document.en.xml b/projects/fp6/document.en.xml index ab0660c3be..223475bff4 100644 --- a/projects/fp6/document.en.xml +++ b/projects/fp6/document.en.xml @@ -4,18 +4,18 @@ FP6 EOI: LAFIS - LAying the Foundations for the Information Society - /documents/fp6/lafis.html + /projects/fp6/lafis.html FP6 EOI: FOCAL - FOcussing Competence for Advantages of Liberty - /documents/fp6/focal.html + /projects/fp6/focal.html Recommendation by the FSF Europe and supporting parties for the 6th framework programme - /documents/fp6/recommendation.html + /projects/fp6/recommendation.html diff --git a/projects/fp6/document.fr.xml b/projects/fp6/document.fr.xml index 4ae4f9be15..064611225f 100644 --- a/projects/fp6/document.fr.xml +++ b/projects/fp6/document.fr.xml @@ -7,7 +7,7 @@ ("Poser les fondations pour la société de l'information") - /documents/fp6/lafis.html + /projects/fp6/lafis.html FP6 EOI: FOCAL - FOcussing Competence for Advantages of @@ -15,13 +15,13 @@ <description> ("Focus de la compétence sur les avantages de la liberté") </description> - <link>/documents/fp6/focal.html</link> + <link>/projects/fp6/focal.html</link> </document> <document type="ec" date="2002-04-30"> <title>Recommandations de la FSF Europe et de tierces parties sur le 6ème programme cadre - /documents/fp6/recommendation.html + /projects/fp6/recommendation.html diff --git a/projects/fp6/document.it.xml b/projects/fp6/document.it.xml index 669c76670d..cc7b52f492 100644 --- a/projects/fp6/document.it.xml +++ b/projects/fp6/document.it.xml @@ -4,18 +4,18 @@ FP6 EOI: LAFIS - LAying the Foundations for the Information Society - /documents/fp6/lafis.html + /projects/fp6/lafis.html FP6 EOI: FOCAL - FOcussing Competence for Advantages of Liberty - /documents/fp6/focal.html + /projects/fp6/focal.html Raccomandazione della FSF Europe e degli enti sostenitori per il Sesto Programma Quadro - /documents/fp6/recommendation.html + /projects/fp6/recommendation.html diff --git a/projects/fp6/document.sq.xml b/projects/fp6/document.sq.xml index 5b7903a475..602cd1e709 100644 --- a/projects/fp6/document.sq.xml +++ b/projects/fp6/document.sq.xml @@ -7,12 +7,12 @@ ("Hedhja e Themeleve për Shoqërinë e Informacionit") - /documents/fp6/lafis.html + /projects/fp6/lafis.html FP6 EOI: FOCAL - FOcussing Competence for Advantages of Liberty - /documents/fp6/focal.html + /projects/fp6/focal.html Këshillime nga FSF Europa dhe mbështetje palësh @@ -20,6 +20,6 @@ për programin e 6-të të planit të punës - /documents/fp6/recommendation.html + /projects/fp6/recommendation.html diff --git a/documents/fp6/focal.en.xhtml b/projects/fp6/focal.en.xhtml similarity index 99% rename from documents/fp6/focal.en.xhtml rename to projects/fp6/focal.en.xhtml index ba608bd3df..bf2ce14991 100644 --- a/documents/fp6/focal.en.xhtml +++ b/projects/fp6/focal.en.xhtml @@ -7,7 +7,7 @@ -[ Back to the FP6 page ] +[ Back to the FP6 page ]

EXPRESSION OF INTEREST

@@ -857,7 +857,7 @@ document will use Free Software as the preferred term. Foundation Europe (FSF Europe) and supporting parties for the European Community framework programme 2002-2006 [*] -
Online at http://fsfeurope.org/documents/fp6/recommendation.en.html.
+
Online at http://fsfeurope.org/projects/fp6/recommendation.html.
activities in Peru [*]
diff --git a/projects/fp6/fp6.en.xhtml b/projects/fp6/fp6.en.xhtml index 06ddbc8961..8f732063a5 100644 --- a/projects/fp6/fp6.en.xhtml +++ b/projects/fp6/fp6.en.xhtml @@ -1,4 +1,4 @@ - + @@ -12,9 +12,7 @@ kept for archiving purposes.

-

6th EC Framework Programme

-

Involvement of the FSF Europe in FP6 began in March 2002, when Free Software was not on the proposed agenda for activities within the @@ -45,11 +43,7 @@ encouraged. This translates into an evaluation bonus for Free Software within FP6. Consortia with Free Software have higher chances of getting funds than those with proprietary software.

-

You can find all the documents that brought us to this point in the -document section of the FSF Europe home -page.

- -

Step 4 (currently happening)

+

Step 4

As the next step, we seek to gather people, companies and institutes interested in Free Software related activities around FP6 @@ -60,7 +54,7 @@ list created for this purpose.

start a "Co-ordinating Action" for Free Software that can help Free Software consortia get off the ground.

-

Step 5 (planned)

+

Step 5

The FSF Europe will offer to help Free Software consortia the way it is doing for AGNULA, a FP5 IST @@ -80,19 +74,93 @@ interest is the promotion and success of Free Software. One of our projects that might help with this is the Fiduciary Licence Agreement.

-
- -
-

Remark

As many will know, activities on this level are often painstakingly slow and take a lot of work. Althuogh the FSF Europe will try to do as much as it can, its resources are limited by the amount of support that it gets. So one way of speeding the process up supporting our work.

+href="/donate/donate.html">supporting our work.

+

Documents

+ +

Documents by the FSF Europe for the 6th European +Community framework programme 2002--2006 (FP6), which will cover +funding by the European Commission for research and development during +the period 2002-2006.

+ +

April 30th, 2002

+

Recommendation by the FSF Europe and supporting parties for the +6th framework programme:
+"Free Software is a + concept that has fundamentally changed the way some parts of + the IT sector are working towards a more stable, lasting and + sustainable approach with higher dynamics and increased + efficiency. It is obvious that the first region to adopt and + support this principle on a larger scale can profit + enormously and get a head-start in the information + age." +
http://fsfeurope.org/projects/fp6/recommendation.html

+ +

June 4th, 2002

+

Following a Call for +Expressions of Interest (EOI.FP6.2002), the FSF Europe submitted +an expression of interest for each of the FP6 instruments:

+ + $Date$ $Author$