summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-04-01 14:16:32 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-04-01 14:16:32 +0200
commit7262ab33cf165f173803a0d69edadc3140feef07 (patch)
tree39807b573cae41797d98b93a32d688981239608f
parent92dc9670123d712324d370337fea8796088214b6 (diff)
parent7e5c0a0851706c4331cc826f690af1cfb702d2e5 (diff)
Merge branch 'master' of braunbox:~hurd-web/hurd-web
-rw-r--r--FunnyHurd.mdwn24
-rw-r--r--community/thug.mdwn2
2 files changed, 25 insertions, 1 deletions
diff --git a/FunnyHurd.mdwn b/FunnyHurd.mdwn
new file mode 100644
index 00000000..dcbe6b71
--- /dev/null
+++ b/FunnyHurd.mdwn
@@ -0,0 +1,24 @@
+[[!meta copyright="Copyright © 2018 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/community/thug.mdwn b/community/thug.mdwn
index 721c5aaf..402ff7b6 100644
--- a/community/thug.mdwn
+++ b/community/thug.mdwn
@@ -1,6 +1,6 @@
# <a name="Toronto_GNU_Hurd_User_Group"> </a> Toronto (GNU/)Hurd User Group
-We are the first of the [[WebHome]] [[UserGroups]], and consequently the biggest! Our name is a slight misnomer, since we have plenty of members who live outside of Toronto, Ontario, Canada. We have a members in the Kitchener/Waterloo area who are about two hours from Toronto (by automobile,) and a member in Oakland, California, USA who is about two hours from Toronto (by aeroplane.)
+We are the first of the [[WebHome]] [[User Groups|community]], and consequently the biggest! Our name is a slight misnomer, since we have plenty of members who live outside of Toronto, Ontario, Canada. We have a members in the Kitchener/Waterloo area who are about two hours from Toronto (by automobile,) and a member in Oakland, California, USA who is about two hours from Toronto (by aeroplane.)
We are also expanding our reach. Currently our core members range in location from Montreal, PQ. to Waterloo, On.