Update Samba Team calendar.
authorDeryck Hodge <deryck@samba.org>
Thu, 26 Jan 2006 20:46:49 +0000 (20:46 +0000)
committerDeryck Hodge <deryck@samba.org>
Thu, 26 Jan 2006 20:46:49 +0000 (20:46 +0000)
POst news item on calendar update.

This cleans out all the calendar entries
from the past year, too.

deryck

git-svn-id: file:///home/svn/samba-web/trunk@899 44aeb9d7-1cd8-0310-b257-a505e0beeac2

36 files changed:
news/calendar/LISA_04.txt [deleted file]
news/calendar/LISA_05.txt [deleted file]
news/calendar/SANE2004.txt [deleted file]
news/calendar/cifs05.txt [deleted file]
news/calendar/cifs2004.txt [deleted file]
news/calendar/crh_northland.txt [deleted file]
news/calendar/fosdem_jelmer.txt [deleted file]
news/calendar/geekcruises_hertel.txt [deleted file]
news/calendar/ibm_berlin.txt [deleted file]
news/calendar/index.html
news/calendar/interLUG_ital.txt [deleted file]
news/calendar/jht_bham_uk.txt [deleted file]
news/calendar/jht_chicago.txt [deleted file]
news/calendar/jht_chicago_05.txt [deleted file]
news/calendar/jht_kansas.txt [deleted file]
news/calendar/jht_network_powerhouse.txt
news/calendar/jht_sandiego.txt [deleted file]
news/calendar/jht_training_general.txt [deleted file]
news/calendar/jra_london_expo.txt [deleted file]
news/calendar/kazakhstan.txt [deleted file]
news/calendar/lca_06.txt [new file with mode: 0644]
news/calendar/linuxday_italy.txt [deleted file]
news/calendar/linuxkongress.txt [deleted file]
news/calendar/linuxworld_boston.txt [deleted file]
news/calendar/linuxworld_frankfurt.txt [deleted file]
news/calendar/linuxworld_frankfurt_05.txt [deleted file]
news/calendar/lw_boston_06.txt [new file with mode: 0644]
news/calendar/mimir_krynica_lug.txt [deleted file]
news/calendar/ohio_lug.txt [deleted file]
news/calendar/os_os.txt [deleted file]
news/calendar/sambaxp_06.txt [moved from news/calendar/sambaxp2005.txt with 66% similarity]
news/calendar/showDate.js
news/calendar/simo_sfscon.txt [deleted file]
news/calendar/vl_sernet.txt [deleted file]
news/style/news.css
news/team/cal_update_26Jan06.html [new file with mode: 0644]

diff --git a/news/calendar/LISA_04.txt b/news/calendar/LISA_04.txt
deleted file mode 100644 (file)
index f3426a0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-November 14–19, LISA 2004
-
-The 18th Large Installation System Administration Conference (LISA) from USENIX will be in Atlanta, GA and offer tutorials, tech sessions, and a Spam Mini Symposium.  Jerry Carter will be at the event leading tutorials on kerberos, LDAP, and managing Samba.
-
-Visit http://www.usenix.org/events/lisa04/ for more info.
\ No newline at end of file
diff --git a/news/calendar/LISA_05.txt b/news/calendar/LISA_05.txt
deleted file mode 100644 (file)
index 12fd686..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-December 4-9, LISA '05
-
-The 19th Large Installation System Addministration Conference 
-will be in San Diego, CA December 4-9.  The conference offers 
-a training program, tech sessions, workshops, BOFs, and more.
-
-Jerry Carter will be giving tutorials on Kerberos, LDAP, Ethereal,
-and Samba.  Deryck Hodge will be giving a tutorial on using
-Google to build web applications.  See the conference website
-http://www.usenix.org/events/lisa05/ for more info.
diff --git a/news/calendar/SANE2004.txt b/news/calendar/SANE2004.txt
deleted file mode 100644 (file)
index 845b612..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-September 27 - October 1, SANE 2004
-
-Held in Amsterdam, SANE (System Administration and Network Engineering) offers conference and tutorial tracks.  Team members Jerry Carter and Jelmer Vernooij will participating in the event.  
-
-See http://www.nluug.nl/events/sane2004/ for more info.
\ No newline at end of file
diff --git a/news/calendar/cifs05.txt b/news/calendar/cifs05.txt
deleted file mode 100644 (file)
index b5f9e2a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-August 1-5, CIFS Conference and Plugfest
-
-Several Samba Team members will be in attendance at 
-both the conference and plugfest.  The following Team
-members will also be giving talks or tutorials:
-
-Jeremy Allison
-Andrew Bartlett
-Gerald Carter
-Guenther Deschner
-Deryck Hodge
-Steve French
-Christopher Hertel
-John Terpstra
-Andrew Tridgell
-Jelmer Vernooij
-
-Visit http://www.cifs2005.org/ for more information.
diff --git a/news/calendar/cifs2004.txt b/news/calendar/cifs2004.txt
deleted file mode 100644 (file)
index 8e71eb3..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-August 9-13, CIFS Conference and Plugfest
-
-Several Samba Team members will be in attendence at 
-both the conference and plugfest.  Jeremy Allison, 
-Andrew Bartlet, Gerald Carter, Steve French, Christopher 
-Hertel, John Terpstra, and Andrew Tridgell will all
-be giving talks at the conference.  
-
-Visit http://www.snia.org/events/cifs/ for more information.
diff --git a/news/calendar/crh_northland.txt b/news/calendar/crh_northland.txt
deleted file mode 100644 (file)
index 5f8fc38..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-February 10, Minnesota
-
-Team member Chris Hertel will be presenting at the monthly meeting of the
-Northland Technology Consortium in Duluth, Minnesota, and at the
-TechNorth Prep Center in Hibbing, Minnesota.
-
-For more info, see: 
-http://www.northlandtechnology.org/events.do?method=list&addDetailsID=38&public=true
-
-
-
diff --git a/news/calendar/fosdem_jelmer.txt b/news/calendar/fosdem_jelmer.txt
deleted file mode 100644 (file)
index 9b42d59..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-February 26-27, Brussels, Belgium
-
-Team member Jelmer Vernooij will be giving a lightning talk
-on Samba4 at FOSDEM.  See http://www.fosdem.org/ for more info.
diff --git a/news/calendar/geekcruises_hertel.txt b/news/calendar/geekcruises_hertel.txt
deleted file mode 100644 (file)
index dcbf6c0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-October 10-17, Geek Cruises Linux Lunacy IV
-
-Geek Cruises will host Linux Lunacy, a cruise through the Eastern Mediterranean featuring seminars for Linux geeks.  Samba Team member Chris Hertel will be a speaker for the event.  
-
-Visit http://geekcruises.com/top/ll4_top.htm for more info.
\ No newline at end of file
diff --git a/news/calendar/ibm_berlin.txt b/news/calendar/ibm_berlin.txt
deleted file mode 100644 (file)
index 86601ee..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-December 2-3, Berlin, Germany
-
-IBM is hosting a Volker Lendecke led advanced Samba tutorial.
-For more info, see http://www-5.ibm.com/services/learning/de/ta-iris.nsf/(ExtCourseNr)/SAMBA3DE
index 8ead02594e37d15e777e1a8871c7ba3d4c7ef551..48b8e343c44ae21218f0bc6aa8b16cdf1c5bee1d 100755 (executable)
 
         <div class="dates_l"> 
     
