add local

.gitignore

@@ -1,13 +1,22 @@
-wp-content/uploads/
-wp-content/blogs.dir/
+app/uploads/
+app/blogs.dir/
+app/backups/
+app/backup-db/
+app/upgrade/
+app/advanced-cache.php
+app/wp-cache-config.php
+app/cache/
 
-wp-content/backups/
-wp-content/backup-db/
-wp-content/upgrade/
+wp/wp-content/uploads/
+wp/wp-content/blogs.dir/
+wp/wp-content/backups/
+wp/wp-content/backup-db/
+wp/wp-content/upgrade/
+wp/wp-content/advanced-cache.php
+wp/wp-content/wp-cache-config.php
+wp/wp-content/cache/
 
-wp-content/advanced-cache.php
-wp-content/wp-cache-config.php
-wp-content/cache/
+wp/.htaccess
 
 wp-config.php
 wp-local-config.php

.htaccess

@@ -7,4 +7,15 @@ RewriteRule ^index\.php$ - [L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule . /wp/index.php [L]
-</IfModule>
+</IfModule>
+# BEGIN WordPress
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /wp/
+RewriteRule ^index\.php$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /wp/index.php [L]
+</IfModule>
+
+# END WordPress

wp-config-sample.php

@@ -26,6 +26,8 @@ define('NONCE_SALT',       '');
 
 $table_prefix  = 'wp_';
 
+define( 'WPLANG', '' );
+
 define('WP_DEBUG', true);
 define( 'WP_DEBUG_DISPLAY', true );
 ini_set( 'display_errors', 1 );
@@ -34,6 +36,9 @@ define('AUTOSAVE_INTERVAL', 720 );
 define('WP_POST_REVISIONS', 2);
 define('WP_MEMORY_LIMIT', '128M');
 
+if ( file_exists( dirname( __FILE__ ) . '/memcached.php' ) )
+	$memcached_servers = include( dirname( __FILE__ ) . '/memcached.php' );
+
 if ( !defined('ABSPATH') )
 	define('ABSPATH', dirname(__FILE__) . '/wp/');
 require_once(ABSPATH . 'wp-settings.php');