1 files changed, 1 insertions, 36 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index be5d4ec7d..e805c8ee7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -815,7 +815,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'username_policy',
-    'section'     => '',
+    'section'     => 'deprecated',
     'description' => 'This file controls the mechanism for preventing duplicate usernames in passwd/radius files exported from svc_accts.  This should be one of \'prepend domsvc\' \'append domsvc\' \'append domain\' or \'append @domain\'',
     'type'        => 'select',
     'select_enum' => [ 'prepend domsvc', 'append domsvc', 'append domain', 'append @domain' ],
@@ -894,20 +894,6 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'selfservice_server-quiet',
-    'section'     => '',
-    'description' => 'Disable decline and cancel emails generated by transactions initiated by the selfservice server. Not recommended, unless the customer will get instant feedback from a customer service UI, and receiving an email would be confusing/overkill.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'signup_server-quiet',
-    'section'     => '',
-    'description' => 'Disable decline and cancel emails generated by transactions initiated by the signup server. Not recommended, unless the customer will get instant feedback from a customer service UI, and receiving an email would be confusing/overkill. Does not disable welcome emails.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'signup_server-payby',
     'section'     => '',
     'description' => 'Acceptable payment types for the signup server',
@@ -952,27 +938,6 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'cancelmessage',
-    'section'     => 'billing',
-    'description' => 'Template file for cancellation emails.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'cancelsubject',
-    'section'     => 'billing',
-    'description' => 'Subject line for cancellation emails.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'emailcancel',
-    'section'     => 'billing',
-    'description' => 'Enable emailing of cancellation notices.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'require_cardname',
     'section'     => 'billing',
     'description' => 'Require an "Exact name on card" to be entered explicitly; don\'t default to using the first and last name.',