-             <table class="months">
+            <table class="months">
                    <tr>
-                       <th colspan="7">July 2005</th>
+                       <th colspan="7">January 2006</th>
                    </tr>
                    <tr>
                    <td></td>
                            <td></td>
-                   <td></td>
-                   <td></td>
-                   <td></td>
                    <td>1</td>
-                   <td>2</td>
-                   </tr>
-                <tr>
+                   <td>2</td>
                    <td>3</td>
-                   <td>4</td>
-                   <td>5</td>
-                   <td>6</td>
-                   <td>7</td>
-                   <td>8</td>
-                   <td>9</td>
-               </tr>
-                   <tr>
-                   <td>10</td>
-                   <td><a href="jht_training_general.txt" onclick="showDate(28); return false">11</a></td>
-                   <td><a href="jht_training_general.txt" onclick="showDate(28); return false">12</a></td>
-                   <td><a href="jht_training_general.txt" onclick="showDate(28); return false">13</a></td>
-                   <td><a href="jht_training_general.txt" onclick="showDate(28); return false">14</a></td>
-                   <td>15</td>
-                   <td>16</td>
-               </tr>
-                   <tr>
-                   <td>17</td>
-                   <td>18</td>
-                   <td>19</td>
-                   <td>20</td>
-                   <td>21</td>
-                   <td>22</td>
-                   <td>23</td>
-               </tr>
-                   <tr>
-                   <td>24</td>
-                   <td>25</td>
-                   <td>26</td>
-                   <td>27</td>        
-                   <td>28</td>
-                   <td>29</td>
-                   <td>30</td>
-                   </tr>
-                               <tr>
-                   <td>31</td>
-                   <td></td>
-                   <td></td>
-                   <td></td>        
-                   <td></td>
-                   <td></td>
-                   <td></td>
-                   </tr>
-               </table>
-
-             <table class="months">
-                   <tr>
-                       <th colspan="7">August 2005</th>
-                   </tr>
-                   <tr>
-                   <td></td>
-                   <td><a href="cifs05.txt" onclick="showDate(33); return false">1</a></td>
-                   <td><a href="cifs05.txt" onclick="showDate(33); return false">2</a></td>
-                   <td><a href="cifs05.txt" onclick="showDate(33); return false">3</a></td>
-                   <td><a href="cifs05.txt" onclick="showDate(33); return false">4</a></td>
-                   <td><a href="cifs05.txt" onclick="showDate(33); return false">5</a></td>
-                   <td>6</td>
+                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(0); return false">4</a></td>
+                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(0); return false">5</a></td>
                    </tr>
                 <tr>
-                   <td>7</td>
+                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(0); return false">6</a></td>
+                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(0); return false">7</a></td>
                    <td>8</td>
                    <td>9</td>
                    <td>10</td>
                    <td>11</td>
                    <td>12</td>
-                   <td>13</td>
                </tr>
                    <tr>
+                   <td>13</td>
                    <td>14</td>
                    <td>15</td>
                    <td>16</td>
                    <td>17</td>
                    <td>18</td>
                    <td>19</td>
-                   <td>20</td>
                </tr>
                    <tr>
+                   <td>20</td>
                    <td>21</td>
                    <td>22</td>
-                   <td>23</td>
-                   <td>24</td>
-                   <td>25</td>
-                   <td>26</td>
-                   <td>27</td>
+                   <td><a href="lca_06.txt" onclick="showDate(1); return false">23</a></td>
+                   <td><a href="lca_06.txt" onclick="showDate(1); return false">24</a></td>
+                   <td><a href="lca_06.txt" onclick="showDate(1); return false">25</a></td>
+                   <td><a href="lca_06.txt" onclick="showDate(1); return false">26</a></td>
                </tr>
                    <tr>
