Merge 'trunk' into 'DBIx-Class-current'

merged trunk rev 1365 (whitespace fixes) to -current branch

diff --cc lib/DBIx/Class.pm
Simple merge

diff --cc lib/DBIx/Class/CDBICompat.pm
Simple merge

diff --cc lib/DBIx/Class/Core.pm
Simple merge

diff --cc lib/DBIx/Class/Relationship/Base.pm
Simple merge

diff --cc lib/DBIx/Class/ResultSet.pm
Simple merge

diff --cc lib/DBIx/Class/ResultSource.pm
index cfa8bc9,68d16b2..8b27139
--- 1/lib/DBIx/Class/ResultSource.pm
--- 2/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@@ -104,9 -103,9 +104,9 @@@ foreign table. This is currently not us
  
  =item default_value
  
 -Set this to the default value which will be inserted into a column
 -by the database. Can contain either a value or a function. This is
 +Set this to the default value which will be inserted into this column
 +by the database. Can contain either values or functions. This is
- currently not used by DBIx::Class. 
+ currently not used by DBIx::Class.
  
  =item sequence
  

diff --cc lib/DBIx/Class/Row.pm
Simple merge

diff --cc lib/DBIx/Class/Schema.pm
index 3d7e681,0b9b969..50d1a39
--- 1/lib/DBIx/Class/Schema.pm
--- 2/lib/DBIx/Class/Schema.pm
+++ b/lib/DBIx/Class/Schema.pm
@@@ -203,14 -200,14 +203,14 @@@ With no arguments, this method uses L<M
  the schema's namespace. Otherwise, this method loads the classes you specify
  (using L<use>), and registers them (using L</"register_class">).
  
 -It is possible to comment out classes with a leading C<#>, but note that perl
 -will think it's a mistake (trying to use a comment in a qw list), so you'll
 -need to add C<no warnings 'qw';> before your load_classes call.
 +It is possible to comment out classes with a leading '#', but note that perl
 +will think it's a mistake (trying to use a comment in a qw list) so you'll
 +need to add "no warnings 'qw';" before your load_classes call.
  
 -Example:
 +e.g.,
  
    My::Schema->load_classes(); # loads My::Schema::CD, My::Schema::Artist,
-                             # etc. (anything under the My::Schema namespace)
+                               # etc. (anything under the My::Schema namespace)
  
    # loads My::Schema::CD, My::Schema::Artist, Other::Namespace::Producer but
    # not Other::Namespace::LinerNotes nor My::Schema::Track
@@@ -677,9 -674,9 +677,9 @@@ sub populate 
  
  =head2 throw_exception
  
- =over 4 
+ =over 4
  
 -=item Arguments: $message
 +=item Arguments: ($message)
  
  =back
  

diff --cc lib/DBIx/Class/Serialize/Storable.pm
index c9f1314,b3ac604..f0591ae
--- 1/lib/DBIx/Class/Serialize/Storable.pm
--- 2/lib/DBIx/Class/Serialize/Storable.pm
+++ b/lib/DBIx/Class/Serialize/Storable.pm
@@@ -21,10 -21,9 +21,10 @@@ sub STORABLE_thaw 
  
  __END__
  
- =head1 NAME 
+ =head1 NAME
  
      DBIx::Class::Serialize::Storable - hooks for Storable freeze/thaw
 +    (EXPERIMENTAL)
  
  =head1 SYNOPSIS
  

diff --cc lib/DBIx/Class/Storage/DBI.pm
Simple merge