Merge experimental-rworkman

in/man=wicd-manager-settings.conf.5.in

@@ -1,5 +1,5 @@
 .\" Written by Robby Workman <rworkman@slackware.com>
-.TH WICD-MANAGER-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%"
+.TH WICD-MANAGER-SETTINGS.CONF 5 "wicd-%VERSION%"
 .SH NAME
 wicd-manager-settings.conf \- contains settings that control Wicd's behavior
 
@@ -26,6 +26,9 @@ This file is located at %ETC%manager-settings.conf
 .br
 2 = route
 .TP
+.BI "backend = " <ioctl|external>
+Default is ioctl backend.
+.TP
 .BI "signal_display_type = " <0|1>
 0 = Show signal strength as a percentage
 .br
@@ -37,8 +40,18 @@ This file is located at %ETC%manager-settings.conf
 1 = dhclient
 .br
 2 = dhcpcd
+.br
 3 = pump
 .TP
+.BI "sudo_app = " <0|1|2|3>
+0 = autodetect
+.br
+1 = gksu
+.br
+2 = kdesu
+.br
+3 = ktsuss
+.TP
 .BI "wired_interface = " <interface_name>
 .TP
 .BI "always_show_wired_interface = " <True|False>
@@ -48,6 +61,11 @@ This file is located at %ETC%manager-settings.conf
 .br
 1 = do not connect to wired interface automatically
 .TP
+.BI "prefer_wired = " <True|False>
+True = Switch to wired interface if a link is detected, even if already connected to wireless
+.br
+False = Do not switch to wired interface automatically
+.TP
 .BI "wireless_interface = " <name_of_wireless_interface>
 .TP
 .BI "wpa_driver = " <wext|madwifi|ndiswrapper|hostap|hermes|atmel|broadcom|ipw|ralink legacy>
@@ -60,6 +78,9 @@ This settings determines whether Wicd will attempt to reconnect on connection lo
 If set to "True" and values are specified in the global DNS settings below,
 this will cause Wicd to use these DNS settings.
 .TP
+.BI "global_dns_dom = " <plaintext_domain_name>
+This specifies the default search domain to be used by the resolver.
+.TP
 .BI "global_dns_1 = " <ip_address>
 .TP
 .BI "global_dns_2 = " <ip_address>
@@ -86,6 +107,7 @@ This determines the width of the "Preferences" window when launched from the cli
 
 .SH "SEE ALSO"
 .BR wicd (8),
+.BR wicd-curses (8),
 .BR wicd-wired-settings.conf (5),
 .BR wicd-wireless-settings.conf (5).
 

in/man=wicd-wired-settings.conf.5.in

@@ -1,5 +1,5 @@
 .\" Written by Robby Workman <rworkman@slackware.com>
-.TH WICD-WIRED-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%"
+.TH WICD-WIRED-SETTINGS.CONF 5 "wicd-%VERSION%"
 .SH NAME
 wicd-wired-settings.conf \- controls Wicd's wired network settings
 
@@ -70,6 +70,7 @@ Static DNS address if "use_static_dns = True" and "use_global_dns = False"
 
 .SH "SEE ALSO"
 .BR wicd (8),
+.BR wicd-curses (8),
 .BR wicd-manager-settings.conf (5),
 .BR wicd-wireless-settings.conf (5).
 

in/man=wicd-wireless-settings.conf.5.in

@@ -1,5 +1,5 @@
 .\" Written by Robby Workman <rworkman@slackware.com>
-.TH WICD-WIRELESS-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%"
+.TH WICD-WIRELESS-SETTINGS.CONF 5 "wicd-%VERSION%"
 .SH NAME
 wicd-wired-settings.conf \- controls Wicd's wireless network settings
 
@@ -122,6 +122,7 @@ of the stanza will be in this format:
 
 .SH "SEE ALSO"
 .BR wicd (8),
+.BR wicd-curses (8),
 .BR wicd-manager-settings.conf (5),
 .BR wicd-wired-settings.conf (5).
 

in/man=wicd.8.in

@@ -1,5 +1,5 @@
 .\" Written by Robby Workman <rworkman@slackware.com>
-.TH WICD 8 "June 2008" "wicd-%VERSION%"
+.TH WICD 8 "wicd-%VERSION%"
 .SH NAME
 .B Wicd
 \- Wired and Wireless Network Connection Manager
@@ -139,6 +139,7 @@ log if you are having connection or other problems.
 .BR wicd-manager-settings.conf (5),
 .BR wicd-wired-settings.conf (5),
 .BR wicd-wireless-settings.conf (5),
+.BR wicd-curses (8),
 .BR ifconfig (8),
 .BR iwconfig (8),
 .BR wpa_supplicant (8),
@@ -155,6 +156,8 @@ log if you are having connection or other problems.
 Adam Blackburn <compwiz18@gmail.com>
 .br
 Dan O'Reilly <oreilldf@gmail.com>
+.br
+Andrew Psaltis <insertmail@here> (curses client)
 
 .SH MANPAGE AUTHOR
 Robby Workman <rworkman@slackware.com>

in/other=postinst.in

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Stop daemon
-if [ -f %INIT%%INITFILENAME% ]; then
-  %INIT%%INITFILENAME% stop
-fi
-  
-# Remove Wicd from the boot sequence
-if which update-rc.d &>/dev/null ; then
-  update-rc.d -f wicd remove
-fi
-
-# Remove pyc files 
-# They may exist if you are upgrading Wicd
-rm -f /opt/wicd/*.pyc
-
-# Add Wicd to the startup sequence
-# 80 to make sure that dbus is running when Wicd starts
-if which update-rc.d &>/dev/null ; then
-  update-rc.d wicd start 80 2 3 4 5 . stop 20 0 1 6 .
-fi
-
-# Start the daemon
-if [ -f %INIT%%INITFILENAME% ]; then
-  %INIT%%INITFILENAME% start
-fi