-                   <td>28</td>
+                   <td><a href="lca_06.txt" onclick="showDate(1); return false">27</a></td>
+                   <td><a href="lca_06.txt" onclick="showDate(1); return false">28</a></td>
                    <td>29</td>
-                   <td>30</td>
-                   <td>31</td>        
+                   <td>30</td>        
                    <td></td>
                    <td></td>
                    <td></td>
                    </tr>
-               </table>
+                 </table>
 
-             <table class="months">
+            <table class="months">
                    <tr>
-                       <th colspan="7">September 2005</th>
+                       <th colspan="7">February 2006</th>
                    </tr>
                    <tr>
                    <td></td>
-                           <td></td>
-                   <td></td>
+                         <td></td>
                    <td></td>
                    <td>1</td>
                    <td>2</td>
-                   <td>3</td>
+                   <td>3</td>
+                   <td>4</td>
                    </tr>
                 <tr>
-                   <td>4</td>
                    <td>5</td>
                    <td>6</td>
                    <td>7</td>
                    <td>8</td>
                    <td>9</td>
                    <td>10</td>
+                   <td>11</td>
                </tr>
                    <tr>
-                   <td>11</td>
                    <td>12</td>
                    <td>13</td>
                    <td>14</td>
                    <td>15</td>
                    <td>16</td>
                    <td>17</td>
-               </tr>
-                   <tr>
                    <td>18</td>
-                   <td><a href="jht_chicago_05.txt" onclick="showDate(34); return false">19</a></td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(35); return false">20</a></td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(35); return false">21</a></td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(35); return false">22</a></td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(35); return false">23</a></td>
-                   <td>24</td>
-               </tr>
-                   <tr>
-                   <td>25</td>
-                   <td>26</td>
-                   <td>27</td>
-                   <td>28</td>        
-                   <td>29</td>
-                   <td>30</td>
-                   <td></td>
-                   </tr>
-               </table>
-
-             <table class="months">
-                   <tr>
-                       <th colspan="7">October 2005</th>
-                   </tr>
-                   <tr>
-                   <td></td>
-                           <td></td>
-                   <td></td>
-                   <td></td>
-                   <td></td>
-                   <td></td>
-                   <td>1</td>
-                   </tr>
-                <tr>
-                   <td>2</td>
-                   <td>3</td>
-                   <td>4</td>
-                   <td>5</td>
-                   <td>6</td>
-                   <td>7</td>
-                   <td>8</td>
                </tr>
                    <tr>
-                   <td>9</td>
-                   <td>10</td>
-                   <td>11</td>
-                   <td>12</td>
-                   <td>13</td>
-                   <td>14</td>
-                   <td>15</td>
-               </tr>
-                   <tr>
-                   <td>16</td>
-                   <td>17</td>
-                   <td>18</td>
                    <td>19</td>
                    <td>20</td>
                    <td>21</td>
                    <td>22</td>
-               </tr>
-                   <tr>
                    <td>23</td>
                    <td>24</td>
                    <td>25</td>
-                   <td>26</td>        
+               </tr>
+                   <tr>
+                   <td>26</td>
                    <td>27</td>
                    <td>28</td>
-                   <td>29</td>
-                   </tr>
-                               <tr>
-                   <td>30</td>
-                   <td>31</td>
-                   <td></td>
                    <td></td>        
                    <td></td>
                    <td></td>
                    <td></td>
                    </tr>
                </table>
-
            </div>  <!-- Close dates_l section -->
 
       <div class="dates_r">
 
-             <table class="months">
+            <table class="months">
                    <tr>
-                       <th colspan="7">November 2005</th>
+                       <th colspan="7">March 2006</th>
                    </tr>
                    <tr>
                    <td></td>
-                           <td></td>
+                         <td></td>
+                   <td></td>
                    <td>1</td>
                    <td>2</td>
                    <td>3</td>
-                   <td>4</td>
-                   <td>5</td>
+                   <td>4</td>
                    </tr>
                 <tr>
+                   <td>5</td>
                    <td>6</td>
                    <td>7</td>
                    <td>8</td>
                    <td>9</td>
                    <td>10</td>
                    <td>11</td>
-                   <td><a href="simo_sfscon.txt" onclick="showDate(39); return false">12</a></td>
                </tr>
                    <tr>
+                   <td>12</td>
                    <td>13</td>
                    <td>14</td>
-                   <td><a href="linuxworld_frankfurt_05.txt" onclick="showDate(38); return false">15</a></td>
+                   <td>15</td>
                    <td>16</td>
                    <td>17</td>
                    <td>18</td>
-                   <td>19</td>
                </tr>
                    <tr>
+                   <td>19</td>
                    <td>20</td>
                    <td>21</td>
                    <td>22</td>
                    <td>23</td>
                    <td>24</td>
                    <td>25</td>
-                   <td>26</td>
                </tr>
                    <tr>
+                   <td>26</td>
                    <td>27</td>
                    <td>28</td>
-                   <td>29</td>
-                   <td>30</td>        
-                   <td></td>
-                   <td></td>
+                   <td>29</td>        
+                   <td>30</td>
+                   <td>31</td>
                    <td></td>
                    </tr>
                </table>
 
-             <table class="months">
+      <table class="months">
                    <tr>
-                       <th colspan="7">December 2005</th>
+                       <th colspan="7">April 2006</th>
                    </tr>
                    <tr>
                    <td></td>
                          <td></td>
                    <td></td>
                    <td></td>
-                   <td>1</td>
-                   <td>2</td>
-                   <td>3</td>
+                   <td></td>
+                   <td></td>
+                   <td>1</td>
                    </tr>
                 <tr>
