Index: pykota/trunk/debian/copyright
===================================================================
--- pykota/trunk/debian/copyright (revision 2622)
+++ pykota/trunk/debian/copyright (revision 2909)
@@ -3,8 +3,8 @@
 
 It was downloaded from:
-http://www.librelogiciel.com/software/PyKota/Presentation/action_Presentation
-(CVS snapshot)
+http://www.pykota.com/software/pykota/download
+(SVN snapshot)
 
-Upstream Authors: Jeroma Alet <alet@librelogiciel.com>
+Upstream Authors: Jerome Alet <alet@librelogiciel.com>
 
 Copyright:
@@ -56,6 +56,5 @@
   * For more informations, please read :
   
-        http://www.librelogiciel.com/software/PyKota/action_Download
-        http://www.librelogiciel.com/software/PyKota/Purchase
-        http://www.librelogiciel.com/software/PyKota/contracts
+        http://www.pykota.com/purchase
+        http://www.pykota.com/technical-support
         
Index: pykota/trunk/setup.py
===================================================================
--- pykota/trunk/setup.py (revision 2778)
+++ pykota/trunk/setup.py (revision 2909)
@@ -114,5 +114,5 @@
       author = "Jerome Alet",
       author_email = "alet@librelogiciel.com",
-      url = "http://www.librelogiciel.com/software/",
+      url = "http://www.pykota.com",
       packages = [ "pykota", "pykota.storages", "pykota.loggers", "pykota.accounters", "pykota.reporters" ],
       scripts = [ "bin/pknotify", "bin/pkusers", "bin/pkinvoice", "bin/pykoef", \
Index: pykota/trunk/docs/introduction.sgml
===================================================================
--- pykota/trunk/docs/introduction.sgml (revision 2836)
+++ pykota/trunk/docs/introduction.sgml (revision 2909)
@@ -51,5 +51,5 @@
       Beginning on October 10th 2005, this document won't be <application>PyKota</application>'s reference documentation anymore.
       <application>PyKota</application>'s reference documentation is now at :
-      <ulink url="http://www.librelogiciel.com/software/PyKota/WiKota">http://www.librelogiciel.com/software/PyKota/WiKota</ulink>
+      <ulink url="http://www.pykota.com/wiki">http://www.pykota.com/wiki</ulink>
     </para>
     
Index: pykota/trunk/docs/pykotme.sgml
===================================================================
--- pykota/trunk/docs/pykotme.sgml (revision 2551)
+++ pykota/trunk/docs/pykotme.sgml (revision 2909)
@@ -17,5 +17,5 @@
     from the command line, passing your print job's content in any format
     recognized by PyKota 
-    <footnote><para>PyKota now uses <ulink url="http://www.librelogiciel.com/software/pkpgcounter/action_Presentation">pkpgcounter</ulink>
+    <footnote><para>PyKota now uses <ulink url="http://www.pykota.com/software/pkpgcounter">pkpgcounter</ulink>
     which recognizes PostScript (both binary and DSC compliant),
     PCLXL (aka PCL6), PDF, PCL3/4/5, ESC/P2, TIFF, DVI, OpenOffice Writer, and OpenOffice Impress.
Index: pykota/trunk/docs/installation.sgml
===================================================================
--- pykota/trunk/docs/installation.sgml (revision 2878)
+++ pykota/trunk/docs/installation.sgml (revision 2909)
@@ -31,5 +31,5 @@
     Finally you have to download <application>PyKota</application>'s latest version
     or buy an official package, from 
-    <ulink url="http://www.librelogiciel.com/software/">http://www.librelogiciel.com/software/</ulink>.
+    <ulink url="http://www.pykota.com/software/pykota">http://www.pykota.com/software/pykota</ulink>.
     If you've just bought an official package, then as soon as you've receive it you
     have to decompress and visit its archive, to do so just type the following commands :
@@ -815,5 +815,5 @@
           <para>
             The <application>pkpgcounter</application> Generic Page Description Language parser. 
-            You can download it from <ulink url="http://www.librelogiciel.com/software/">http://www.librelogiciel.com/software/</ulink>.
+            You can download it from <ulink url="http://www.pykota.com.com/software/pkpgcounter">http://www.pykota.com.com/software/pkpgcounter</ulink>.
           </para>
         </listitem>  
@@ -824,4 +824,10 @@
             and <command>pykoticon</command>. You don't need this module otherwise.
             If needed, you can download it from <ulink url="http://www.pangalactic.org/PyPAM/">http://www.pangalactic.org/PyPAM/</ulink>.
+          </para>
+        </listitem>  
+        <listitem>
+          <para>
+            The <application>PkIPPLib</application> Python <acronym>IPP</acronym> library.
+            You can download it from <ulink url="http://www.pykota.com/software/pkipplib">http://www.pykota.com/software/pkipplib</ulink>.
           </para>
         </listitem>  
Index: pykota/trunk/README
===================================================================
--- pykota/trunk/README (revision 2891)
+++ pykota/trunk/README (revision 2909)
@@ -33,5 +33,5 @@
     Commercially Supported :    
     
-        - Support Contracts are available from http://www.librelogiciel.com/techsupport/
+        - Support Contracts are available from http://www.pykota.com/technical-support/
         
     Operating systems :
@@ -327,5 +327,5 @@
   PyKota's collaborative documentation is available from :
   
-    http://www.librelogiciel.com/software/PyKota/WiKota/
+    http://www.pykota.com/wiki/
     
   You may learn more about PyKota, if it fits your own organization,
@@ -357,5 +357,5 @@
   See :
   
-    http://www.librelogiciel.com/software/PyKota/WiKota/Dependencies
+    http://www.pykota.com/wiki/Dependencies
     
   for an up-to-date list, or see below (maybe not up-to-date) :
@@ -368,5 +368,5 @@
     - The pkpgcounter command line tool, version 1.56 or higher. This
       tool is now mandatory for PyKota to work. 
-      (http://www.librelogiciel.com/software/)
+      (http://www.pykota.com/software/pkpgcounter)
     - The pkipplib Python library (http://www.pykota.com/software/pkipplib)  
     - The JAXML Python module to be able to dump datas in the XML format.
Index: pykota/trunk/FAQ
===================================================================
--- pykota/trunk/FAQ (revision 2559)
+++ pykota/trunk/FAQ (revision 2909)
@@ -7,8 +7,12 @@
   You can access to the online and searchable FAQ at :
   
-        http://otrs.librelogiciel.com/otrs/faq.pl
+        http://otrs.librelogiciel.com/otrs/public.pl
+        
+  The most often asked question is this one :      
+  
+        http://otrs.librelogiciel.com/otrs/public.pl?ID=2
         
   You can access to the WiKi at :      
   
-        http://www.librelogiciel.com/software/PyKota/WiKota
+        http://www.pykota.com/wiki
   
Index: pykota/trunk/pykota/accounters/software.py
===================================================================
--- pykota/trunk/pykota/accounters/software.py (revision 2635)
+++ pykota/trunk/pykota/accounters/software.py (revision 2909)
@@ -52,5 +52,5 @@
                 from pkpgpdls import analyzer, pdlparser
             except ImportError :    
-                self.filter.printInfo("pkpgcounter is now distributed separately, please grab it from http://www.librelogiciel.com/software/pkpgcounter/action_Download", "error")
+                self.filter.printInfo("pkpgcounter is now distributed separately, please grab it from http://www.pykota.com/software/pkpgcounter", "error")
                 self.filter.printInfo("Precomputed job size will be forced to 0 pages.", "error")
             else :     
Index: pykota/trunk/pykota/config.py
===================================================================
--- pykota/trunk/pykota/config.py (revision 2895)
+++ pykota/trunk/pykota/config.py (revision 2909)
@@ -181,5 +181,5 @@
         """Returns the URL to use for the logo in the CGI scripts."""
         url = self.getGlobalOption("logourl", ignore=1) or \
-                   "http://www.librelogiciel.com/software/PyKota/pykota.png"
+                   "http://www.pykota.com/pykota.png"
         return url.strip()           
         
@@ -187,5 +187,5 @@
         """Returns the URL to go to when the user clicks on the logo in the CGI scripts."""
         url = self.getGlobalOption("logolink", ignore=1) or \
-                   "http://www.librelogiciel.com/software/"
+                   "http://www.pykota.com/"
         return url.strip()           
     
Index: pykota/trunk/cgi-bin/printquota.cgi
===================================================================
--- pykota/trunk/cgi-bin/printquota.cgi (revision 2880)
+++ pykota/trunk/cgi-bin/printquota.cgi (revision 2909)
@@ -81,5 +81,5 @@
     <p>
       <font size="-2">
-        <a href="http://www.librelogiciel.com/software/">%s</a>
+        <a href="http://www.pykota.com/">%s</a>
         &copy; %s %s 
         <br />
Index: pykota/trunk/cgi-bin/pykotme.cgi
===================================================================
--- pykota/trunk/cgi-bin/pykotme.cgi (revision 2622)
+++ pykota/trunk/cgi-bin/pykotme.cgi (revision 2909)
@@ -34,9 +34,5 @@
 from pykota.tool import PyKotaTool, PyKotaToolError
 from pykota.cgifuncs import getLanguagePreference, getCharsetPreference
-
-try :
-    from pkpgpdls import analyzer, pdlparser
-except ImportError : # TODO : Remove the try/except after release 1.24.
-    sys.stderr.write("ERROR: pkpgcounter is now distributed separately, please grab it from http://www.librelogiciel.com/software/pkpgcounter/action_Download\n")
+from pkpgpdls import analyzer, pdlparser
     
 
@@ -85,5 +81,5 @@
     <p>
       <font size="-2">
-        <a href="http://www.librelogiciel.com/software/">%s</a>
+        <a href="http://www.pykota.com/">%s</a>
         &copy; %s %s 
         <br />
Index: pykota/trunk/cgi-bin/dumpykota.cgi
===================================================================
--- pykota/trunk/cgi-bin/dumpykota.cgi (revision 2630)
+++ pykota/trunk/cgi-bin/dumpykota.cgi (revision 2909)
@@ -82,5 +82,5 @@
     <p>
       <font size="-2">
-        <a href="http://www.librelogiciel.com/software/">%s</a>
+        <a href="http://www.pykota.com/">%s</a>
         &copy; %s %s 
         <br />
Index: pykota/trunk/bin/pykotme
===================================================================
--- pykota/trunk/bin/pykotme (revision 2829)
+++ pykota/trunk/bin/pykotme (revision 2909)
@@ -31,8 +31,5 @@
 from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
 
-try :
-    from pkpgpdls import analyzer, pdlparser
-except ImportError : # TODO : Remove the try/except after release 1.24.
-    sys.stderr.write("ERROR: pkpgcounter is now distributed separately, please grab it from http://www.librelogiciel.com/software/pkpgcounter/action_Download\n")
+from pkpgpdls import analyzer, pdlparser
     
 
Index: pykota/trunk/bin/pkbanner
===================================================================
--- pykota/trunk/bin/pkbanner (revision 2631)
+++ pykota/trunk/bin/pkbanner (revision 2909)
@@ -76,5 +76,5 @@
   -u | --url u         Uses u as an url to be written at the bottom of 
                        the banner page. The default url is :
-                       http://www.librelogiciel.com/software/
+                       http://www.pykota.com/
   
 examples :                              
@@ -297,5 +297,5 @@
                      "pagesize" : "a4", \
                      "logo" : "/usr/share/pykota/logos/pykota.jpeg",
-                     "url" : "http://www.librelogiciel.com/software/",
+                     "url" : "http://www.pykota.com/",
                    }
         short_options = "vhs:l:p:u:"
Index: pykota/trunk/po/sv_SE/pykota.po
===================================================================
--- pykota/trunk/po/sv_SE/pykota.po (revision 2825)
+++ pykota/trunk/po/sv_SE/pykota.po (revision 2909)
@@ -307,5 +307,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/pt/pykota.po
===================================================================
--- pykota/trunk/po/pt/pykota.po (revision 2825)
+++ pykota/trunk/po/pt/pykota.po (revision 2909)
@@ -305,5 +305,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/tr/pykota.po
===================================================================
--- pykota/trunk/po/tr/pykota.po (revision 2825)
+++ pykota/trunk/po/tr/pykota.po (revision 2909)
@@ -311,5 +311,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/el_GR/pykota.po
===================================================================
--- pykota/trunk/po/el_GR/pykota.po (revision 2825)
+++ pykota/trunk/po/el_GR/pykota.po (revision 2909)
@@ -306,5 +306,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/de/pykota.po
===================================================================
--- pykota/trunk/po/de/pykota.po (revision 2825)
+++ pykota/trunk/po/de/pykota.po (revision 2909)
@@ -305,5 +305,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/zh_TW/pykota.po
===================================================================
--- pykota/trunk/po/zh_TW/pykota.po (revision 2825)
+++ pykota/trunk/po/zh_TW/pykota.po (revision 2909)
@@ -306,5 +306,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/nb_NO/pykota.po
===================================================================
--- pykota/trunk/po/nb_NO/pykota.po (revision 2825)
+++ pykota/trunk/po/nb_NO/pykota.po (revision 2909)
@@ -308,5 +308,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/pt_BR/pykota.po
===================================================================
--- pykota/trunk/po/pt_BR/pykota.po (revision 2825)
+++ pykota/trunk/po/pt_BR/pykota.po (revision 2909)
@@ -302,5 +302,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/fr/pykota.po
===================================================================
--- pykota/trunk/po/fr/pykota.po (revision 2832)
+++ pykota/trunk/po/fr/pykota.po (revision 2909)
@@ -474,5 +474,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
@@ -522,5 +522,5 @@
 "  -u | --url u         Utilise u comme une url qui sera imprim�en base de\n"
 "                       la page banni�. L'url par d�ut est :\n"
-"                               http://www.librelogiciel.com/software/\n"
+"                               http://www.pykota.com/\n"
 "  \n"
 "exemples :\n"
Index: pykota/trunk/po/es/pykota.po
===================================================================
--- pykota/trunk/po/es/pykota.po (revision 2825)
+++ pykota/trunk/po/es/pykota.po (revision 2909)
@@ -309,5 +309,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
@@ -4332,5 +4332,5 @@
 #~ "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 #~ "                       the banner page. The default url is :\n"
-#~ "                       http://www.librelogiciel.com/software/\n"
+#~ "                       http://www.pykota.com/\n"
 #~ "  \n"
 #~ "examples :                              \n"
Index: pykota/trunk/po/pykota.pot
===================================================================
--- pykota/trunk/po/pykota.pot (revision 2825)
+++ pykota/trunk/po/pykota.pot (revision 2909)
@@ -303,5 +303,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/th/pykota.po
===================================================================
--- pykota/trunk/po/th/pykota.po (revision 2825)
+++ pykota/trunk/po/th/pykota.po (revision 2909)
@@ -304,5 +304,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
Index: pykota/trunk/po/pl/pykota.po
===================================================================
--- pykota/trunk/po/pl/pykota.po (revision 2825)
+++ pykota/trunk/po/pl/pykota.po (revision 2909)
@@ -333,5 +333,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
@@ -385,5 +385,5 @@
 "na  \n"
 "                       dole strony bannera. Domy�lnym odno�nikiem jest :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "przyk�ady :                              \n"
Index: pykota/trunk/po/it/pykota.po
===================================================================
--- pykota/trunk/po/it/pykota.po (revision 2825)
+++ pykota/trunk/po/it/pykota.po (revision 2909)
@@ -306,5 +306,5 @@
 "  -u | --url u         Uses u as an url to be written at the bottom of \n"
 "                       the banner page. The default url is :\n"
-"                       http://www.librelogiciel.com/software/\n"
+"                       http://www.pykota.com/\n"
 "  \n"
 "examples :                              \n"
