Correct some errors and do some SGML police work on the reference pages

for REASSIGN OWNED and DROP OWNED.

diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index dc8b01fe984bf45cc54165b251a0a8652627033e..b19a04bf722ee2370305cabdabd9f7564f0dc7c1 100644 (file)
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -1,5 +1,5 @@
 
 
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  
 
-DROP OWNED name [, ...] [ RESTRICT | CASCADE ]
+DROP OWNED BY name [, ...] [ RESTRICT | CASCADE ]
 
  
 
@@ -28,36 +28,68 @@ DROP OWNED name [, ...] [ RESTRICT
   Description
 
   
-   The DROP OWNED instructs the system to drop those
-   database objects owned by one of the given roles which reside on the
-   current database.  All privileges granted to the given roles will also be
-   revoked.
+   DROP OWNED drops all the objects in the current
+   database that are owned by one of the specified roles. Any
+   privileges granted to the given roles on objects in the current
+   database will also be revoked.
   
+ 
 
-  
-   If CASCADE is specified, DROP OWNED
-   will behave like a DROP ... CASCADE was issued
-   for each object, that is, objects dependent on the ones owned by the
-   given users will be dropped as well.  
-  
+ 
+  Parameters
+
+  
+   
+    name
+    
+     
+      The name of a role whose objects will be dropped, and whose
+      privileges will be revoked.
+     
+    
+   
+
+   
+    CASCADE
+    
+     
+      Automatically drop objects that depend on the affected objects.
+     
+    
+   
+
+   
+    RESTRICT
+    
+     
+      Refuse to drop the objects owned by a role if any other database
+      objects depend on one of the affected objects. This is the default.
+     
+    
+   
+  
  
 
  
   Notes
   
-   The DROP OWNED command is mostly used in preparation to
-   drop the roles.  It may be necessary to issue the command in more than one
-   database.
+   DROP OWNED is often used to prepare for the
+   removal of one or more roles. Because DROP OWNED
+   only affects the objects in the current database, it is usually
+   necessary to execute this command in each database that contains
+   objects owned by a role that is to be removed.
   
 
   
-   Using the CASCADE option may make the command recurse to
-   objects owned by other users.
+   Using the CASCADE option may make the command
+   recurse to objects owned by other users.
   
 
   
-   See the REASSIGN OWNED command for an alternative that
-   gives the objects away to another role.
+   The 
+   endterm="sql-reassign-owned-title"> command is an alternative that
+   reassigns the ownership of all the database objects owned by one or
+   more roles.
   
  
 


diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml

index d63dac1bf1d516d86b480a1b51f488a6b1aa4d4e..dcb45c9c58e671978768a165708f61b5063efe06 100644 (file)

--- a/doc/src/sgml/ref/drop_role.sgml
+++ b/doc/src/sgml/ref/drop_role.sgml
@@ -1,5 +1,5 @@
 
 
@@ -38,7 +38,10 @@ DROP ROLE [ IF EXISTS ] name [, ...
    A role cannot be removed if it is still referenced in any database
    of the cluster; an error will be raised if so.  Before dropping the role,
    you must drop all the objects it owns (or reassign their ownership)
-   and revoke any privileges the role has been granted.
+   and revoke any privileges the role has been granted. The 
+   linkend="sql-reassign-owned" endterm="sql-reassign-owned-title">
+   and 
+   commands can be useful for this purpose.
   
 
   


diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml

index a54e4c82698d86c1269b8b00b298a4a20c7087e5..423d2943a52fef1e1a4bb1c140d7ba9ff65cb22a 100644 (file)

--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -1,5 +1,5 @@
 
 
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  
   REASSIGN OWNED
-  change ownership of database objects owned by a database role
+  change the ownership of database objects owned by a database role
  
 
  
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  
 
-REASSIGN OWNED old_role [, ...] TO new_role
+REASSIGN OWNED BY old_role [, ...] TO new_role
 
  
 
@@ -28,25 +28,61 @@ REASSIGN OWNED old_role [, ...] TO
   Description
 
   
-   The REASSIGN OWNED instructs the system to change
-   the ownership of the database objects owned by one of the old_roles,
-   to new_role.
+   REASSIGN OWNED instructs the system to change
+   the ownership of the database objects owned by one of the
+   old_roles, to new_role.
   
  
 
+ 
+  Parameters
+
+  
+   
+    old_role
+    
+     
+      The name of a role. The ownership of all the objects in the
+      current database owned by this role will be reassigned to
+      new_role.
+     
+    
+   
+
+   
+    new_role
+    
+     
+      The name of the role that will be made the new owner of the
+      affected objects.
+     
+    
+   
+  
+ 
+
  
   Notes
 
   
-   The REASSIGN OWNED command is mostly used in preparation to
-   drop the roles.  See the DROP OWNED command for an
-   alternative that drops the objects.
+   REASSIGN OWNED is often used to prepare for the
+   removal of one or more roles. Because REASSIGN
+   OWNED only affects the objects in the current database,
+   it is usually necessary to execute this command in each database
+   that contains objects owned by a role that is to be removed.
+  
+
+  
+   The 
+    endterm="sql-drop-owned-title"> command is an alternative that
+   drops all the database objects owned by one or more roles.
   
 
   
-   The REASSIGN OWNED command does not affect the privileges
-   granted to the old_roles in objects not owned by them.  Use
-   DROP OWNED to remove them.
+   The REASSIGN OWNED command does not affect the
+   privileges granted to the old_roles in objects that are not owned
+   by them.  Use DROP OWNED to revoke those
+   privileges.
   
 
  




This is the main PostgreSQL git repository.
RSS
Atom

diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml
index d63dac1bf1d516d86b480a1b51f488a6b1aa4d4e..dcb45c9c58e671978768a165708f61b5063efe06 100644 (file)
--- a/doc/src/sgml/ref/drop_role.sgml
+++ b/doc/src/sgml/ref/drop_role.sgml
@@ -1,5 +1,5 @@
 
 
@@ -38,7 +38,10 @@ DROP ROLE [ IF EXISTS ] name [, ...
    A role cannot be removed if it is still referenced in any database
    of the cluster; an error will be raised if so.  Before dropping the role,
    you must drop all the objects it owns (or reassign their ownership)
-   and revoke any privileges the role has been granted.
+   and revoke any privileges the role has been granted. The 
+   linkend="sql-reassign-owned" endterm="sql-reassign-owned-title">
+   and 
+   commands can be useful for this purpose.
   
 
   


diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml

index a54e4c82698d86c1269b8b00b298a4a20c7087e5..423d2943a52fef1e1a4bb1c140d7ba9ff65cb22a 100644 (file)

--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -1,5 +1,5 @@
 
 
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  
   REASSIGN OWNED
-  change ownership of database objects owned by a database role
+  change the ownership of database objects owned by a database role
  
 
  
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  
 
-REASSIGN OWNED old_role [, ...] TO new_role
+REASSIGN OWNED BY old_role [, ...] TO new_role
 
  
 
@@ -28,25 +28,61 @@ REASSIGN OWNED old_role [, ...] TO
   Description
 
   
-   The REASSIGN OWNED instructs the system to change
-   the ownership of the database objects owned by one of the old_roles,
-   to new_role.
+   REASSIGN OWNED instructs the system to change
+   the ownership of the database objects owned by one of the
+   old_roles, to new_role.
   
  
 
+ 
+  Parameters
+
+  
+   
+    old_role
+    
+     
+      The name of a role. The ownership of all the objects in the
+      current database owned by this role will be reassigned to
+      new_role.
+     
+    
+   
+
+   
+    new_role
+    
+     
+      The name of the role that will be made the new owner of the
+      affected objects.
+     
+    
+   
+  
+ 
+
  
   Notes
 
   
-   The REASSIGN OWNED command is mostly used in preparation to
-   drop the roles.  See the DROP OWNED command for an
-   alternative that drops the objects.
+   REASSIGN OWNED is often used to prepare for the
+   removal of one or more roles. Because REASSIGN
+   OWNED only affects the objects in the current database,
+   it is usually necessary to execute this command in each database
+   that contains objects owned by a role that is to be removed.
+  
+
+  
+   The 
+    endterm="sql-drop-owned-title"> command is an alternative that
+   drops all the database objects owned by one or more roles.
   
 
   
-   The REASSIGN OWNED command does not affect the privileges
-   granted to the old_roles in objects not owned by them.  Use
-   DROP OWNED to remove them.
+   The REASSIGN OWNED command does not affect the
+   privileges granted to the old_roles in objects that are not owned
+   by them.  Use DROP OWNED to revoke those
+   privileges.
   
 
  

diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml
index a54e4c82698d86c1269b8b00b298a4a20c7087e5..423d2943a52fef1e1a4bb1c140d7ba9ff65cb22a 100644 (file)
--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -1,5 +1,5 @@
 
 
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  
   REASSIGN OWNED
-  change ownership of database objects owned by a database role
+  change the ownership of database objects owned by a database role
  
 
  
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  
 
-REASSIGN OWNED old_role [, ...] TO new_role
+REASSIGN OWNED BY old_role [, ...] TO new_role
 
  
 
@@ -28,25 +28,61 @@ REASSIGN OWNED old_role [, ...] TO
   Description
 
   
-   The REASSIGN OWNED instructs the system to change
-   the ownership of the database objects owned by one of the old_roles,
-   to new_role.
+   REASSIGN OWNED instructs the system to change
+   the ownership of the database objects owned by one of the
+   old_roles, to new_role.
   
  
 
+ 
+  Parameters
+
+  
+   
+    old_role
+    
+     
+      The name of a role. The ownership of all the objects in the
+      current database owned by this role will be reassigned to
+      new_role.
+     
+    
+   
+
+   
+    new_role
+    
+     
+      The name of the role that will be made the new owner of the
+      affected objects.
+     
+    
+   
+  
+ 
+
  
   Notes
 
   
-   The REASSIGN OWNED command is mostly used in preparation to
-   drop the roles.  See the DROP OWNED command for an
-   alternative that drops the objects.
+   REASSIGN OWNED is often used to prepare for the
+   removal of one or more roles. Because REASSIGN
+   OWNED only affects the objects in the current database,
+   it is usually necessary to execute this command in each database
+   that contains objects owned by a role that is to be removed.
+  
+
+  
+   The 
+    endterm="sql-drop-owned-title"> command is an alternative that
+   drops all the database objects owned by one or more roles.
   
 
   
-   The REASSIGN OWNED command does not affect the privileges
-   granted to the old_roles in objects not owned by them.  Use
-   DROP OWNED to remove them.
+   The REASSIGN OWNED command does not affect the
+   privileges granted to the old_roles in objects that are not owned
+   by them.  Use DROP OWNED to revoke those
+   privileges.