diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-04-10 13:51:07 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-04-10 13:51:07 +0200 |
| commit | 5b170d6680bdeafc225fbb6910141e232a1afa2f (patch) | |
| tree | ab5637c28e9b1b3cdf38cd6c928d8b650d654aeb /hurd | |
| parent | 864e57d304e07edbf8818e214f7b0640be5d6fd1 (diff) | |
| parent | 95eb85b269c0cb8d8690f64a541ebb3ba24fb756 (diff) | |
Merge branch 'master' of braunbox:~hurd-web/hurd-web
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/documentation.mdwn | 2 | ||||
| -rw-r--r-- | hurd/running/debian/dhcp.mdwn | 4 | ||||
| -rw-r--r-- | hurd/status/discussion.mdwn | 24 |
3 files changed, 3 insertions, 27 deletions
diff --git a/hurd/documentation.mdwn b/hurd/documentation.mdwn index 04f18283..944b5c98 100644 --- a/hurd/documentation.mdwn +++ b/hurd/documentation.mdwn @@ -1,5 +1,5 @@ [[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2011, 2012 Free Software Foundation, Inc."]] +2009, 2011, 2012, 2015 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 diff --git a/hurd/running/debian/dhcp.mdwn b/hurd/running/debian/dhcp.mdwn index cda2034d..aa9adfd9 100644 --- a/hurd/running/debian/dhcp.mdwn +++ b/hurd/running/debian/dhcp.mdwn @@ -1,5 +1,5 @@ -[[!meta copyright="Copyright © 2011, 2012, 2013, 2014 Free Software Foundation, -Inc."]] +[[!meta copyright="Copyright © 2011, 2012, 2013, 2014, 2015 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 diff --git a/hurd/status/discussion.mdwn b/hurd/status/discussion.mdwn deleted file mode 100644 index a479268f..00000000 --- a/hurd/status/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. |