From f40339d46cf418cee9d9adf0826de293b8d07f62 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 23 Mar 2014 00:14:58 +0900
Subject: [PATCH] Remove references to printing.kde.org. This relates to bug
 1846.

---
 doc/glossary/tdeprintingglossary.docbook | 5 +----
 kcontrol/tdeio/kmanualproxydlg.cpp       | 3 +--
 tdeprint/kjobviewer/main.cpp             | 2 +-
 tdeprint/tdeprintfax/main.cpp            | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook
index ae688bc3b..e51f53cda 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@@ -745,10 +745,7 @@ now.
                         <glossterm><acronym>TDEPrint Handbook...</acronym></glossterm>
                         <glossdef><para>...is the name of the reference document that describes TDEPrint
 				functions to users and administrators. You can load it into Konqueror by
-				typing "help:/tdeprint" into the address field. The <ulink
-				url="http://printing.kde.org/">TDEPrint website</ulink>
-				is the resource for updates to this documentation, as well as PDF
-				versions suitable for printing it. It is authored and maintained by Kurt 
+				typing "help:/tdeprint" into the address field. It is authored and maintained by Kurt 
 				Pfeifle.
 				</para>
                                 <glossseealso otherterm="gloss-cupsfaq">&CUPS;-FAQ</glossseealso>
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index 6c1786aff..288fff879 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -475,8 +475,7 @@ bool KManualProxyDlg::getException ( TQString& result,
                             "<b><u>NOTE:</u></b> Wildcard matching such as "
                             "<code>*.kde.org</code> is not supported. If you want "
                             "to match any host in the <code>.kde.org</code> domain, "
-                            "e.g. <code>printing.kde.org</code>, then simply enter "
-                            "<code>.kde.org</code></qt>");
+                            "then simply enter <code>.kde.org</code></qt>");
                             
     bool ok;
     result = KInputDialog::text( caption, label, value, &ok, 0, 0, 0, 
diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp
index a7e43fe81..0445c71a5 100644
--- a/tdeprint/kjobviewer/main.cpp
+++ b/tdeprint/kjobviewer/main.cpp
@@ -35,7 +35,7 @@ static TDECmdLineOptions options[] = {
 
 extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 {
-	TDEAboutData	aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org");
+	TDEAboutData	aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, 0);
 	aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp
index 93a5f15c3..7968f6870 100644
--- a/tdeprint/tdeprintfax/main.cpp
+++ b/tdeprint/tdeprintfax/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
   TDEAboutData aboutData( "tdeprintfax", I18N_NOOP("TDEPrintFax"),
     "1.0", description, TDEAboutData::License_GPL,
-    "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org");
+    "(c), 2001 Michael Goffioul", 0, 0);
   aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be");
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.