34 files changed, 36 insertions, 106 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 6d0aa9f..463cb40 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1,6 @@
-tde_auto_add_subdirectories( )
+add_subdirectory( de )
+add_subdirectory( en )
+add_subdirectory( fr )
+add_subdirectory( sv )
+add_subdirectory( man )
+add_subdirectory( tdeioslave )
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 1c42fbf..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# the SUBDIRS is filled automatically by am_edit. If files are 
-# in this directory they are installed into the english dir
-
-KDE_LANG = "en de fr sv"
-KDE_DOCS = kvpnc
-SUBDIRS = $(AUTODIRS)
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
deleted file mode 100644
index 06e3cfc..0000000
--- a/doc/de/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KDE_DOCS = kvpnc
-KDE_LANG = de
-kde_docs_KDEDOCS = dock_connected.png dock_disconnected.png import_cisco_pcf.png \
-	import_pkcs12_certifcate.png mainwindow.png new_profile.png \
-	settings_global.png settings_profiles.png settings_programs.png
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
deleted file mode 100644
index c633044..0000000
--- a/doc/en/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KDE_DOCS = kvpnc
-KDE_LANG = en
-kde_docs_KDEDOCS = dock_connected.png dock_disconnected.png import_cisco_pcf.png \
-	import_pkcs12_certifcate.png mainwindow.png new_profile.png \
-	settings_global.png settings_profiles.png settings_programs.png
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 4ac4989..0f58ae6 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -91,7 +91,7 @@ Do NOT change these in the translation. -->
 
 <abstract>
 <para>
-&kvpnc; is a KDE frontend for various vpn clients.
+&kvpnc; is a TDE frontend for various vpn clients.
 </para>
 </abstract>
 
@@ -131,7 +131,7 @@ application that explains what it does and where to report
 problems. Basically a long version of the abstract.Don't include a
 revision history. (see installation appendix comment) -->
 <para>
-KVpnc is a <ulink url="http://www.kde.org/">KDE</ulink> frontend for various vpn clients. It supports Cisco VPN (<ulink url="http://www.unix-ag.uni-kl.de/~massar/vpnc/">vpnc</ulink>), IPSec (<ulink url="http://www.freeswan.org">FreeS/WAN</ulink> (OpenS/WAN), <ulink url="http://ipsec-tools.sourceforge.net/">racoon</ulink>), PPTP (<ulink url="http://sourceforge.net/projects/pptpclient/">pptpclient</ulink>), <ulink url="http://www.openvpn.net">OpenVPN</ulink>, L2TP (FreeS/WAN, <ulink url="http://www.openswan.org/">Openswan</ulink>, <ulink url="http://www.strongswan.org/" >strongSwan</ulink>, <ulink url="http://ipsec-tools.sourceforge.net/">ipsec-tools</ulink>), <ulink url="http://vtun.sourceforge.net/">Vtun</ulink> and <ulink url="http://www.openssh.net/">OpenSSH</ulink>.
+KVpnc is a <ulink url="http://www.trinitydesktop.org/">TDE</ulink> frontend for various vpn clients. It supports Cisco VPN (<ulink url="https://www.unix-ag.uni-kl.de/~massar/vpnc/">vpnc</ulink>), IPSec (<ulink url="https://www.freeswan.org">FreeS/WAN</ulink> (OpenS/WAN), <ulink url="http://ipsec-tools.sourceforge.net/">racoon</ulink>), PPTP (<ulink url="https://sourceforge.net/projects/pptpclient/">pptpclient</ulink>), <ulink url="https://www.openvpn.net">OpenVPN</ulink>, L2TP (FreeS/WAN, <ulink url="https://www.openswan.org/">Openswan</ulink>, <ulink url="https://www.strongswan.org/" >strongSwan</ulink>, <ulink url="http://ipsec-tools.sourceforge.net/">ipsec-tools</ulink>), <ulink url="http://vtun.sourceforge.net/">Vtun</ulink> and <ulink url="https://www.openssh.net/">OpenSSH</ulink>.
 
 
 </para>
