Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/web

3 files changed, 6 insertions, 54 deletions

diff --git a/community/gsoc/discussion.mdwn b/community/gsoc/discussion.mdwn
deleted file mode 100644
index a479268f..00000000
--- a/community/gsoc/discussion.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta copyright="Copyright © 2014 Free Software Foundation, Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|/fdl]]."]]"""]]
-
-HERE STARTS YOUR NEW CONTENT -- remove everything from here on, including this
-line.
-
-By creating this page, you agree to assign copyright for your contribution to
-the Free Software Foundation, <http://www.fsf.org/>.  The Free Software
-Foundation promises to always use a free documentation license (as per our
-criteria of free documentation) when publishing your contribution.  We grant
-you back all your rights under copyright, including the rights to copy, modify,
-and redistribute your contributions.
-
-We're requiring these copyright assignments, so that we'll easily be able to
-include your contributions in official GNU documentation, such as the GNU Hurd
-Reference Manual, etc.  Send email to <hurd-maintainers@gnu.org> if there are
-questions.
diff --git a/hurd/running/BuildingHurdLiveCD.mdwn b/hurd/running/BuildingHurdLiveCD.mdwn
deleted file mode 100644
index a479268f..00000000
--- a/hurd/running/BuildingHurdLiveCD.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta copyright="Copyright © 2014 Free Software Foundation, Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|/fdl]]."]]"""]]
-
-HERE STARTS YOUR NEW CONTENT -- remove everything from here on, including this
-line.
-
-By creating this page, you agree to assign copyright for your contribution to
-the Free Software Foundation, <http://www.fsf.org/>.  The Free Software
-Foundation promises to always use a free documentation license (as per our
-criteria of free documentation) when publishing your contribution.  We grant
-you back all your rights under copyright, including the rights to copy, modify,
-and redistribute your contributions.
-
-We're requiring these copyright assignments, so that we'll easily be able to
-include your contributions in official GNU documentation, such as the GNU Hurd
-Reference Manual, etc.  Send email to <hurd-maintainers@gnu.org> if there are
-questions.
diff --git a/recent_changes.mdwn b/recent_changes.mdwn
index bac9b276..594a0390 100644
--- a/recent_changes.mdwn
+++ b/recent_changes.mdwn
@@ -1,14 +1,14 @@
 [[!meta copyright="Copyright © 2008 Free Software Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="É concedida permissão para copiar, distribuir e/ou modificar este
-documento sob os termos da GNU Free Documentation License, Versão 1.2 ou
-qualquer versão posterior publicada pela Free Software Foundation; sem seções 
-invariante, sem o textos de capa frontal, e sem o textos de quarta capa. Uma cópia da licença
-está incluído na seção intitulada
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled
 [[GNU Free Documentation License|/fdl]]."]]"""]]
 
-[[!meta title="Mudanças recentes"]]
+[[!meta title="Recent Changes"]]
 
 [[!inline pages="internal(recent_changes/change_*)" template=recentchanges
 show=0]]