-                   <td><a href="LISA_05.txt" onclick="showDate(37); return false">4</a></td>
-                   <td><a href="LISA_05.txt" onclick="showDate(37); return false">5</a></td>
-                   <td><a href="LISA_05.txt" onclick="showDate(37); return false">6</a></td>
-                   <td><a href="LISA_05.txt" onclick="showDate(37); return false">7</a></td>
-                   <td><a href="LISA_05.txt" onclick="showDate(37); return false">8</a></td>
-                   <td><a href="LISA_05.txt" onclick="showDate(37); return false">9</a></td>
-                   <td>10</td>
-               </tr>
-                   <tr>
-                   <td>11</td>
-                   <td>12</td>
-                   <td>13</td>
-                   <td>14</td>
-                   <td>15</td>
-                   <td>16</td>
-                   <td>17</td>
-               </tr>
-                   <tr>
-                   <td>18</td>
-                   <td>19</td>
-                   <td>20</td>
-                   <td>21</td>
-                   <td>22</td>
-                   <td>23</td>
-                   <td>24</td>
-               </tr>
-                   <tr>
-                   <td>25</td>
-                   <td>26</td>
-                   <td>27</td>
-                   <td>28</td>        
-                   <td>29</td>
-                   <td>30</td>
-                   <td>31</td>
-                   </tr>
-               </table>
-
-             <table class="months">
-                   <tr>
-                       <th colspan="7">January 2006</th>
-                   </tr>
-                   <tr>
-                   <td></td>
-                           <td></td>
-                   <td>1</td>
                    <td>2</td>
-                   <td>3</td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(36); return false">4</a></td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(36); return false">5</a></td>
-                   </tr>
-                <tr>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(36); return false">6</a></td>
-                   <td><a href="jht_network_powerhouse.txt" onclick="showDate(36); return false">7</a></td>
+                   <td><a href="lw_boston_06.txt" onclick="showDate(2); return false">3</a></td>
+                   <td><a href="lw_boston_06.txt" onclick="showDate(2); return false">4</a></td>
+                   <td><a href="lw_boston_06.txt" onclick="showDate(2); return false">5</a></td>
+                   <td><a href="lw_boston_06.txt" onclick="showDate(2); return false">6</a></td>
+                   <td>7</td>
                    <td>8</td>
+               </tr>
+                   <tr>
                    <td>9</td>
                    <td>10</td>
                    <td>11</td>
                    <td>12</td>
-               </tr>
-                   <tr>
                    <td>13</td>
                    <td>14</td>
                    <td>15</td>
+               </tr>
+                   <tr>
                    <td>16</td>
                    <td>17</td>
                    <td>18</td>
                    <td>19</td>
-               </tr>
-                   <tr>
                    <td>20</td>
                    <td>21</td>
                    <td>22</td>
-                   <td>23</td>
-                   <td>24</td>
-                   <td>25</td>
-                   <td>26</td>
                </tr>
                    <tr>
+                   <td>23</td>
+                   <td><a href="sambaxp_06.txt" onclick="showDate(3); return false">24</a></td>
+                   <td><a href="sambaxp_06.txt" onclick="showDate(3); return false">25</a></td>
+                   <td><a href="sambaxp_06.txt" onclick="showDate(3); return false">26</a></td>        
                    <td>27</td>
                    <td>28</td>
                    <td>29</td>
-                   <td>30</td>        
+                   </tr>
+                   <tr>
+                   <td>30</td>
+                   <td></td>
+                   <td></td>
+                   <td></td>        
                    <td></td>
                    <td></td>
                    <td></td>
                    </tr>
                </table>
+
            </div>  <!-- Close dates_r section -->
 
            <div id="events">Click on the links to the left to display calendar 
diff --git a/news/calendar/interLUG_ital.txt b/news/calendar/interLUG_ital.txt
deleted file mode 100644 (file)
index 38b8ad3..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-October 9, Convegno Software Libero
-
-Samba Team member Simo Sorce will be speaking at this free software/open source 
-event sponsored by FerraraLUG, ErLUG, ParmaLUG, RELug and Perl Mongers Italia.  
-Go to http://www.ferrara.linux.it/notizie/2004ottobre09 for more info.
-
-
-
-October 9, Sheffield, England
-
-Jeremy Allison will be giving a talk on the future of Samba at Sheffield Linux 
-Users Group.  See the http://www.sheflug.co.uk/ for more details.
\ No newline at end of file
diff --git a/news/calendar/jht_bham_uk.txt b/news/calendar/jht_bham_uk.txt
deleted file mode 100644 (file)
index 12d4e9f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-December 6-9, Birmingham, UK
-
-Samba Team member John Terpstra will be providing 
-Samba training in the UK.  The course is provided by
-Sirius and OpenAdvantage.
-
-For more info, please see:
-http://www.siriusit.co.uk/customer/samba_training.html
-http://www.openadvantage.org/index.php?option=content&task=view&id=56&Itemid=36
-
-
diff --git a/news/calendar/jht_chicago.txt b/news/calendar/jht_chicago.txt
deleted file mode 100644 (file)
index 3d852a4..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-January 24-27, Chicago, IL.
-
-John H. Terpstra is conducting a 4-day Samba tutorial.  
-Interested parties should contact Alex Monteiro at 
-650-279-1909 or visit www.interstatesoftware.com.
diff --git a/news/calendar/jht_chicago_05.txt b/news/calendar/jht_chicago_05.txt
deleted file mode 100644 (file)
index 9926561..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-September 19th - Chicago, IL.  
-
-John H. Terpstra leads two free 3-hour seminars.  
-The morning seminar, geared for today's IT consumer, 
-is titled "Taking control of your business".  The 
-afternoon seminar, geared for today's IT service 
-provider, is titled "Making service profitable again".  
-Location is TBD.  Contact Alex Monteiro at 
-alexm@primastasys.com for reservations and details.
diff --git a/news/calendar/jht_kansas.txt b/news/calendar/jht_kansas.txt
deleted file mode 100644 (file)
index 1481b9a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-October 18-21, Overland Park, Kansas.
-
-John H. Terpstra is conducting a 4-day Samba Workshop.  1-day sessions include:  
-Samba 101, Advanced Samba, Samba Migration, and Advanced LDAP.  Interested in 
-attending?  Please contact Alex Monteiro in the US at 650-279-1909 or at 
-alexm@primastasys.com
\ No newline at end of file
index a21b3b599bbf8684148314389e7eed7c75b39715..56e25b146c0accdd9cab05c133891ad05f1195e4 100644 (file)
@@ -1,3 +1,4 @@
+January 4-7 - Honolulu, HI.
 
 Samba-3 By Example:  Building a Network Powerhouse.  
 John H. Terpstra instructs our spotlight training 
