Merge branch 'hCalendar_rename'

diff --cc bin/mplayer.pl
Simple merge

diff --cc media/cluc2008-emulacija_arh/hCalendar.html
index 0000000,0000000..331256c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/media/cluc2008-emulacija_arh/hCalendar.html
@@@ -1,0 -1,0 +1,8 @@@
++<!-- http://microformats.org/wiki/hcalendar -->
++<div class="vevent">
++ <span class="organiser">Dobrica Pavlinušić</span>:
++ <span class="summary">Emulacija raznih arhitektura s primjerima</span>,
++ <a class="url" href="http://www.open.hr/dc2008/">DORS/CLUC 2008</a>,
++ <span class="location">FER</span>,
++ <abbr class="dtstart" title="20080417">17.04.2008.</span>
++</div>

diff --cc media/cluc2008-emulacija_arh/hcalendar.html
index 331256c,331256c..0000000
deleted file mode 100644,100644
--- 1/media/cluc2008-emulacija_arh/hcalendar.html
--- 2/media/cluc2008-emulacija_arh/hcalendar.html
+++ /dev/null
@@@ -1,8 -1,8 +1,0 @@@
--<!-- http://microformats.org/wiki/hcalendar -->
--<div class="vevent">
-- <span class="organiser">Dobrica Pavlinušić</span>:
-- <span class="summary">Emulacija raznih arhitektura s primjerima</span>,
-- <a class="url" href="http://www.open.hr/dc2008/">DORS/CLUC 2008</a>,
-- <span class="location">FER</span>,
-- <abbr class="dtstart" title="20080417">17.04.2008.</span>
--</div>

diff --cc media/lpc2009-Network_namespaces/hCalendar.html
index 0000000,0000000..c402336
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/media/lpc2009-Network_namespaces/hCalendar.html
@@@ -1,0 -1,0 +1,27 @@@
++<!-- http://microformats.org/wiki/hcalendar -->
++<div class="vevent">
++ <span class="organiser">Pavel Emelyanov</span>
++ <span class="summary">
++ Why network namespace sucks and how to make it suck faster
++ </span>
++ <br>
++ <a class="url" href="http://linuxplumbersconf.org/ocw/proposals/81">Linux Plumbers Conference</a>,
++ <span class="location">Portland, OR</span>,
++ <abbr class="dtstart" title="2009-09-23">Wednesday, September 23, 2009 from 10:30 – 10:55am</span>
++ <div class="description">
++  The talk outlines various ways of establishing a networking
++communication between a network namespace (a container)
++and the outer world, compares their performance and features.
++<br>
++Each namespace implements its own isolated network stack.
++Network packets comes to a network stack from network device.
++Five different device types that can be used as a packets
++sources for containers are demonstrated. Their properties
++(mostly performance and maintainability) and features are
++compared.
++<br>
++In addition, one more device type is described — the one that is currently
++only implemented in the OpenVZ containers. Its pros and cons,
++and ways it can be implemented in the mainline kernel are discussed.
++ </div>
++</div>

diff --cc media/lpc2009-Network_namespaces/hcalendar.html
index c402336,c402336..0000000
deleted file mode 100644,100644
--- 1/media/lpc2009-Network_namespaces/hcalendar.html
--- 2/media/lpc2009-Network_namespaces/hcalendar.html
+++ /dev/null
@@@ -1,27 -1,27 +1,0 @@@
--<!-- http://microformats.org/wiki/hcalendar -->
--<div class="vevent">
-- <span class="organiser">Pavel Emelyanov</span>
-- <span class="summary">
-- Why network namespace sucks and how to make it suck faster
-- </span>
-- <br>
-- <a class="url" href="http://linuxplumbersconf.org/ocw/proposals/81">Linux Plumbers Conference</a>,
-- <span class="location">Portland, OR</span>,
-- <abbr class="dtstart" title="2009-09-23">Wednesday, September 23, 2009 from 10:30 – 10:55am</span>
-- <div class="description">
--  The talk outlines various ways of establishing a networking
--communication between a network namespace (a container)
--and the outer world, compares their performance and features.
--<br>
--Each namespace implements its own isolated network stack.
--Network packets comes to a network stack from network device.
--Five different device types that can be used as a packets
--sources for containers are demonstrated. Their properties
--(mostly performance and maintainability) and features are
--compared.
--<br>
--In addition, one more device type is described — the one that is currently
--only implemented in the OpenVZ containers. Its pros and cons,
--and ways it can be implemented in the mainline kernel are discussed.
-- </div>
--</div>

