Remove --upload option

The --upload option has a lot of limitations and has not been
widely used. Recent trends are to handle uploading data in
higher-level tools (e.g. redhat-support-tool or web based
management UIs) and the python ftp library does not support
modern requirements like HTTP proxy traversal or encryption.

Fixes Issue #217

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

2 files changed, 24 insertions, 22 deletions

diff --git a/man/en/sos.conf.5 b/man/en/sos.conf.5
index dc10b1be..b40a48e1 100644
--- a/man/en/sos.conf.5
+++ b/man/en/sos.conf.5
@@ -6,26 +6,31 @@ sos.conf \- sosreport configuration
 sosreport uses a configuration file at /etc/sos.conf.
 .SH PARAMETERS
 .sp
-There are 3 sections of configuration in the sosreport configuration file: general,
-plugins, and tunables.
-.SH [general] OPTIONS
-.sp
-.in
-ftp_upload_url Default ftp server to send reports.
-.in
-gpg_keyring Default gpgkey.
-.in
-gpg_recipient GPG recipient
-.in
-smtp_server Mail server
-.SH [plugins] OPTIONS
-.sp
-.in
+There are two sections in the sosreport configuration file:
+plugins, and tunables. Options are set using 'ini'-style
+\fBname = value\fP pairs.
+
+Some options accept a comma separated list of values.
+
+.TP
+\fB[plugins]\fP
 disable Comma separated list of plugins to disable.
-.SH [tunables] OPTIONS
+.TP
+\fB[tunables]\fP
+plugin.option Alter available options for defined plugin.
+.SH EXAMPLES
+To disable the 'general' and 'filesys' plugins:
+.LP
+[plugins]
+.br
+disable = general, filesys
 .sp
-.in
-(plugin, option) Alter available options for defined plugin.
+To disable rpm package verification in the RPM plugin:
+.LP
+[tunables]
+.br
+rpm.rpmva = off
+.br
 .SH FILES
 .sp
 /etc/sos.conf
diff --git a/man/en/sosreport.1 b/man/en/sosreport.1
index 87a099e6..c8005768 100644
--- a/man/en/sosreport.1
+++ b/man/en/sosreport.1
@@ -10,7 +10,7 @@ sosreport \- Collect and package diagnostic and support data
           [-a|--alloptions] [-v|--verbose]\fR
           [--report] [--config-file conf] [--batch]\fR
           [--build] [--name name] [--ticket-number number]
-          [--debug] [--upload] [--tmp-dir directory]\fR
+          [--debug] [--tmp-dir directory]\fR
           [--profile] [--help]\fR
 .SH DESCRIPTION
 \fBsosreport\fR generates a compressed tar archive of diagnostic
@@ -50,9 +50,6 @@ specified value in the plug-in PLUGNAME.
 .B \-a, \--alloptions
 Set all boolean options to True for all enabled plug-ins.
 .TP
-.B \--upload FTP_SERVER
-Upload the report to the configured destination.
-.TP
 .B \-v, \--verbose
 Increase logging verbosity. May be specified multiple times to enable
 additional debugging messages.