diff --git a/news/calendar/jht_sandiego.txt b/news/calendar/jht_sandiego.txt
deleted file mode 100644 (file)
index cd91ab0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-December 13-16, San Diego, CA.
-
-John H. Terpstra is conducting a 4-day Samba tutorial.
-Interested parties should contact Alex Monteiro at 
-650-279-1909 or visit www.interstatesoftware.com.
diff --git a/news/calendar/jht_training_general.txt b/news/calendar/jht_training_general.txt
deleted file mode 100644 (file)
index aeddc10..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-This workshop is a hands-on Samba-3 training course (4-days)
-instructed by John H. Terpstra.  For more 
-details, call in the U.S. 650-279-1909 or 
-Email alexm@primastasys.com 
diff --git a/news/calendar/jra_london_expo.txt b/news/calendar/jra_london_expo.txt
deleted file mode 100644 (file)
index ff6db14..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-October 6, London, Olympia
-
-Jeremy Allison will be giving a Samba Futures talk at London LinuxExpo, held 
-from 6-7 October.  For more information see http://www.linuxworldexpo.co.uk/.
\ No newline at end of file
diff --git a/news/calendar/kazakhstan.txt b/news/calendar/kazakhstan.txt
deleted file mode 100644 (file)
index cd7ff39..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-November 29-30, Almaty City, Kazakhstan
-
-Alexander Bokovoy will be presenting on "Writing standards-compliant 
-portable software: Samba case" at a seminar on Free Software and 
-localization efforts organized by the Information Programme of 
-Soros Foundation in Kazakhstan.
-
-For more info, see http://www.os.kz/.
-
-November 29-December 1, iX Conference, Munich
-
-Volker Lendecke will be giving a full-day Samba tutorial on November 29
-and a talk comparing file systems on December 1.  For more info, see
-http://www.ix-konferenz.de/
-
diff --git a/news/calendar/lca_06.txt b/news/calendar/lca_06.txt
new file mode 100644 (file)
index 0000000..bd5e0fa
--- /dev/null
@@ -0,0 +1,7 @@
+23-28 January, Dunedin, New Zealand
+
+Samba Team members, Andrew "Tridge" Tridgell and Tim Potter
+will both be speaking at Australia's national Linux conference.  
+Tridge will present on Samba4, and Tim is presenting on WBEM.
+
+For more info, see http://linux.conf.au/.
diff --git a/news/calendar/linuxday_italy.txt b/news/calendar/linuxday_italy.txt
deleted file mode 100644 (file)
index 402bcbe..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-November 27, LinuxDay Italy
-
-LinuxDay will have 96 seperate one day conferences in 
-various cities around Italy.  Samba Team member Simo Sorce 
-will be speaking on "Samba, present and future" at the Trento
-conference.
-
-For more info on LinuxDay see http://www.linux.it/LinuxDay/programma.phtml.
-For the Trento LinuxDay see http://www.linuxtrent.it/iniziative/linuxday/2004/FrontPage. 
diff --git a/news/calendar/linuxkongress.txt b/news/calendar/linuxkongress.txt
deleted file mode 100644 (file)
index 5d29b5f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-September 7-10, Linux Kongress in Erlangen, Germany
-
-Samba Team member Volker Lendecke will present a paper, "Advances in Samba4," at this conference.  See http://www.linux-kongress.org/2004/program.html for more details.
\ No newline at end of file
diff --git a/news/calendar/linuxworld_boston.txt b/news/calendar/linuxworld_boston.txt
deleted file mode 100644 (file)
index d1e7c20..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-February 14-17, LinuxWorld Boston
-
-Samba Team members Gerald "Jerry" Carter and Jeremy Allison
-will be on hand at this LinuxWorld event, offering a
-selection of talks and tutorials.  Jerry will be speaking/teaching
-on basic and advanced Samba administration, LDAP, and the state
-of Samba.  Jeremy will be leading a session on Linux integration
-with Active Directory.
-
-For more info, see http://www.linuxworldexpo.com/.   
-
diff --git a/news/calendar/linuxworld_frankfurt.txt b/news/calendar/linuxworld_frankfurt.txt
deleted file mode 100644 (file)
index 424fde4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-October 26-28, LinuxWorld Conference & Expo Frankfurt 2004
-
-Volker Lendecke will be giving a "Samba 3: Status Update" talk 
-at this LinuxWorld event, and Guenther Deschner will be giving 
-a short demonstration of the new file- and printer-migration-capabilities 
-of Samba3.  Both Volker and Guenther will represent Samba in the 
-".org Pavillion".  
-
-See the http://www.linuxworldexpo.de/04_03_ixb.php?ID=14 for specific details.
diff --git a/news/calendar/linuxworld_frankfurt_05.txt b/news/calendar/linuxworld_frankfurt_05.txt
deleted file mode 100644 (file)
index bbf1553..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-November 15, LinuxWorld Conference & Expo Frankfurt 2005
-
-Volker Lendecke will be giving a talk on the current status
-of Samba3 and Samba4 development at this LinuxWorld event.  
-The conference program is available at 
-http://www.linuxworldexpo.de/04_03_ix.php?ID=97.
diff --git a/news/calendar/lw_boston_06.txt b/news/calendar/lw_boston_06.txt
new file mode 100644 (file)
index 0000000..496cd5f
--- /dev/null
@@ -0,0 +1,11 @@
+April 3-6, LinuxWorld Boston, MA
+
+Samba Team members Jerry Carter, Jeremy Allison, and Deryck Hodge
+will be on hand at this LinuxWorld event, offering a
+selection of talks and tutorials.  Jerry will be speaking/teaching
+on Samba administration, LDAP, and the state of Samba.  Jeremy will 
+be leading a session on Linux integration with Active Directory, as well
+as hosting the Golden Penguin Bowl.  Deryck will be teaching on Google's
+use of AJAX and web services.
+
+For more info, see http://www.linuxworldexpo.com/.
diff --git a/news/calendar/mimir_krynica_lug.txt b/news/calendar/mimir_krynica_lug.txt
deleted file mode 100644 (file)
index 00faea9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-7-10 April 2005, Krynica, Poland
-Rafal Szczesniak will be presenting a talk on
-the evolution of the passdb backend in Samba at 
-a Linux Users Group meeting.
-
-
-
diff --git a/news/calendar/ohio_lug.txt b/news/calendar/ohio_lug.txt
deleted file mode 100644 (file)
index 3f9b20d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-October 2, Ohio LinuxFest
-
-Samba Team member Deryck Hodge will be speaking on "Open Source Diversity," a 
-how and why for people with non-technical backgrounds who want to learn from and 
-contribute to open source projects. For more info see http://www.ohiolinux.org/.
\ No newline at end of file
diff --git a/news/calendar/os_os.txt b/news/calendar/os_os.txt
deleted file mode 100644 (file)
index b019c05..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-September 12-14, Open Source--Open Standards
-
-This conference, held in Scottsdale, Arizona, is "designed to explore the promises and challenges of open source."  John Terpstra will be speaking, and Jerry Carter will be a panelist.  
-
-See http://www.consortiuminfo.org/bulletins/aug04.php#meeting for more info.
\ No newline at end of file
similarity index 66%
rename from news/calendar/sambaxp2005.txt
rename to news/calendar/sambaxp_06.txt
index be573fff7e95e1dc7f698c92079a7b84bfb9e2ab..e67d751750e3ff25be39836191f15a16de54b83f 100644 (file)
@@ -1,6 +1,6 @@
-May 2-4, Gottingen, Germany
+April 24-26, Goettingen, Germany
 
