From 44f44d5fa18243173108bb4485ba2dc8888b240a Mon Sep 17 00:00:00 2001
From: ozhozh <ozhozh@12232710-3e20-11de-b438-597f59cd7555>
Date: Mon, 1 Aug 2011 18:50:57 +0000
Subject: [PATCH] Moving config-sample.php to the user dir. Should have done
 this ages ago.

git-svn-id: http://yourls.googlecode.com/svn/trunk@656 12232710-3e20-11de-b438-597f59cd7555
---
 {includes => user}/config-sample.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
 rename {includes => user}/config-sample.php (80%)

diff --git a/includes/config-sample.php b/user/config-sample.php
similarity index 80%
rename from includes/config-sample.php
rename to user/config-sample.php
index 3979215..8f62235 100644
--- a/includes/config-sample.php
+++ b/user/config-sample.php
@@ -1,12 +1,8 @@
 <?php
 /* This is a sample config file.
  * Edit this file with your own settings and save it as "config.php"
- * You can leave it in the "includes" directory, or, better, move it to
- * the "user" directory. This way, when a new version of YOURLS is available,
- * simply delete everything but "/user", and upload the new version.
  */
 
-
 /*
  ** MySQL settings - You can get this info from your web host
  */
@@ -30,7 +26,8 @@
  ** Site options
  */
 
-/** YOURLS installation URL, no trailing slash. If you define it to http://site.com/, don't use www.site.com (and vice-versa) */
+/** YOURLS installation URL -- all lowercase and with no trailing slash.
+ ** If you define it to "http://site.com", don't use "http://www.site.com" in your browser (and vice-versa) */
 define( 'YOURLS_SITE', 'http://site.com' );
 
 /** Timezone GMT offset */
@@ -41,11 +38,11 @@
  ** Set to false to allow multiple short URLs pointing to the same long URL (bit.ly behavior) */
 define( 'YOURLS_UNIQUE_URLS', true );
 
-/** Private means protected with login/pass as defined below. Set to false for public usage. */
+/** Private means protected with login/pass as defined below. Set to false for public usage on a restricted intranet or for test setups. */
 define( 'YOURLS_PRIVATE', true );
 
 /** A random secret hash used to encrypt cookies. You don't have to remember it, make it long and complicated. Hint: copy from http://yourls.org/cookie **/
-define( 'YOURLS_COOKIEKEY', 'qQ4KhL_pu|s@Zm7n#%:b^{A[vhm' );
+define( 'YOURLS_COOKIEKEY', 'modify this text with something random' );
 
 /**  Username(s) and password(s) allowed to access the site */
 $yourls_user_passwords = array(
-- 
2.45.0