diff --cc media/lpc2009-Video_API_Deathmatch/hCalendar.html
index 0000000,0000000..b6d180c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/media/lpc2009-Video_API_Deathmatch/hCalendar.html
@@@ -1,0 -1,0 +1,8 @@@
++<!-- http://microformats.org/wiki/hcalendar -->
++<div class="vevent">
++ <span class="organiser">Jonathan Bian</span>
++ <span class="summary">Video API Deathmatch: VDPAU vs. VAAPI</span>
++ <a class="url" href="http://linuxplumbersconf.org/ocw/proposals/109">Linux Plumbers Conference</a>,
++ <span class="location">Portland, OR</span>,
++ <abbr class="dtstart" title="2009-09-25">Friday, September 25, 2009 from 1:30 – 2:15pm in Salon E</abbr>
++</div>

diff --cc media/lpc2009-Video_API_Deathmatch/hcalendar.html
index b6d180c,b6d180c..0000000
deleted file mode 100644,100644
--- 1/media/lpc2009-Video_API_Deathmatch/hcalendar.html
--- 2/media/lpc2009-Video_API_Deathmatch/hcalendar.html
+++ /dev/null
@@@ -1,8 -1,8 +1,0 @@@
--<!-- http://microformats.org/wiki/hcalendar -->
--<div class="vevent">
-- <span class="organiser">Jonathan Bian</span>
-- <span class="summary">Video API Deathmatch: VDPAU vs. VAAPI</span>
-- <a class="url" href="http://linuxplumbersconf.org/ocw/proposals/109">Linux Plumbers Conference</a>,
-- <span class="location">Portland, OR</span>,
-- <abbr class="dtstart" title="2009-09-25">Friday, September 25, 2009 from 1:30 – 2:15pm in Salon E</abbr>
--</div>

diff --cc media/sf2009-oslobodimo_hardware/hCalendar.html
index 0000000,0000000..14a1268
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/media/sf2009-oslobodimo_hardware/hCalendar.html
@@@ -1,0 -1,0 +1,12 @@@
++<!-- http://microformats.org/wiki/hcalendar -->
++<div class="vevent">
++ <span class="organiser">Dobrica Pavlinušić</span>:
++ <span class="summary">Oslobodimo hardware – sve što ste željeli znati o RFID-u a niste se usudili pitati</span>
++ <a class="url" href="http://2009/slobodnifestival.info">Slobodni festival 3</a>,
++ <span class="location">Čakovec</span>,
++ <abbr class="dtstart" title="2009-07-04">4. srpnja 2009.</abbr>
++ <div class="description">
++   Pogledat ćemo neke od metoda koje su korisne kod pisanja podrške za razne hardverske uređaje,
++   sa posebnim osvrtom na RFID (Radio-frequency identification) sustav (i zašto bi bilo bolje da je slobodan).
++ </div>
++</div>

diff --cc media/sf2009-oslobodimo_hardware/hcalendar.html
index 14a1268,14a1268..0000000
deleted file mode 100644,100644
--- 1/media/sf2009-oslobodimo_hardware/hcalendar.html
--- 2/media/sf2009-oslobodimo_hardware/hcalendar.html
+++ /dev/null
@@@ -1,12 -1,12 +1,0 @@@
--<!-- http://microformats.org/wiki/hcalendar -->
--<div class="vevent">
-- <span class="organiser">Dobrica Pavlinušić</span>:
-- <span class="summary">Oslobodimo hardware – sve što ste željeli znati o RFID-u a niste se usudili pitati</span>
-- <a class="url" href="http://2009/slobodnifestival.info">Slobodni festival 3</a>,
-- <span class="location">Čakovec</span>,
-- <abbr class="dtstart" title="2009-07-04">4. srpnja 2009.</abbr>
-- <div class="description">
--   Pogledat ćemo neke od metoda koje su korisne kod pisanja podrške za razne hardverske uređaje,
--   sa posebnim osvrtom na RFID (Radio-frequency identification) sustav (i zašto bi bilo bolje da je slobodan).
-- </div>
--</div>

diff --cc www/tv.html
index 7bd8faf,a057e3a..990a08a
--- 1/www/tv.html
--- 2/www/tv.html
+++ b/www/tv.html
@@@ -68,7 -68,7 +68,7 @@@
  <h2>Info</h2>\r
  \r
  <div id="hcalendar">\r
--{hcalendar}\r
++{hCalendar}\r
  </div>\r
  \r
  \r