Clean up outdated comments; update ljconfig.pl with explanation that 
it's no longer used

        Patch by afuna. 

diffs (115 lines):

diff -r 7c1309711c17 -r 7bd20265586d doc/config-local.pl.txt
--- a/doc/config-local.pl.txt   Thu May 21 14:30:55 2009 +0000
+++ b/doc/config-local.pl.txt   Thu May 21 15:27:48 2009 +0000
@@ -1,17 +1,20 @@
 #!/usr/bin/perl
 # -*-perl-*-
 
-# LiveJournal configuration file.  Copy this out of the documentation
+# Dreamwidth configuration file.  Copy this out of the documentation
 # directory to etc/config-local.pl and edit as necessary.  The reason
 # it's not in the etc directory already is to protect it from
-# getting clobbered when you upgrade to the newest LiveJournal code in
+# getting clobbered when you upgrade to the newest Dreamwidth code in
 # the future.
 
-# This should be the only file you need to change to get the
-# LiveJournal code to run on your site. Use the checkconfig.pl
-# utility to find any other config variables that might not
-# be documented here. You should be able to set config values
-# here and have the LJ code run; if you have to modify the
+# This, and config-private.pl should be the only files you need to 
+# change to get the Dreamwidth code to run on your site. Variables
+# which are set by $DW::PRIVATE::... should be configured in 
+# config-private.pl instead.
+
+# Use the  checkconfig.pl utility to find any other config variables 
+# that might not be documented here. You should be able to set config 
+# values here and have the DW code run; if you have to modify the
 # code itself, it's a bug and you should report it.
 
 {
@@ -24,7 +27,6 @@
     $HOME = $ENV{'LJHOME'};
 
     # the base domain of your site.
-    # CHANGE THIS
     $DOMAIN = $DW::PRIVATE::DOMAIN;
 
     # human readable name of this site as well as shortened versions
@@ -44,7 +46,8 @@
     #$MAIL_TO_THESCHWARTZ = 1;
 
     # database info.  only the master is necessary.
-    # you should probably CHANGE THIS
+    # you may need to CHANGE THIS
+    # passwords should be kept in config-private.pl
     %DBINFO = (
                'master' => {  # master must be named 'master'
                    'host' => "localhost",
diff -r 7c1309711c17 -r 7bd20265586d doc/config-private.pl.txt
--- a/doc/config-private.pl.txt Thu May 21 14:30:55 2009 +0000
+++ b/doc/config-private.pl.txt Thu May 21 15:27:48 2009 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
-# LiveJournal configuration file.  Copy this out of the documentation
+# Dreamwidth configuration file.  Copy this out of the documentation
 # directory to etc/config-private.pl and edit as necessary.  The reason
 # it's not in the etc directory already is to protect it from
-# getting clobbered when you upgrade to the newest LiveJournal code in
+# getting clobbered when you upgrade to the newest Dreamwidth code in
 # the future.
 #
 # This is where you define private, site-specific configs (e.g. passwords).
@@ -35,6 +35,7 @@
         news => 1,
     );
 
+    # configuration for statistics trackers on www (non-journal) pages
     %SITE_PAGESTAT_CONFIG = (
     #    google_analytics => '',
     );
diff -r 7c1309711c17 -r 7bd20265586d doc/ljconfig.pl.txt
--- a/doc/ljconfig.pl.txt       Thu May 21 14:30:55 2009 +0000
+++ b/doc/ljconfig.pl.txt       Thu May 21 15:27:48 2009 +0000
@@ -1,21 +1,7 @@
-#!/usr/bin/perl
-# -*-perl-*-
-
-# LiveJournal configuration file.  Copy this out of the documentation
-# directory to etc/ljconfig.pl and edit as necessary.  The reason
-# it's not in the etc directory already is to protect it from
-# getting clobbered when you upgrade to the newest LiveJournal code in
-# the future.
+# old way of doing configuration, since broken down 
+# into separate files. Keeping it around as a placeholder
+# until we have updated the documentantion which points here
 #
-# You should not have to edit this file unless you add more config files
-# to your installation.
-
-{
-    package LJ;
-
-    do "$LJ::HOME/etc/config-private.pl";
-    do "$LJ::HOME/etc/config-local.pl";
-    do "$LJ::HOME/etc/config.pl";
-}
-
-1;
+# For the complete list of configuration 
+# files which are loaded in your installation, see:
+#   cgi-bin/LJ/Config.pm
diff -r 7c1309711c17 -r 7bd20265586d etc/config.pl
--- a/etc/config.pl     Thu May 21 14:30:55 2009 +0000
+++ b/etc/config.pl     Thu May 21 15:27:48 2009 +0000
@@ -110,8 +110,6 @@
     #             );
 
     # require new free acounts to be referred by an existing user?
-    # NOTE: mostly ljcom-specific.  some features unimplemented in
-    # the livejournal-only tree.
     $USE_ACCT_CODES = 1;
 
     #$EVERYONE_VALID = 1; # are all users validated by default?
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog

Reply via email to