From acea51cc37ff9171c9e18ff0c21b825080aa4b8e Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Mon, 8 Oct 2012 12:32:58 +0200 Subject: [PATCH] samba-tool: Unify usage messages. Karolin Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Mon Oct 8 14:26:52 CEST 2012 on sn-devel-104 --- source4/scripting/python/samba/netcmd/dbcheck.py | 2 +- .../scripting/python/samba/netcmd/delegation.py | 4 ++-- source4/scripting/python/samba/netcmd/dns.py | 14 ++++++------- source4/scripting/python/samba/netcmd/domain.py | 16 +++++++-------- source4/scripting/python/samba/netcmd/drs.py | 10 ++++----- source4/scripting/python/samba/netcmd/dsacl.py | 2 +- source4/scripting/python/samba/netcmd/fsmo.py | 6 +++--- source4/scripting/python/samba/netcmd/gpo.py | 24 +++++++++++----------- source4/scripting/python/samba/netcmd/group.py | 12 +++++------ source4/scripting/python/samba/netcmd/ntacl.py | 8 ++++---- source4/scripting/python/samba/netcmd/rodc.py | 2 +- source4/scripting/python/samba/netcmd/sites.py | 4 ++-- source4/scripting/python/samba/netcmd/user.py | 16 +++++++-------- 13 files changed, 60 insertions(+), 60 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/source4/scripting/python/samba/netcmd/dbcheck.py index eb2281235da..e4ec6b303a4 100644 --- a/source4/scripting/python/samba/netcmd/dbcheck.py +++ b/source4/scripting/python/samba/netcmd/dbcheck.py @@ -29,7 +29,7 @@ from samba.dbchecker import dbcheck class cmd_dbcheck(Command): - """check local AD database for errors""" + """Check local AD database for errors.""" synopsis = "%prog [] [options]" takes_optiongroups = { diff --git a/source4/scripting/python/samba/netcmd/delegation.py b/source4/scripting/python/samba/netcmd/delegation.py index 8b2a1bcceff..14182b27bbb 100644 --- a/source4/scripting/python/samba/netcmd/delegation.py +++ b/source4/scripting/python/samba/netcmd/delegation.py @@ -165,7 +165,7 @@ class cmd_delegation_for_any_protocol(Command): class cmd_delegation_add_service(Command): - """Add a service principal as msDS-AllowedToDelegateTo""" + """Add a service principal as msDS-AllowedToDelegateTo.""" synopsis = "%prog [options]" @@ -209,7 +209,7 @@ class cmd_delegation_add_service(Command): class cmd_delegation_del_service(Command): - """Delete a service principal as msDS-AllowedToDelegateTo""" + """Delete a service principal as msDS-AllowedToDelegateTo.""" synopsis = "%prog [options]" diff --git a/source4/scripting/python/samba/netcmd/dns.py b/source4/scripting/python/samba/netcmd/dns.py index b227e960809..8bd3249ae23 100644 --- a/source4/scripting/python/samba/netcmd/dns.py +++ b/source4/scripting/python/samba/netcmd/dns.py @@ -674,7 +674,7 @@ def dns_record_match(dns_conn, server, zone, name, record_type, data): class cmd_serverinfo(Command): - """Query for Server information""" + """Query for Server information.""" synopsis = '%prog [options]' @@ -706,7 +706,7 @@ class cmd_serverinfo(Command): class cmd_zoneinfo(Command): - """Query for zone information""" + """Query for zone information.""" synopsis = '%prog [options]' @@ -738,7 +738,7 @@ class cmd_zoneinfo(Command): class cmd_zonelist(Command): - """Query for zones""" + """Query for zones.""" synopsis = '%prog [options]' @@ -817,7 +817,7 @@ class cmd_zonelist(Command): class cmd_zonecreate(Command): - """Create a zone""" + """Create a zone.""" synopsis = '%prog [options]' @@ -876,7 +876,7 @@ class cmd_zonecreate(Command): class cmd_zonedelete(Command): - """Delete a zone""" + """Delete a zone.""" synopsis = '%prog [options]' @@ -974,7 +974,7 @@ class cmd_query(Command): class cmd_roothints(Command): - """Query root hints""" + """Query root hints.""" synopsis = '%prog [] [options]' @@ -1169,7 +1169,7 @@ class cmd_delete_record(Command): class cmd_dns(SuperCommand): - """Domain Name Service (DNS) management""" + """Domain Name Service (DNS) management.""" subcommands = {} subcommands['serverinfo'] = cmd_serverinfo() diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index a9ad086d264..67732b14791 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -81,7 +81,7 @@ def get_testparm_var(testparm, smbconf, varname): try: import samba.dckeytab class cmd_domain_export_keytab(Command): - """Dumps kerberos keys of the domain into a keytab""" + """Dump Kerberos keys of the domain into a keytab.""" synopsis = "%prog [options]" @@ -106,7 +106,7 @@ except: class cmd_domain_info(Command): - """Print basic info about a domain and the DC passed as parameter""" + """Print basic info about a domain and the DC passed as parameter.""" synopsis = "%prog [options]" @@ -405,7 +405,7 @@ class cmd_domain_provision(Command): result.report_logger(self.logger) def _get_nameserver_ip(self): - """Grab the nameserver IP address from /etc/resolv.conf""" + """Grab the nameserver IP address from /etc/resolv.conf.""" from os import path RESOLV_CONF="/etc/resolv.conf" @@ -429,7 +429,7 @@ class cmd_domain_provision(Command): class cmd_domain_dcpromo(Command): - """Promotes an existing domain member or NT4 PDC to an AD DC""" + """Promote an existing domain member or NT4 PDC to an AD DC.""" synopsis = "%prog [DC|RODC] [options]" @@ -494,7 +494,7 @@ class cmd_domain_dcpromo(Command): class cmd_domain_join(Command): - """Joins domain as either member or backup domain controller""" + """Join domain as either member or backup domain controller.""" synopsis = "%prog [DC|RODC|MEMBER|SUBDOMAIN] [options]" @@ -573,7 +573,7 @@ class cmd_domain_join(Command): class cmd_domain_demote(Command): - """Demote ourselves from the role of Domain Controller""" + """Demote ourselves from the role of Domain Controller.""" synopsis = "%prog [options]" @@ -815,7 +815,7 @@ class cmd_domain_demote(Command): class cmd_domain_level(Command): - """Raises domain and forest function levels""" + """Raise domain and forest function levels.""" synopsis = "%prog (show|raise ) [options]" @@ -1019,7 +1019,7 @@ class cmd_domain_level(Command): class cmd_domain_passwordsettings(Command): - """Sets password settings + """Set password settings. Password complexity, history length, minimum password length, the minimum and maximum password age) on a Samba4 server. diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py index e14f72f94c7..fc71b69f9e9 100644 --- a/source4/scripting/python/samba/netcmd/drs.py +++ b/source4/scripting/python/samba/netcmd/drs.py @@ -80,7 +80,7 @@ def drs_parse_ntds_dn(ntds_dn): class cmd_drs_showrepl(Command): - """show replication status""" + """Show replication status.""" synopsis = "%prog [] [options]" @@ -194,7 +194,7 @@ class cmd_drs_showrepl(Command): class cmd_drs_kcc(Command): - """trigger knowledge consistency center run""" + """Trigger knowledge consistency center run.""" synopsis = "%prog [] [options]" @@ -263,7 +263,7 @@ def drs_local_replicate(self, SOURCE_DC, NC): class cmd_drs_replicate(Command): - """replicate a naming context between two DCs""" + """Replicate a naming context between two DCs.""" synopsis = "%prog [options]" @@ -339,7 +339,7 @@ class cmd_drs_replicate(Command): class cmd_drs_bind(Command): - """show DRS capabilities of a server""" + """Show DRS capabilities of a server.""" synopsis = "%prog [] [options]" @@ -438,7 +438,7 @@ class cmd_drs_bind(Command): class cmd_drs_options(Command): - """query or change 'options' for NTDS Settings object of a domain controller""" + """Query or change 'options' for NTDS Settings object of a Domain Controller.""" synopsis = "%prog [] [options]" diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/source4/scripting/python/samba/netcmd/dsacl.py index ac09a0b9cf9..36b0938f3e0 100644 --- a/source4/scripting/python/samba/netcmd/dsacl.py +++ b/source4/scripting/python/samba/netcmd/dsacl.py @@ -45,7 +45,7 @@ from samba.netcmd import ( class cmd_dsacl_set(Command): - """Modify access list on a directory object""" + """Modify access list on a directory object.""" synopsis = "%prog [options]" car_help = """ The access control right to allow or deny """ diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py index a6105882bb5..71d9879d8a1 100644 --- a/source4/scripting/python/samba/netcmd/fsmo.py +++ b/source4/scripting/python/samba/netcmd/fsmo.py @@ -69,7 +69,7 @@ def transfer_role(outf, role, samdb): class cmd_fsmo_seize(Command): - """Seize the role""" + """Seize the role.""" synopsis = "%prog [options]" @@ -161,7 +161,7 @@ all=all of the above"""), class cmd_fsmo_show(Command): - """Show the roles""" + """Show the roles.""" synopsis = "%prog [options]" @@ -224,7 +224,7 @@ class cmd_fsmo_show(Command): class cmd_fsmo_transfer(Command): - """Transfer the role""" + """Transfer the role.""" synopsis = "%prog [options]" diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/source4/scripting/python/samba/netcmd/gpo.py index ee0de982b96..412e736f21d 100644 --- a/source4/scripting/python/samba/netcmd/gpo.py +++ b/source4/scripting/python/samba/netcmd/gpo.py @@ -284,7 +284,7 @@ def create_directory_hier(conn, remotedir): class cmd_listall(Command): - """list all GPOs""" + """List all GPOs.""" synopsis = "%prog [options]" @@ -321,7 +321,7 @@ class cmd_listall(Command): class cmd_list(Command): - """list GPOs for an account""" + """List GPOs for an account.""" synopsis = "%prog [options]" @@ -435,7 +435,7 @@ class cmd_list(Command): class cmd_show(Command): - """Show information for a GPO""" + """Show information for a GPO.""" synopsis = "%prog [options]" @@ -479,7 +479,7 @@ class cmd_show(Command): class cmd_getlink(Command): - """List GPO Links for a container""" + """List GPO Links for a container.""" synopsis = "%prog [options]" @@ -526,7 +526,7 @@ class cmd_getlink(Command): class cmd_setlink(Command): - """Add or Update a GPO link to a container""" + """Add or update a GPO link to a container.""" synopsis = "%prog [options]" @@ -616,7 +616,7 @@ class cmd_setlink(Command): class cmd_dellink(Command): - """Delete GPO link from a container""" + """Delete GPO link from a container.""" synopsis = "%prog [options]" @@ -655,7 +655,7 @@ class cmd_dellink(Command): class cmd_listcontainers(Command): - """List all linked containers for a GPO""" + """List all linked containers for a GPO.""" synopsis = "%prog [options]" @@ -691,7 +691,7 @@ class cmd_listcontainers(Command): class cmd_getinheritance(Command): - """Get inheritance flag for a container""" + """Get inheritance flag for a container.""" synopsis = "%prog [options]" @@ -735,7 +735,7 @@ class cmd_getinheritance(Command): class cmd_setinheritance(Command): - """Set inheritance flag on a container""" + """Set inheritance flag on a container.""" synopsis = "%prog [options]" @@ -789,7 +789,7 @@ class cmd_setinheritance(Command): class cmd_fetch(Command): - """Download a GPO""" + """Download a GPO.""" synopsis = "%prog [options]" @@ -862,7 +862,7 @@ class cmd_fetch(Command): class cmd_create(Command): - """Create an empty GPO""" + """Create an empty GPO.""" synopsis = "%prog [options]" @@ -995,7 +995,7 @@ class cmd_create(Command): class cmd_del(Command): - """Delete GPO""" + """Delete a GPO.""" synopsis = "%prog [options]" diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py index 3a5ef0136c0..a13cb847503 100644 --- a/source4/scripting/python/samba/netcmd/group.py +++ b/source4/scripting/python/samba/netcmd/group.py @@ -40,7 +40,7 @@ distribution_group = dict({"Domain": GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP, "Glo class cmd_group_add(Command): - """Creates a new AD group + """Creates a new AD group. This command creates a new Active Directory group. The groupname specified on the command is a unique sAMAccountName. @@ -115,7 +115,7 @@ Example2 adds a new distribution group to the local server. The command is run class cmd_group_delete(Command): - """Deletes an AD group + """Deletes an AD group. The command deletes an existing AD group from the Active Directory domain. The groupname specified on the command is the sAMAccountName. @@ -165,7 +165,7 @@ Example2 deletes group Group2 from the local server. The command is run under r class cmd_group_add_members(Command): - """Add members to an AD group + """Add members to an AD group. This command adds one or more members to an existing Active Directory group. The command accepts one or more group member names seperated by commas. A group member may be a user or computer account or another Active Directory group. @@ -217,7 +217,7 @@ Example2 shows how to add a single user account, User2, to the supergroup AD gro class cmd_group_remove_members(Command): - """Remove members from an AD group + """Remove members from an AD group. This command removes one or more members from an existing Active Directory group. The command accepts one or more group member names seperated by commas. A group member may be a user or computer account or another Active Directory group that is a member of the group specified on the command. @@ -267,7 +267,7 @@ Example2 shows how to remove a single user account, User2, from the supergroup A class cmd_group_list(Command): - """List all groups""" + """List all groups.""" synopsis = "%prog [options]" @@ -301,7 +301,7 @@ class cmd_group_list(Command): class cmd_group_list_members(Command): - """List all members of an AD group + """List all members of an AD group. This command lists members from an existing Active Directory group. The command accepts one group name. diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/source4/scripting/python/samba/netcmd/ntacl.py index edbcd7edc88..2f72fca8634 100644 --- a/source4/scripting/python/samba/netcmd/ntacl.py +++ b/source4/scripting/python/samba/netcmd/ntacl.py @@ -40,7 +40,7 @@ from samba.netcmd import ( class cmd_ntacl_set(Command): - """Set ACLs on a file""" + """Set ACLs on a file.""" synopsis = "%prog [options]" @@ -94,7 +94,7 @@ class cmd_ntacl_set(Command): class cmd_ntacl_get(Command): - """Get ACLs of a file""" + """Get ACLs of a file.""" synopsis = "%prog [options]" takes_optiongroups = { @@ -147,7 +147,7 @@ class cmd_ntacl_get(Command): class cmd_ntacl_sysvolreset(Command): - """Reset sysvol ACLs to defaults (including correct ACLs on GPOs)""" + """Reset sysvol ACLs to defaults (including correct ACLs on GPOs).""" synopsis = "%prog [options]" takes_optiongroups = { @@ -214,7 +214,7 @@ class cmd_ntacl_sysvolreset(Command): lp, use_ntvfs=use_ntvfs) class cmd_ntacl_sysvolcheck(Command): - """Check sysvol ACLs match defaults (including correct ACLs on GPOs)""" + """Check sysvol ACLs match defaults (including correct ACLs on GPOs).""" synopsis = "%prog [options]" takes_optiongroups = { diff --git a/source4/scripting/python/samba/netcmd/rodc.py b/source4/scripting/python/samba/netcmd/rodc.py index f9df69d8967..7b643c77279 100644 --- a/source4/scripting/python/samba/netcmd/rodc.py +++ b/source4/scripting/python/samba/netcmd/rodc.py @@ -26,7 +26,7 @@ from samba.drs_utils import drs_Replicate class cmd_rodc_preload(Command): - """Preload one account for an RODC""" + """Preload one account for an RODC.""" synopsis = "%prog (||) [options]" diff --git a/source4/scripting/python/samba/netcmd/sites.py b/source4/scripting/python/samba/netcmd/sites.py index ae63dea10b7..c8462283c6b 100644 --- a/source4/scripting/python/samba/netcmd/sites.py +++ b/source4/scripting/python/samba/netcmd/sites.py @@ -29,7 +29,7 @@ from samba.netcmd import ( class cmd_sites_create(Command): - """Create a new site""" + """Create a new site.""" synopsis = "%prog [options]" @@ -62,7 +62,7 @@ class cmd_sites_create(Command): self.outf.write("Site %s created !\n" % sitename) class cmd_sites_delete(Command): - """Delete an existing site""" + """Delete an existing site.""" synopsis = "%prog [options]" diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py index 1172f4efd39..914e47f9845 100644 --- a/source4/scripting/python/samba/netcmd/user.py +++ b/source4/scripting/python/samba/netcmd/user.py @@ -38,7 +38,7 @@ from samba.netcmd import ( class cmd_user_create(Command): - """Creates a new user + """Create a new user. This command creates a new user account in the Active Directory domain. The username specified on the command is the sAMaccountName. @@ -159,7 +159,7 @@ class cmd_user_add(cmd_user_create): class cmd_user_delete(Command): - """Deletes a user + """Delete a user. This command deletes a user account from the Active Directory domain. The username specified on the command is the sAMAccountName. @@ -207,7 +207,7 @@ Example2 shows how to delete a user in the domain against the local server. su class cmd_user_list(Command): - """List all users""" + """List all users.""" synopsis = "%prog [options]" @@ -242,7 +242,7 @@ class cmd_user_list(Command): class cmd_user_enable(Command): - """Enables a user + """Enable an user. This command enables a user account for logon to an Active Directory domain. The username specified on the command is the sAMAccountName. The username may also be specified using the --filter option. @@ -311,7 +311,7 @@ Example3 shows how to enable a user in the domain against a local LDAP server. class cmd_user_disable(Command): - """Disable a user""" + """Disable an user.""" synopsis = "%prog (|--filter ) [options]" @@ -349,7 +349,7 @@ class cmd_user_disable(Command): class cmd_user_setexpiry(Command): - """Sets the expiration of a user account + """Set the expiration of a user account. This command sets the expiration of a user account. The username specified on the command is the sAMAccountName. The username may also be specified using the --filter option. @@ -420,7 +420,7 @@ Example4 shows how to set the account expiration so that it will never expire. class cmd_user_password(Command): - """Change password for a user account (the one provided in authentication) + """Change password for a user account (the one provided in authentication). """ synopsis = "%prog [options]" @@ -465,7 +465,7 @@ class cmd_user_password(Command): class cmd_user_setpassword(Command): - """Sets or resets the password of a user account + """Set or reset the password of a user account. This command sets or resets the logon password for a user account. The username specified on the command is the sAMAccountName. The username may also be specified using the --filter option. -- 2.11.4.GIT