FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

add link to 5th GPLv3 conference, change 4 to 5 for the number of conferences, and link my kerneltrap article 

svn path=/trunk/; revision=7183
This commit is contained in:
coriordan 2006-11-01 18:10:40 +00:00
parent 9b7e911fb2
commit 5f0aa342dd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
projects/gplv3/gplv3.en.xhtml
View File

@ -72,7 +72,7 @@
<h2 id="events">Events</h2>
<p>
To stimulate worldwide discussion, four international conferences
To stimulate worldwide discussion, a series of international conferences
are being organised. The 1st international GPLv3 conference
(mentioned above) was held on the 16th and 17th of january in North
America.
@ -99,7 +99,8 @@
<p>
The 5th international conference will take place in Tokyo, Japan on
the 21st and 22nd of November. The venue is Akihabara UDX
Conference Room A+B.
Conference Hall. More information is
at <a href="http://gplv3.fsij.org/">http://gplv3.fsij.org/</a>
</p>
<p>
@ -269,6 +270,10 @@
and timeline of a talk by Ciaran O'Riordan on GPLv3</a>, 26th of
September 2006</li>
<li><a href="http://kerneltrap.org/node/7238">GPLv3, DRM, and
Exceptions</a>, an article by Ciaran O'Riordan for KernelTrap -
website about Free Software kernels</li>
<li><a href="drm-and-gplv3.html"><emph>DRM</emph> and GPLv3</a>, a document
focussing only on the DRM-related changes in the first draft of GPLv3</li>