@@ -142,17 +142,13 @@ KVpnc is a <ulink url="http://www.kde.org/">KDE</ulink> frontend for various vpn
 <itemizedlist>
 <listitem>
 <para>General</para>
-<para>The project page can be found at: <ulink url="https://www.gna.org/projects/kvpnc/">https://www.gna.org/projects/kvpnc</ulink>.</para>
+<para>The project page can be found at: <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc">https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc</ulink>.</para>
 </listitem>
 <listitem>
-<para>Contact the kvpnc team:</para>
+<para>Contact the kvpnc team (TDE):</para>
 <itemizedlist>
 <listitem>
-<para>Bug report - To report bugs or wishes use the bugtracker page at: <ulink url="https://gna.org/bugs/?group=kvpnc">https://gna.org/bugs/?group=kvpnc</ulink></para>
-</listitem>
-<listitem>
-<para>A list of planned features (TODO list) can be found here: <ulink url="http://cvs.gna.org/viewcvs/*checkout*/kvpnc/kvpnc/TODO?rev=HEAD&amp;content-type=text/plain">http://cvs.gna.org/viewcvs/*checkout*/kvpnc/kvpnc/TODO?rev=HEAD&amp;content-type=text/plain</ulink> (in English).
-</para>
+<para>Bug reports as well as wishes for (new) features can be reported at the adress above.</para>
 </listitem>
 </itemizedlist>
 <itemizedlist>
@@ -160,13 +156,13 @@ KVpnc is a <ulink url="http://www.kde.org/">KDE</ulink> frontend for various vpn
 <para>Mailing list</para>
 <itemizedlist>
 <listitem>
-<para>kvpnc-user - this list is for users of KVpnc who want to discuss about KVpnc.</para>
+<para>trinity-user - this list is for users of KVpnc who want to discuss about KVpnc: <ulink url="http://trinity-users.pearsoncomputing.net/">trinity-users@lists</ulink></para>
 </listitem>
 <listitem>
-<para>kvpnc-devel - this list is related to development of KVpnc.</para>
+<para>trinity-devel - this list is related to development of KVpnc: <ulink url="http://trinity-devel.pearsoncomputing.net/">trinity-devel@lists</ulink></para>
 </listitem>
 <listitem>
-<para>kvpnc-cvs - this list shows the commit to the CVS tree (readonly).</para>
+<para>trinity-commits - this list shows the commit to the git tree (readonly): <ulink url="http://trinity-commits.pearsoncomputing.net/">trinity-commits@lists</ulink></para>
 </listitem>
 </itemizedlist>
 </listitem>
@@ -260,7 +256,7 @@ PPTP is a old VPN protocol designed by Microsoft. Today its known to be insecure
 <!-- <sect1> -->
 <para>KVpnc provides a lot of features:</para>
 <itemizedlist>
-<listitem><para>Easy to use KDE gui</para></listitem>
+<listitem><para>Easy to use TDE gui</para></listitem>
 <listitem><para>Docking in kicker</para></listitem>
 <listitem><para>Can be used to generate configuration files for the supported vpn clients</para></listitem>
 <listitem>
@@ -503,15 +499,8 @@ This is also a great place to provide pointers to other FAQ's if your users
 must do some complicated configuration on other programs in order for your
 application work. -->
 
-&reporting.bugs;
-&updating.documentation;
-
 <qandaset id="faqlist">
 <qandaentry>
-<question><para>If compilation fails.</para></question>
-<answer><para>There may be many reaons for the compilation to fail : lack of development tools and/or files, unstable code version ... Please try to search the web for your error and if you don't find an answer, then contact the team.</para></answer>
-</qandaentry>
-<qandaentry>
 <question><para>What I have to do to get IPSec working?</para></question>
 <answer>
 <para>Please install and configure FreeS/WAN (Linux 2.4.x)/ipsec-tools (Linux 2.6.x) first.</para>