-Samba eXPerience 2005 is an international conference focused 
+Samba eXPerience 2006 is an international conference focused 
 exclusively on Samba.  The conference features presentations 
 and a Samba tutorial.  The Samba Team will be on hand as well.
 
index 7b1a59b8b143c27300d301b67e8eb26986b54c60..d8c72ab2aed7380936cf954e6cb5aba18f4ce808 100644 (file)
@@ -1,35 +1,8 @@
 allEvents = new Array
-
-allEvents[7] = '<p>November 14-19, LISA 2004</p><p>The 18th Large Installation System Administration Conference (LISA) from <a href="http://www.usenix.org/">USENIX</a> will be in Atlanta, GA and offer tutorials, tech sessions, and a Spam Mini Symposium.  Jerry Carter will be leading tutorials on kerberos, LDAP, and managing Samba at this event.</p><p>Visit the <a href="http://www.usenix.org/events/lisa04/">LISA website</a> for more info.</p>'
-allEvents[12] = '<p>December 13-16, San Diego, CA.</p><p>John H. Terpstra is conducting a 4-day Samba tutorial.  Interested parties should contact Alex Monteiro at 650-279-1909 or visit <a href="http://www.interstatesoftware.com/">www.interstatesoftware.com</a>.</p>'
-allEvents[13] = '<p>January 24-27, Chicago, IL.</p><p>John H. Terpstra is conducting a 4-day Samba tutorial.  Interested parties should contact Alex Monteiro at 650-279-1909 or visit <a href="http://www.interstatesoftware.com/">www.interstatesoftware.com</a>.</p>'
-allEvents[14] = '<p>February 14-17, LinuxWorld Boston</p><p>Samba Team members Gerald "Jerry" Carter and Jeremy Allison will be on hand at this LinuxWorld event, offering a selection of talks and tutorials.  Jerry will be speaking/teaching on basic and advanced Samba administration, LDAP, and the state of Samba.  Jeremy will be leading a session on Linux integration with Active Directory.</p><p>For more info, see <a href="http://www.linuxworldexpo.com/">www.linuxworldexpo.com</a>.</p>' 
-allEvents[15] = '<p>November 29-30, Almaty City, Kazakhstan</p><p>Alexander Bokovoy will be presenting on "Writing standards-compliant portable software: Samba case" at a seminar on Free Software and localization efforts organized by the Information Programme of Soros Foundation in Kazakhstan.</p><p>For more info, see <a href="http://www.os.kz/">www.os.kz</a>.</p><br /><br /><p>November 29-December 1, iX Conference, Munich</p><p>Volker Lendecke will be giving a full-day Samba tutorial on November 29 and a talk comparing file systems on December 1.  For more info, see the <a href="http://www.ix-konferenz.de/">iX Conference website</a>.</p>'
-allEvents[16] = '<p>December 2-3, Berlin, Germany</p><p>IBM is hosting a Volker Lendecke led advanced Samba tutorial.  For more info, see this <a href="http://www-5.ibm.com/services/learning/de/ta-iris.nsf/(ExtCourseNr)/SAMBA3DE">overview of the tutorial</a>.</p>'
-allEvents[17] = '<p>December 6-8, Goettingen, Germany</p><p>SerNet is offering a 3 day Samba Course led by Samba Team member Volker Lendecke.  For more info, please see the <a href="http://www.sernet.de/Training/Samba.shtml">SerNet Samba training page</a>.</p><br /><br /><p>December 6-9, Birmingham, UK</p><p>Samba Team member John Terpstra will be providing Samba training in the UK.  The course is provided by Sirius and OpenAdvantage.</p><p>For more info, please see: <a href="http://www.siriusit.co.uk/customer/samba_training.html">the Sirius site</a> or <a href="http://www.openadvantage.org/index.php?option=content&task=view&id=56&Itemid=36">the OpenAdvantage site</a>.</p>'
-allEvents[18] = '<p>November 29-December 1, iX Conference, Munich</p><p>Volker Lendecke will be giving a full-day Samba tutorial on November 29 and a talk comparing file systems on December 1.  For more info, see the <a href="http://www.ix-konferenz.de/">iX Conference website</a>.</p>'
-allEvents[19] = '<p>November 27, LinuxDay Italy</p><p>LinuxDay will have 96 seperate one day conferences in various cities around Italy.  Samba Team member Simo Sorce will be speaking on "Samba, present and future" at the Trento conference.</p><p>For more info on LinuxDay see <a href="http://www.linux.it/LinuxDay/programma.phtml">the LinuxDay site</a>.  For the Trento LinuxDay see <a href="http://www.linuxtrent.it/iniziative/linuxday/2004/FrontPage">this site</a>.</p>'
-allEvents[20] = '<p>December 6-9, Birmingham, UK</p><p>Samba Team member John Terpstra will be providing Samba training in the UK.  The course is provided by Sirius and OpenAdvantage.</p><p>For more info, please see: <a href="http://www.siriusit.co.uk/customer/samba_training.html">the Sirius site</a> or <a href="http://www.openadvantage.org/index.php?option=content&task=view&id=56&Itemid=36">the OpenAdvantage site</a>.</p>'
-allEvents[21] ='<p>May 2-4, G&ouml;ttingen, Germany</p><p>Samba eXPerience 2005 is an international conference focused exclusively on Samba.  The conference features presentations and a Samba tutorial.  The Samba Team will be on hand as well.</p><p>For more info, please see <a href="http://www.sambaxp.org/">http://www.sambaxp.org/</a>.</p>'  
-allEvents[22] = '<p>February 10, Minnesota</p><p>Team member Chris Hertel will be presenting at the monthly meeting of the Northland Technology Consortium in Duluth, Minnesota, and at the TechNorth Prep Center in Hibbing, Minnesota.</p><p>For more info, see this NTC <a href="http://www.northlandtechnology.org/events.do?method=list&addDetailsID=38&public=true">info page</a>.</p>'
-allEvents[23] = '<p>February 26-27, Brussels, Belgium</p><p>Team member Jelmer Vernooij will be giving a lightening talk on Samba4 at FOSDEM.  See <a href="http://www.fosdem.org/">http://www.fosdem.org/</a> for more info.</p>'
-allEvents[24] = '<p>March 15-18, Washington D.C. (Frederick, MD)</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>' 
-allEvents[25] = '<p>April 11-14  Irvine, CA.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[26] = '<p>May 16-19  Kansas City, MO.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[27] = '<p>June 14-17  Boston, MA.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[28] = '<p>July 11-14  Chicago, IL.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[29] = '<p>August 15-18  San Jose, CA.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[30] = '<p>September 6-9  Atlanta, GA.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[31] = '<p>November 14-17  Miami, FL.</p><p>This workshop is a hands-on Samba-3 training course (4-days) instructed by John H. Terpstra.</p><p>For more details, call in the U.S. 650-279-1909 or email <a href="mailto:alexm@primastasys.com">alexm@primastasys.com</a>.</p>'
-allEvents[32] = '<p>April 7-10, Krynica, Poland</p><p>Rafal Szczesniak will be presenting a talk on the evolution of the passdb backend in Samba at a Linux Users Group meeting.</p>'
-allEvents[33] = '<p>August 1-5, CIFS Conference and Plugfest</p><p>Several Samba Team members will be in attendance at both the conference and plugfest.  The following Team members will also be giving talks or tutorials:</p><ul><li>Jeremy Allison</li><li>Andrew Bartlett<li>Gerald Carter</li><li>Guenther Deschner</li><li>Deryck Hodge</li><li>Steve French</li><li>Christopher Hertel</li><li>John Terpstra</li><li>Andrew Tridgell</li><li>Jelmer Vernooij</li></ul><p>Visit <a href="http://www.cifs2005.org/">http://www.cifs2005.org/</a> for more information.</p>'
-allEvents[34] = '<p>September 19th - Chicago, IL.</p><p>John H. Terpstra leads two free 3-hour seminars. The morning seminar, geared for today\'s IT consumer, is titled "Taking control of your business".  The afternoon seminar, geared for today\'s IT service provider, is titled "Making service profitable again".  Location is TBD.  Contact Alex Monteiro at alexm@primastasys.com for reservations and details.</p>'
-allEvents[35] = '<p>September 20-23 - Chicago, IL.</p><p>Samba-3 By Example:  Building a Network Powerhouse.</p><p>John H. Terpstra instructs our spotlight training workshop where delegates build a powerhouse network from the ground-up and uncover the secrets of properly maintaining it.</p>'
-allEvents[36] = '<p>January 4-7 - Honolulu, HI.</p><p>Samba-3 By Example:  Building a Network Powerhouse.</p><p>John H. Terpstra instructs our spotlight training workshop where delegates build a powerhouse network from the ground-up and uncover the secrets of properly maintaining it.</p>'
-allEvents[37] = '<p>December 4-9, LISA \'05</p><p>The 19th Large Installation System Addministration Conference will be in San Diego, CA December 4-9.  The conference offers a training program, tech sessions, workshops, BOFs, and more.</p><p>Jerry Carter will be giving tutorials on Kerberos, LDAP, Ethereal, and Samba.  Deryck Hodge will be giving a tutorial on using Google to build web applications.  See the <a href="http://www.usenix.org/events/lisa05/">conference website</a> for more info.</p>'
-allEvents[38] = '<p>November 15, LinuxWorld Conference & Expo Frankfurt 2005</p><p>Volker Lendecke will be giving a talk on the current status of Samba3 and Samba4 development at this LinuxWorld event.  The conference program is available at <a href="http://www.linuxworldexpo.de/04_03_ix.php?ID=97">http://www.linuxworldexpo.de/04_03_ix.php?ID=97</a>.</p>'
-allEvents[39] = '<p>November 12, Southtyrol Free Software Conference</p><p>Samba Team member Simo Sorce will be giving a talk on Samba 4 development and the future of Samba 3/4 at this Free Software Conference in Bressanone (or Brixen), Italy.</p>'
-
+allEvents[0] = '<p>January 4-7 - Honolulu, HI.</p><p>Samba-3 By Example:  Building a Network Powerhouse.</p><p>John H. Terpstra instructs our spotlight training workshop where delegates build a powerhouse network from the ground-up and uncover the secrets of properly maintaining it.</p>';
+allEvents[1] = '<p>23-28 January, Dunedin, New Zealand</p><p>Samba Team members, Andrew "Tridge" Tridgell and Tim Potter will both be speaking at Australia\'s national Linux conference.  Tridge will present on Samba4, and Tim is presenting on WBEM.</p><p>For more info, see <a href="http://linux.conf.au/">http://linux.conf.au/</a>.</p>';
+allEvents[2] = '<p>April 3-6, LinuxWorld Boston, MA</p><p>Samba Team members Jerry Carter, Jeremy Allison, and Deryck Hodge will be on hand at this LinuxWorld event, offering a selection of talks and tutorials.  Jerry will be speaking/teaching on Samba administration, LDAP, and the state of Samba.  Jeremy will be leading a session on Linux integration with Active Directory, as well as hosting the Golden Penguin Bowl.  Deryck will be teaching on Google\'s use of AJAX and web services.</p><p>For more info, see <a href="http://www.linuxworldexpo.com/">http://www.linuxworldexpo.com/</a>.</p>';
+allEvents[3] = '<p>April 24-26, Goettingen, Germany</p><p>Samba eXPerience 2006 is an international conference focused exclusively on Samba.  The conference features presentations and a Samba tutorial.  The Samba Team will be on hand as well.</p><p>For more info, please see <a href="http://www.sambaxp.org/">http://www.sambaxp.org/</a>.</p>';
 
 function showDate(thisDate) {
         document.getElementById('events').innerHTML = allEvents[thisDate]
diff --git a/news/calendar/simo_sfscon.txt b/news/calendar/simo_sfscon.txt
deleted file mode 100644 (file)
index 03f6e97..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-November 12, Southtyrol Free Software Conference
-
-Samba Team member Simo Sorce will be giving a
-talk on Samba 4 development and the future of
-Samba 3/4 at this Free Software Conference in
-Bressanone (or Brixen), Italy.
diff --git a/news/calendar/vl_sernet.txt b/news/calendar/vl_sernet.txt
deleted file mode 100644 (file)
index fba66a8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-December 6-8, Goettingen, Germany
-
-SerNet is offering a 3 day Samba Course led by
-Samba Team member Volker Lendecke.  For more info,
-please see http://www.sernet.de/Training/Samba.shtml.
index 9808fe6093524f6d6abe07a7002728b714919cc6..5e9a0bd8b59f22078d6d8d315008b753a15b3b9f 100644 (file)
@@ -152,7 +152,7 @@ span.js {
        border-left:1px solid #999;
        width:220px;
        height:500px;
-       margin:45px 20px 0 30px; 
+       margin:10px 20px 0 30px; 
     padding-left:30px;
        padding-top:75px;
 }
diff --git a/news/team/cal_update_26Jan06.html b/news/team/cal_update_26Jan06.html
new file mode 100644 (file)
index 0000000..3cb2e65
--- /dev/null
@@ -0,0 +1,17 @@
+    <h3><a name="cal_update_26Jan06">Samba Team Calendar Updated</a></h3> 
+        
+    <div class="article">
+      <p>The Samba Team calendar has been updated with information on several
+    new conferences and tutorials.  See the 
+    <a href="/samba/news/calendar">Samba Team Calendar</a> for complete 
+    details.</p>
+
+    <p>This calendar is not an endorsement of any individual speaker or event.  
+    Its purpose is merely to make the Samba community aware of a wide variety 
+    of events, as well as to make available a partial record of Samba Team 
+    activity.</p>
+
+    <p>New dates will be added to the calendar as they become available.</p>
+    </div>
+        
+