--- private.module.orig	2009-04-01 18:09:20.000000000 -0600
+++ private.module	2009-05-14 10:50:13.000000000 -0600
@@ -124,19 +124,19 @@ function private_node_access_records($no
 
 /**
  * Implementation of hook_form_alter()
- *
- * This module adds a simple checkbox to the node form labeled private. If the
- * checkbox is labelled, only the node author and users with 'access private content' 
- * privileges may see it. 
  */
 function private_form_alter(&$form, $form_state, $form_id) {
+
+  // Adds a simple checkbox to the node form labeled private. If the
+  // checkbox is checked, only the node author and users with 'access private content' 
+  // privileges may see it. 
   if ($form['#id'] == 'node-form') {
     $node = $form['#node'];
-    $default = variable_get($node->type .'_private', PRIVATE_ALLOWED);
+    $default = variable_get('private_' . $node->type, PRIVATE_ALLOWED);
 
     if ($default != PRIVATE_DISABLED || !empty($node->privacy)) {
       if (empty($node->nid)) {
-        $privacy = ($default == PRIVATE_DEFAULT);
+        $privacy = ($default == PRIVATE_AUTOMATIC);
       }
       else {
         $privacy = $node->private;
@@ -159,9 +159,13 @@ function private_form_alter(&$form, $for
       }
     }
   }
+  
+  // Add a control to content type forms to set default privacy settings
+  // for each node type.
   elseif($form_id == 'node_type_form') {
     $node_type = (array)$form['#node_type'];
     $type = $node_type['type'];
+    $var_name = 'private_' . $type;
     $form['workflow']['private'] = array(
       '#type' => 'radios',
       '#title' => t('Privacy'),
@@ -170,7 +174,8 @@ function private_form_alter(&$form, $for
         PRIVATE_ALLOWED => t('Enabled (public by default)'),
         PRIVATE_AUTOMATIC => t('Enabled (private by default)'),
       ),
-      '#default_value' => variable_get($type .'_private', PRIVATE_ALLOWED),
+      '#default_value' => variable_get($var_name, PRIVATE_ALLOWED),
+      '#description' => t('Select how privacy should be applied by default to nodes of this type.  CAUTION:  This does not change privacy settings on existing nodes;  this only affects new nodes or existing nodes when they are next edited!'),
     );
   }
 }
@@ -325,4 +330,4 @@ function private_views_api() {
     'api' => 2,
     'path' => drupal_get_path('module', 'private'),
   );
-}
\ No newline at end of file
+}