@@ -601,46 +590,13 @@ Packagers:
 <title>How to obtain &kvpnc;</title>
 <itemizedlist>
 <listitem><para>Download</para>
-<para>Get it from the filesection (<ulink url="http://download.gna.org/kvpnc/">http://download.gna.org/kvpnc/</ulink>).</para>
-<para>Packages for various distributions are available there. You dont need to compile it, if there is a package for your distribution.</para>
+<para>Get it from the release files section (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc/releases">https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc/releases</ulink>).</para>
+<para>Packages for various distributions are available there: <ulink url="http://www.trinitydesktop.org/releases.php">http://www.trinitydesktop.org/releases.php</ulink> You dont need to compile it, if there is a package for your distribution.</para>
 </listitem>
-<listitem><para>KDE3</para>
-<para>The latest development code can be obtain from subversion respository. Simply do:</para>
-<para><command>svn co svn://svn.gna.org/svn/kvpnc/trunk kvpnc</command></para>
-<para><command>cd kvpnc</command></para>
-<para><command>make -f admin/Makefile.common</command></para>
-<para><command>./configure</command></para>
-<para><command>make</command></para>
-<para><command>su</command></para>
-<para><command>make install</command></para>
-<para><command>exit</command></para>
+<listitem><para>TDE</para>
+<para>The latest development code can be obtain from the git respository. Simply do:</para>
+<para><command>git clone https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc.git</command></para>
 <para></para>
-<para>Note to Gentoo and non usual KDE prefix users :</para>
-<para>You have to export the TDEDIR variable in order to compile and install kvpnc properly, usually it is done by :</para>
-<para><command>TDEDIR=/usr/kde/3.x/</command></para>
-<para><command>./configure</command></para>
-
-
-<para>Then continue as previously explained</para>
-</listitem>
-<listitem><para>KDE4</para>
-<para>The latest development code can be obtain from KDE subversion respository. Simply do:</para>
-<para><command>svn co svn://anonsvn.kde.org/home/kde/trunk/playground/network/kvpnc kvpnc-kde4</command></para>
-<para><command>cd kvpnc-kde4</command></para>
-<para><command>cmake .</command></para>
-<para><command>make</command></para>
-<para><command>su</command></para>
-<para><command>make install</command></para>
-<para><command>exit</command></para>
-<para></para>
-<para>Note to Gentoo and non usual KDE prefix users :</para>
-<para>You have to export the TDEDIR variable in order to compile and install kvpnc properly, usually it is done by :</para>
-<para><command>TDEDIR=/usr/kde/3.x/</command></para>
-<para><command>./configure</command></para>
-
-
-
-<para>Then continue as previously explained</para>
 </listitem>
 </itemizedlist>
 </sect1>
@@ -656,31 +612,28 @@ capabilities, screen resolution, special expansion cards, etc.
 specific OS, (you wrote a graphical LILO configurator for example) put this
 information here.
 -->
-<para>In order to successfully use &kvpnc;, you need &kde; >= 3.1.</para>
+<para>In order to successfully build &kvpnc;, you will need the tdelibs and libgcrypt libraries.</para>
 <para>The following tools are optional but minimal one of them is required for normal use.</para>
 <itemizedlist>
-<listitem><para><ulink url="http://www.unix-ag.uni-kl.de/~massar/vpnc/">vpnc</ulink> >= 0.2-rm+zomb-pre9 (0.3.x strongly recommended) - Cisco VPN</para></listitem>
-<listitem><para><ulink url="http://www.freeswan.org">FreeS/WAN</ulink> (OpenS/WAN too) - IPSec VPN Linux 2.4/2.6</para></listitem>
-<listitem><para><ulink url="http://www.strongswan.org/">strongSwan</ulink> - http://www.strongswan.org/</para></listitem>
-<listitem><para><ulink url="http://www.openswan.org/">Openswan</ulink> - http://www.openswan.org/</para></listitem>
+<listitem><para><ulink url="https://www.unix-ag.uni-kl.de/~massar/vpnc/">vpnc</ulink> >= 0.2-rm+zomb-pre9 (0.3.x strongly recommended) - Cisco VPN</para></listitem>
+<listitem><para><ulink url="https://www.freeswan.org">FreeS/WAN</ulink> (OpenS/WAN too) - IPSec VPN Linux 2.4/2.6</para></listitem>
+<listitem><para><ulink url="https://www.strongswan.org/">strongSwan</ulink> - http://www.strongswan.org/</para></listitem>
+<listitem><para><ulink url="https://www.openswan.org/">Openswan</ulink> - http://www.openswan.org/</para></listitem>
 <listitem><para><ulink url="http://ipsec-tools.sourceforge.net/">racoon</ulink> - (ipsec-tools) > = 1.xIPSec VPN Linux 2.6</para></listitem>
-<listitem><para><ulink url="http://sourceforge.net/projects/pptpclient/">pptpclient</ulink> - PPTP VPN</para></listitem>
+<listitem><para><ulink url="https://sourceforge.net/projects/pptpclient/">pptpclient</ulink> - PPTP VPN</para></listitem>
 <listitem><para><ulink url="http://l2tpd.sourceforge.net/">l2tpd</ulink> - http://l2tpd.sourceforge.net</para></listitem>
-<listitem><para><ulink url="http://www.xelerance.com/software/xl2tpd/">xl2tpd</ulink> - http://www.xelerance.com/software/xl2tpd/</para></listitem>
-<listitem><para><ulink url="http://www.openl2tp.org/">openl2tp</ulink> - http://www.openl2tp.org/</para></listitem>
-<listitem><para><ulink url="http://www.openvpn.org/">OpenVPN</ulink>.- VPN based on SSL</para></listitem>
+<listitem><para><ulink url="https://www.xelerance.com/archives/155/">xl2tpd</ulink> - https://www.xelerance.com/software/xl2tpd/</para></listitem>
+<listitem><para><ulink url="https://sourceforge.net/projects/openl2tp/">openl2tp</ulink> - https://sourceforge.net/projects/openl2tp/</para></listitem>
+<listitem><para><ulink url="https://www.openvpn.org/">OpenVPN</ulink>.- VPN based on SSL</para></listitem>
 <listitem><para><ulink url="http://vtun.sourceforge.net/">Vtun</ulink> - http://vtun.sourceforge.net/</para></listitem>
-<listitem><para><ulink url="http://openssh.net/">OpenSSH</ulink> - http://openssh.net/</para></listitem>
+<listitem><para><ulink url="https://openssh.net/">OpenSSH</ulink> - https://openssh.net/</para></listitem>
 
 
 </itemizedlist>
-<para>
-&kvpnc; can be found at <ulink url="http://home.gna.org/kvpnc/">&kvpnc; home page</ulink>.
-</para>
 <!-- For a list of updates, you may refer to the application web site
 or the ChangeLog file, or ... -->
 <para>
-You can find a list of changes at <ulink url="http://home.gna.org/kvpnc/changelog.html">Changelog</ulink>.
+You can find a list of changes (not updated since 2010) at <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc/src/branch/master/ChangeLog">Changelog</ulink>.
 </para>
 </sect1>
 
@@ -689,12 +642,13 @@ You can find a list of changes at <ulink url="http://home.gna.org/kvpnc/changelo
 <para>To compile kvpnc simply do:</para>
 <para>tar xvfj kvpnc-&lt;version&gt;.tar.bz2</para>
 <para>cd kvpnc-&lt;version&gt;</para>
-<para>make -f admin/Makefile.common (optional)</para>
-<para>./configure [--prefix=...] (KDE3)</para>
-<para>cmake . (KDE4)</para>
+<para>mkdir -p build</para>
+<para>cd build</para>
+<para>cmake ..</para>
 <para>make</para>
 <para>su</para>
 <para>make install</para>
+<para>For basic cmake options, please readme the INSTALL file.</para>
 </sect1>
 
 <sect1 id="configuration">
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
deleted file mode 100644
index 550aaf4..0000000
--- a/doc/fr/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KDE_DOCS = kvpnc
-KDE_LANG = fr
-kde_docs_KDEDOCS = dock_connected.png dock_disconnected.png import_cisco_pcf.png \
-	import_pkcs12_certifcate.png mainwindow.png new_profile.png \
-	settings_global.png settings_profiles.png settings_programs.png
diff --git a/doc/README.DCOP b/doc/misc/README.DCOP
index e46c83d..e46c83d 100644
--- a/doc/README.DCOP
+++ b/doc/misc/README.DCOP
diff --git a/doc/README.FRITZBOX_VPN_IMPORT b/doc/misc/README.FRITZBOX_VPN_IMPORT
index 2b477f9..2b477f9 100644
--- a/doc/README.FRITZBOX_VPN_IMPORT
+++ b/doc/misc/README.FRITZBOX_VPN_IMPORT
diff --git a/doc/README.OPENVPN_INLINE_CERT b/doc/misc/README.OPENVPN_INLINE_CERT
index 7ddb3c5..7ddb3c5 100644
--- a/doc/README.OPENVPN_INLINE_CERT
+++ b/doc/misc/README.OPENVPN_INLINE_CERT
diff --git a/doc/README.SSH_VPN b/doc/misc/README.SSH_VPN
index 0fb9af0..0fb9af0 100644
--- a/doc/README.SSH_VPN
+++ b/doc/misc/README.SSH_VPN
diff --git a/doc/README.VIRTUALIP b/doc/misc/README.VIRTUALIP
index 101a590..101a590 100644
--- a/doc/README.VIRTUALIP
+++ b/doc/misc/README.VIRTUALIP
diff --git a/doc/README.handbook b/doc/misc/README.handbook
index 71395af..71395af 100644
--- a/doc/README.handbook
+++ b/doc/misc/README.handbook
diff --git a/doc/README.smartcard b/doc/misc/README.smartcard
index 310d98a..310d98a 100644
--- a/doc/README.smartcard
+++ b/doc/misc/README.smartcard
diff --git a/doc/debian_compile.txt b/doc/misc/debian_compile.txt
index b36d37d..b36d37d 100644
--- a/doc/debian_compile.txt
+++ b/doc/misc/debian_compile.txt
diff --git a/doc/debian_compile_debug.txt b/doc/misc/debian_compile_debug.txt
index bf97953..bf97953 100644
--- a/doc/debian_compile_debug.txt
+++ b/doc/misc/debian_compile_debug.txt
diff --git a/doc/der_import.txt b/doc/misc/der_import.txt
index 02c39c6..02c39c6 100644
--- a/doc/der_import.txt
+++ b/doc/misc/der_import.txt
diff --git a/doc/gentoo_compile.txt b/doc/misc/gentoo_compile.txt
index d787cf1..d787cf1 100644
--- a/doc/gentoo_compile.txt
+++ b/doc/misc/gentoo_compile.txt
diff --git a/doc/misc/loginfo b/doc/misc/loginfo
new file mode 100644
index 0000000..58806a3
--- /dev/null
+++ b/doc/misc/loginfo
@@ -0,0 +1 @@
+ALL /usr/bin/perl /home/crissi/ciabot_cvs_1.12.pl %p %{s} %n $USER project from_email dest_email ignore_regexp
diff --git a/doc/openvpn.txt b/doc/misc/openvpn.txt
index 17e6c5e..17e6c5e 100644
--- a/doc/openvpn.txt
+++ b/doc/misc/openvpn.txt
diff --git a/doc/pptp.txt b/doc/misc/pptp.txt
index 24bdc2f..24bdc2f 100644
--- a/doc/pptp.txt
+++ b/doc/misc/pptp.txt
diff --git a/doc/update_handbook.sh b/doc/misc/update_handbook.sh
index 24210e6..24210e6 100755
--- a/doc/update_handbook.sh
+++ b/doc/misc/update_handbook.sh
diff --git a/doc/vpnc-0.2-err-sort.txt b/doc/misc/vpnc-0.2-err-sort.txt
index 8123dde..8123dde 100644
--- a/doc/vpnc-0.2-err-sort.txt
+++ b/doc/misc/vpnc-0.2-err-sort.txt
diff --git a/doc/vpnc-0.2-err.txt b/doc/misc/vpnc-0.2-err.txt
index 2a48c31..2a48c31 100644
--- a/doc/vpnc-0.2-err.txt
+++ b/doc/misc/vpnc-0.2-err.txt
diff --git a/doc/vpnc-0.2-strings.txt b/doc/misc/vpnc-0.2-strings.txt
index cd91bb4..cd91bb4 100644
--- a/doc/vpnc-0.2-strings.txt
+++ b/doc/misc/vpnc-0.2-strings.txt
diff --git a/doc/vpnc-0.3.1-err-newlines.txt b/doc/misc/vpnc-0.3.1-err-newlines.txt
index 1454146..1454146 100644
--- a/doc/vpnc-0.3.1-err-newlines.txt
+++ b/doc/misc/vpnc-0.3.1-err-newlines.txt
diff --git a/doc/vpnc-0.3.1-err-sort.txt b/doc/misc/vpnc-0.3.1-err-sort.txt
index efa8cb9..efa8cb9 100644
--- a/doc/vpnc-0.3.1-err-sort.txt
+++ b/doc/misc/vpnc-0.3.1-err-sort.txt
diff --git a/doc/vpnc-0.3.1-err.txt b/doc/misc/vpnc-0.3.1-err.txt
index d2c5adb..d2c5adb 100644
--- a/doc/vpnc-0.3.1-err.txt
+++ b/doc/misc/vpnc-0.3.1-err.txt
diff --git a/doc/vpnc-0.3.1-strings.txt b/doc/misc/vpnc-0.3.1-strings.txt
index d86e142..d86e142 100644
--- a/doc/vpnc-0.3.1-strings.txt
+++ b/doc/misc/vpnc-0.3.1-strings.txt
diff --git a/doc/vpnc-err.txt b/doc/misc/vpnc-err.txt
index 86b84d4..86b84d4 100644
--- a/doc/vpnc-err.txt
+++ b/doc/misc/vpnc-err.txt
diff --git a/doc/vpnc_connect_script_dns_patch_fix.txt b/doc/misc/vpnc_connect_script_dns_patch_fix.txt
index 717e28f..717e28f 100644
--- a/doc/vpnc_connect_script_dns_patch_fix.txt
+++ b/doc/misc/vpnc_connect_script_dns_patch_fix.txt
diff --git a/doc/sv/Makefile.am b/doc/sv/Makefile.am
deleted file mode 100644
index 9fe7c20..0000000
--- a/doc/sv/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KDE_DOCS = kvpnc
-KDE_LANG = sv
-kde_docs_KDEDOCS = dock_connected.png dock_disconnected.png import_cisco_pcf.png \
-	import_pkcs12_certifcate.png mainwindow.png new_profile.png \
-	settings_global.png settings_profiles.png settings_programs.png
diff --git a/doc/tdeioslave/Makefile.am b/doc/tdeioslave/Makefile.am
deleted file mode 100644
index 81fee21..0000000
--- a/doc/tdeioslave/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = en
diff --git a/doc/tdeioslave/en/Makefile.am b/doc/tdeioslave/en/Makefile.am
deleted file mode 100644
index 6797d6c..0000000
--- a/doc/tdeioslave/en/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = pcf
diff --git a/doc/tdeioslave/en/pcf/Makefile.am b/doc/tdeioslave/en/pcf/Makefile.am
deleted file mode 100644
index 23bef40..0000000
--- a/doc/tdeioslave/en/pcf/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = tdeioslave/pcf