Rename sites directory to be the new config repository

.htaccess

@@ -25,7 +25,7 @@ ErrorDocument 404 /index.php
 # Set the default handler.
 DirectoryIndex index.php
 
-# Override PHP settings. More in sites/default/settings.php
+# Override PHP settings. More in config/default/settings.php
 # but the following cannot be changed at runtime.
 
 # PHP 4, Apache 1.

config/default/default.settings.php

@@ -16,30 +16,30 @@
  * website's hostname from left to right and pathname from right to
  * left. The first configuration file found will be used and any
  * others will be ignored. If no other configuration file is found
- * then the default configuration file at 'sites/default' will be used.
+ * then the default configuration file at 'config/default' will be used.
  *
  * For example, for a fictitious site installed at
  * http://www.drupal.org/mysite/test/, the 'settings.php'
  * is searched in the following directories:
  *
- *  1. sites/www.drupal.org.mysite.test
+ *  1. config/www.drupal.org.mysite.test
- *  2. sites/drupal.org.mysite.test
+ *  2. config/drupal.org.mysite.test
- *  3. sites/org.mysite.test
+ *  3. config/org.mysite.test
  *
- *  4. sites/www.drupal.org.mysite
+ *  4. config/www.drupal.org.mysite
- *  5. sites/drupal.org.mysite
+ *  5. config/drupal.org.mysite
- *  6. sites/org.mysite
+ *  6. config/org.mysite
  *
- *  7. sites/www.drupal.org
+ *  7. config/www.drupal.org
- *  8. sites/drupal.org
+ *  8. config/drupal.org
- *  9. sites/org
+ *  9. config/org
  *
- * 10. sites/default
+ * 10. config/default
  *
  * If you are installing on a non-standard port number, prefix the
  * hostname with that number. For example,
  * http://www.drupal.org:8080/mysite/test/ could be loaded from
- * sites/8080.www.drupal.org.mysite.test/.
+ * config/8080.www.drupal.org.mysite.test/.
  */
 
 /**

includes/bootstrap.inc

@@ -323,7 +323,7 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
     return $conf;
   }
 
-  $confdir = 'sites';
+  $confdir = 'config';
   $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
   $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
   for ($i = count($uri) - 1; $i > 0; $i--) {
@@ -491,8 +491,7 @@ function conf_init() {
  * in any of these three places:
  *
  * modules/foo/foo.module
- * sites/all/modules/foo/foo.module
+ * config/example.com/modules/foo/foo.module
- * sites/example.com/modules/foo/foo.module
  *
  * Calling drupal_get_filename('module', 'foo') will give you one of
  * the above, depending on where the module is located.

includes/common.inc

@@ -2859,9 +2859,8 @@ function drupal_cron_cleanup() {
  * Return an array of system file objects.
  *
  * Returns an array of file objects of the given type from the site-wide
- * directory (i.e. modules/), the all-sites directory (i.e.
+ * directory (i.e. modules/), the profiles directory and site-specific directory
- * sites/all/modules/), the profiles directory, and site-specific directory
+ * (i.e. config/somesite/modules/). The returned array will be keyed using the
- * (i.e. sites/somesite/modules/). The returned array will be keyed using the
  * key specified (name, basename, filename). Using name or basename will cause
  * site-specific files to be prioritized over similar files in the default
  * directories. That is, if a file with the same name appears in both the
@@ -2872,8 +2871,7 @@ function drupal_cron_cleanup() {
  *   The regular expression of the files to find.
  * @param $directory
  *   The subdirectory name in which the files are found. For example,
- *   'modules' will search in both modules/ and
+ *   'modules' will search in modules/.
- *   sites/somesite/modules/.
  * @param $key
  *   The key to be passed to file_scan_directory().
  * @param $min_depth
@@ -2883,31 +2881,10 @@ function drupal_cron_cleanup() {
  *   An array of file objects of the specified type.
  */
 function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) {
-  global $profile;
-  $config = conf_path();
-
-  // When this function is called during Drupal's initial installation process,
-  // the name of the profile that's about to be installed is stored in the global
-  // $profile variable. At all other times, the standard Drupal systems variable
-  // table contains the name of the current profile, and we can call variable_get()
-  // to determine what one is active.
-  if (!isset($profile)) {
-    $profile = variable_get('install_profile', 'default');
-  }
   $searchdir = array($directory);
   $files = array();
 
-  // The 'profiles' directory contains pristine collections of modules and
+  $config = conf_path();
-  // themes as organized by a distribution.  It is pristine in the same way
-  // that /modules is pristine for core; users should avoid changing anything
-  // there in favor of sites/all or sites/<domain> directories.
-  if (file_exists("profiles/$profile/$directory")) {
-    $searchdir[] = "profiles/$profile/$directory";
-  }
-
-  // Always search sites/all/* as well as the global directories
-  $searchdir[] = 'sites/all/'. $directory;
-
   if (file_exists("$config/$directory")) {
     $searchdir[] = "$config/$directory";
   }

includes/install.inc

@@ -34,7 +34,7 @@ function drupal_load_updates() {
  * @param $module
  *   A module name.
  * @return
- *   If the module has updates, an array of available updates sorted by version. 
+ *   If the module has updates, an array of available updates sorted by version.
  *   Otherwise, FALSE.
  */
 function drupal_get_schema_versions($module) {
@@ -172,7 +172,7 @@ function drupal_detect_database_types() {
  *   An array of settings that need to be updated.
  */
 function drupal_rewrite_settings($settings = array(), $prefix = '') {
-  $default_settings = './sites/default/default.settings.php';
+  $default_settings = './config/default/default.settings.php';
   $settings_file = './'. conf_path(FALSE, TRUE) .'/'. $prefix .'settings.php';
 
   // Build list of setting names and insert the values into the global namespace.

install/INSTALL.txt

@@ -13,19 +13,10 @@ CONTENTS OF THIS FILE
 REQUIREMENTS
 ------------
 
-Drupal requires a web server, PHP 4 (4.3.5 or greater) or PHP 5
+SuiteDesk requires a web server, Apache web server is recommended, PHP 5 (better
-(http://www.php.net/) and either MySQL (http://www.mysql.com/) or PostgreSQL
+with version 5.4.45) and MySQL (4.1.1 or greater).
-(http://www.postgresql.org/). The Apache web server and MySQL database are
-recommended; other web server and database combinations such as IIS and
-PostgreSQL have been tested to a lesser extent. When using MySQL, version 4.1.1
-or greater is recommended to assure you can safely transfer the database.
 
-For more detailed information about Drupal requirements, see "Requirements"
+See http://www.php.net and http://www.mysql.com for more information.
-(http://drupal.org/requirements) in the Drupal handbook.
-
-For detailed information on how to configure a test server environment using
-a variety of operating systems and web servers, see "Local server setup"
-(http://drupal.org/node/157602) in the Drupal handbook.
 
 OPTIONAL TASKS
 --------------
@@ -47,7 +38,6 @@ OPTIONAL TASKS
   themes), the ability to log in via OpenID, fetching aggregator feeds, or
   other network-dependent services.
 
-
 INSTALLATION
 ------------
 
@@ -75,7 +65,7 @@ INSTALLATION
 
 2. CREATE THE CONFIGURATION FILE AND GRANT WRITE PERMISSIONS
 
-   Drupal comes with a default.settings.php file in the sites/default
+   Drupal comes with a default.settings.php file in the config/default
    directory. The installer uses this file as a template to create your
    settings file using the details you provide through the install process.
    To avoid problems when upgrading, Drupal is not packaged with an actual
@@ -84,18 +74,18 @@ INSTALLATION
    this name in the same directory). For example, (from the installation
    directory) make a copy of the default.settings.php file with the command:
 
-     cp sites/default/default.settings.php sites/default/settings.php
+     cp config/default/default.settings.php config/default/settings.php
 
-   Next, give the web server write privileges to the sites/default/settings.php
+   Next, give the web server write privileges to the config/default/settings.php
    file with the command (from the installation directory):
 
-     chmod o+w sites/default/settings.php
+     chmod o+w config/default/settings.php
 
   So that the files directory can be created automatically, give the web server
-  write privileges to the sites/default directory with the command (from the
+  write privileges to the config/default directory with the command (from the
   installation directory):
 
-     chmod o+w sites/default
+     chmod o+w config/default
 
 3. CREATE THE DRUPAL DATABASE
 
@@ -111,6 +101,42 @@ INSTALLATION
    Take note of the username, password, database name and hostname as you
    create the database. You will enter these items in the install script.
 
+   This step is only necessary if you don't already have a database set-up (e.g. by
+   your host). In the following examples, 'username' is an example MySQL user which
+   has the CREATE and GRANT privileges. Use the appropriate user name for your
+   system.
+
+   First, you must create a new database for your Drupal site (here, 'databasename'
+   is the name of the new database):
+
+     mysqladmin -u username -p create databasename
+
+   MySQL will prompt for the 'username' database password and then create the
+   initial database files. Next you must login and set the access database rights:
+
+     mysql -u username -p
+
+   Again, you will be asked for the 'username' database password. At the MySQL
+   prompt, enter following command:
+
+     GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
+     CREATE TEMPORARY TABLES ON databasename.*
+     TO 'username'@'localhost' IDENTIFIED BY 'password';
+
+   where
+
+    'databasename' is the name of your database
+    'username@localhost' is the username of your MySQL account
+    'password' is the password required for that username
+
+   Note: Unless your database user has all of the privileges listed above, you will
+   not be able to run Drupal.
+
+   If successful, MySQL will reply with:
+
+     Query OK, 0 rows affected
+
+
 4. RUN THE INSTALL SCRIPT
 
    To run the install script point your browser to the base URL of your website
@@ -121,27 +147,27 @@ INSTALLATION
    site settings.
 
    The install script will attempt to create a files storage directory
-   in the default location at sites/default/files (the location of the
+   in the default location at config/default/files (the location of the
    files directory may be changed after Drupal is installed). In some
    cases, you may need to create the directory and modify its permissions
    manually. Use the following commands (from the installation directory)
    to create the files directory and grant the web server write privileges to it:
 
-     mkdir sites/default/files
+     mkdir config/default/files
-     chmod o+w sites/default/files
+     chmod o+w config/default/files
 
    The install script will attempt to write-protect the settings.php file and
-   the sites/default directory after saving your configuration. However, you
+   the config/default directory after saving your configuration. However, you
    may need to manually write-protect them using the commands (from the
    installation directory):
 
-     chmod a-w sites/default/settings.php
+     chmod a-w config/default/settings.php
-     chmod a-w sites/default
+     chmod a-w config/default
 
    If you make manual changes to the file later, be sure to protect it again
    after making your modifications. Failure to remove write permissions to that
    file is a security risk. Although the default location for the settings.php
-   file is at sites/default/settings.php, it may be in another location
+   file is at config/default/settings.php, it may be in another location
    if you use the multi-site setup, as explained below.
 
 5. CONFIGURE DRUPAL
@@ -277,12 +303,12 @@ MULTISITE CONFIGURATION
 A single Drupal installation can host several Drupal-powered sites, each with
 its own individual configuration.
 
-Additional site configurations are created in subdirectories within the 'sites'
+Additional site configurations are created in subdirectories within the 'config'
 directory. Each subdirectory must have a 'settings.php' file which specifies the
 configuration settings. The easiest way to create additional sites is to copy
 the 'default' directory and modify the 'settings.php' file as appropriate. The
 new directory name is constructed from the site's URL. The configuration for
-www.example.com could be in 'sites/example.com/settings.php' (note that 'www.'
+www.example.com could be in 'config/example.com/settings.php' (note that 'www.'
 should be omitted if users can access your site at http://example.com/).
 
 Sites do not have to have a different domain. You can also use subdomains and
@@ -290,26 +316,26 @@ subdirectories for Drupal sites. For example, example.com, sub.example.com,
 and sub.example.com/site3 can all be defined as independent Drupal sites. The
 setup for a configuration such as this would look like the following:
 
-  sites/default/settings.php
+  config/default/settings.php
-  sites/example.com/settings.php
+  config/example.com/settings.php
-  sites/sub.example.com/settings.php
+  config/sub.example.com/settings.php
-  sites/sub.example.com.site3/settings.php
+  config/sub.example.com.site3/settings.php
 
 When searching for a site configuration (for example www.sub.example.com/site3),
 Drupal will search for configuration files in the following order, using the
 first configuration it finds:
 
-  sites/www.sub.example.com.site3/settings.php
+  config/www.sub.example.com.site3/settings.php
-  sites/sub.example.com.site3/settings.php
+  config/sub.example.com.site3/settings.php
-  sites/example.com.site3/settings.php
+  config/example.com.site3/settings.php
-  sites/www.sub.example.com/settings.php
+  config/www.sub.example.com/settings.php
-  sites/sub.example.com/settings.php
+  config/sub.example.com/settings.php
-  sites/example.com/settings.php
+  config/example.com/settings.php
-  sites/default/settings.php
+  config/default/settings.php
 
 If you are installing on a non-standard port, the port number is treated as the
 deepest subdomain. For example: http://www.example.com:8080/ could be loaded
-from sites/8080.www.example.com/. The port number will be removed according to
+from config/8080.www.example.com/. The port number will be removed according to
 the pattern above if no port-specific configuration is found, just like a real
 subdomain.
 
@@ -320,7 +346,7 @@ directory within the site configuration directory. For example, if
 sub.example.com has a custom theme and a custom module that should not be
 accessible to other sites, the setup would look like this:
 
-  sites/sub.example.com/:
+  config/sub.example.com/:
   settings.php
   themes/custom_theme
   modules/custom_module

install/UPGRADE.txt

@@ -13,22 +13,22 @@ Prior to upgrading, you should ensure that:
 
 Let's begin!
 
-1.  Back up your Drupal database and site root directory. Be especially sure 
+1.  Back up your Drupal database and site root directory. Be especially sure
-    to back up your "sites" directory which contains your configuration file, 
+    to back up your "config" directory which contains your configuration file,
-    added modules and themes, and your site's uploaded files. If other files 
+    added modules and themes, and your site's uploaded files. If other files
     have modifications, such as .htaccess or robots.txt, back those up as well.
 
     Note: for a single site setup, the configuration file is the "settings.php"
-    file located at sites/default/settings.php. The default.settings.php file
+    file located at config/default/settings.php. The default.settings.php file
     contains a clean copy for restoration purposes, if required.
 
     For multisite configurations, the configuration file is located in a
     structure like the following:
 
-      sites/default/settings.php
+      config/default/settings.php
-      sites/example.com/settings.php
+      config/example.com/settings.php
-      sites/sub.example.com/settings.php
+      config/sub.example.com/settings.php
-      sites/sub.example.com.path/settings.php
+      config/sub.example.com.path/settings.php
 
     More information on multisite configuration is located in INSTALL.txt.
 
@@ -52,7 +52,7 @@ Let's begin!
 
 7.  Unpack the new files and directories into the Drupal installation directory.
 
-8.  Copy your backed up "files" and "sites" directories to the Drupal
+8.  Copy your backed up "files" and "config" directories to the Drupal
     installation directory. If other system files such as .htaccess or
     robots.txt were customized, re-create the modifications in the new
     versions of the files using the backups taken in step #1.

modules/ckeditor/ckeditor.module

@@ -1047,7 +1047,7 @@ function ckeditor_process_textarea($element) {
                 foreach ($stylesheets as $name => $path) {
                   // Checks if less module exists...
                   if (strstr($path, '.less') && module_exists('less')) {
-                    $path = 'sites/default/files/less/' . $path; // append the less file path
+                    $path = 'config/default/files/less/' . $path; // append the less file path
                     $path = str_replace('.less', '', $path); // remove the .less
                   }
                   if (file_exists($path)) {
@@ -1207,11 +1207,11 @@ function ckeditor_path($local = FALSE, $refresh = FALSE) {
     $global_profile = ckeditor_profile_load('CKEditor Global Profile', $refresh);
 
     //default: path to ckeditor subdirectory in the ckeditor module directory (starting from the document root)
-    //e.g. for http://example.com/drupal it will be /drupal/sites/all/modules/ckeditor/ckeditor
+    //e.g. for http://example.com/drupal it will be /drupal/modules/ckeditor/ckeditor
     $cke_path = base_path() . $mod_path .'/ckeditor';
 
     //default: path to ckeditor subdirectory in the ckeditor module directory (relative to index.php)
-    //e.g.: sites/all/modules/ckeditor/ckeditor
+    //e.g.: modules/ckeditor/ckeditor
     $cke_local_path = $mod_path .'/ckeditor';
     if ($global_profile) {
       $gs = $global_profile->settings;
@@ -1279,11 +1279,11 @@ function ckeditor_plugins_path($local = FALSE, $refresh = FALSE) {
     $global_profile = ckeditor_profile_load('CKEditor Global Profile', $refresh);
 
     //default: path to plugins subdirectory in the ckeditor module directory (starting from the document root)
-    //e.g. for http://example.com/drupal it will be /drupal/sites/all/modules/ckeditor/plugins
+    //e.g. for http://example.com/drupal it will be /drupal/modules/ckeditor/plugins
     $cke_plugins_path = base_path() . $mod_path .'/plugins';
 
     //default: path to plugins subdirectory in the ckeditor module directory (relative to index.php)
-    //e.g.: sites/all/modules/ckeditor/plugins
+    //e.g.: modules/ckeditor/plugins
     $cke_plugins_local_path = $mod_path .'/plugins';
 
     if ($global_profile) {
@@ -1352,7 +1352,7 @@ function ckfinder_path($refresh = FALSE) {
     $global_profile = ckeditor_profile_load('CKEditor Global Profile', $refresh);
 
     //default: path to ckeditor subdirectory in the ckeditor module directory (starting from the document root)
-    //e.g. for http://example.com/drupal it will be /drupal/sites/all/modules/ckeditor/ckeditor
+    //e.g. for http://example.com/drupal it will be /drupal/modules/ckeditor/ckeditor
     $ckf_path = $mod_path . '/ckfinder';
     if ($global_profile) {
       $gs = $global_profile->settings;

modules/ckeditor_link/README.txt

@@ -11,7 +11,7 @@ Clean URLs need to be enabled.
 
 
 INSTALLATION
-Copy the ckeditor_link folder to your sites/all/modules directory.
+Copy the ckeditor_link folder to your modules directory.
 Go to admin/build/modules and enable the module.
 
 *Set permissions*

modules/content_taxonomy/README.txt

@@ -3,22 +3,22 @@ Content Taxonomy:
 
 This module provides a field type for cck for referencing taxonomy terms.
 
-The content_taxonomy.module implements all basic field functions. 
+The content_taxonomy.module implements all basic field functions.
 The other modules offer different widgets (selects,..)
 
 Installation:
 -------------
-1.  Install this files into the modules directory of your choice (for example, sites/yoursite.com/modules/content_taxonomy).
+1.  Install this files into the modules directory.
 2.  Enable content_taxonomy.module in the admin/modules page
 3.  Enable wanted widgets in admin/modules (e.g. content_taxonomy_select.module) Note: all require content_taxonomy.module!
-4.  Optional enable content_taxonomy_views.module for improved taxonomy-views support 
+4.  Optional enable content_taxonomy_views.module for improved taxonomy-views support
 
 Settings:
 ---------
-For every field you have to select the vocabulary and optional a parent term in the field settings. 
+For every field you have to select the vocabulary and optional a parent term in the field settings.
 If a parent is selected, only children of this parent will be given to the form, else the whole vocabulary.
 Additional you can choose whether the term is saved as a real tag in the term_node table (standard)
-or the term is only saved in a cck-table (so not a real term - node connection) 
+or the term is only saved in a cck-table (so not a real term - node connection)
 
 
 

modules/customerror/README.txt

@@ -28,8 +28,7 @@ accommodate future error codes easily.
 Installation:
 -------------
 
-1. Install the customerror module directory in the directory where you
+1. Install the customerror module directory in your modules directory.
-   keep contributed modules (e.g. sites/all/modules/).
 
 2. Go to the Modules page
    - Enable the customerror module.
@@ -136,16 +135,16 @@ FAQ
   - There is no need to. CustomError returns the correct HTTP status
     codes (403 and 404). This will prevent robots from indexing the
     error pages.
-	
+
 * I want to customize the custom error template output.
 
-  - In your site's theme, duplicate your page.tpl.php to be 
+  - In your site's theme, duplicate your page.tpl.php to be
     page-customerror.tpl.php and then make your modifications there.
 
 * I want to have a different template for my 404 and 403 pages.
 
-  - Duplicate your page.tpl.php page to be page-customerror-404.tpl.php 
+  - Duplicate your page.tpl.php page to be page-customerror-404.tpl.php
-    and page-customerror-403.tpl.php. You do not need a 
+    and page-customerror-403.tpl.php. You do not need a
     page-customerror.tpl.php for this to work.
 
 * Some 403 errors (e.g. "http://example.org/includes") are served by

modules/date/INSTALL.txt

@@ -7,29 +7,29 @@ Date API Installation instructions:
 
 2) Download the whole package of files from http://drupal.org/project/date.
 
-3) Upload the date files to the modules directory. The package includes files 
+3) Upload the date files to the modules directory. The package includes files
    needed by the Date API, and optional modules to to create CCK date fields.
 
-4) Go to admin/build/modules and enable the needed modules from the Date/Time group. 
+4) Go to admin/build/modules and enable the needed modules from the Date/Time group.
 
-You should end up with a structure like: 
+You should end up with a structure like:
 
-   /drupal/sites/all/modules/date/date_api.info
+   /drupal/modules/date/date_api.info
-   /drupal/sites/all/modules/date/date_api.install
+   /drupal/modules/date/date_api.install
-   /drupal/sites/all/modules/date/date_api.module
+   /drupal/modules/date/date_api.module
    ...
 
-   /drupal/sites/all/modules/date/date/date.info
+   /drupal/modules/date/date/date.info
-   /drupal/sites/all/modules/date/date/date.install
+   /drupal/modules/date/date/date.install
-   /drupal/sites/all/modules/date/date/date.module
+   /drupal/modules/date/date/date.module
    ...
 
-   /drupal/sites/all/modules/date/date_copy/date_copy.info
+   /drupal/modules/date/date_copy/date_copy.info
-   /drupal/sites/all/modules/date/date_copy/date_copy.module
+   /drupal/modules/date/date_copy/date_copy.module
    ...
 
-   /drupal/sites/all/modules/date/date_php4/date_php4.inc
+   /drupal/modules/date/date_php4/date_php4.inc
-   /drupal/sites/all/modules/date/date_php4/date_php4_lib.inc
+   /drupal/modules/date/date_php4/date_php4_lib.inc
    ...
 
 ==================================================================================
@@ -37,16 +37,16 @@ Older PHP versions
 ==================================================================================
 If you are using PHP 4 or PHP 5.0 or 5.1, native date handling won't work right.
 Install the Date_PHP4 module to enable wrapper functions so this code will work
-in old PHP versions. 
+in old PHP versions.
 
 ==================================================================================
 Enable Date Timezone
 ==================================================================================
 In most cases, you should enable the Date Timezone module any time you use the
-Date API to be able to set the site and user timezone names. It is not enabled by 
+Date API to be able to set the site and user timezone names. It is not enabled by
 default in case another module is setting timezone names in the database.
 
-Once you have enabled it, go to admin/settings/date-time and set the default 
+Once you have enabled it, go to admin/settings/date-time and set the default
 site timezone name. If you are using user timezones, go to your account settings
 and set up your own timezone name.
 
@@ -68,4 +68,4 @@ Install CCK Date Fields:
 
 ==================================================================================
 More documentation is available at http://drupal.org/node/92460.
-==================================================================================   
+==================================================================================

modules/filefield/UPGRADE.txt

@@ -13,7 +13,7 @@ Upgrading from Drupal 5
 
 2) After ensure FileField 2.3 or higher is on your Drupal 5 site, upgrade your
    site normally to Drupal 6. Download the latest version of FileField for
-   Drupal 6 and place it in your sites/all/modules directory.
+   Drupal 6 and place it in your modules directory.
 
 3) Run update.php on your Drupal 6 site to upgrade FileField to the latest
    database schema.
@@ -22,8 +22,8 @@ Upgrading from Drupal 5
 Upgrading from any previous Drupal 6 version
 --------------------------------------------
 
-1) Download the latest version of FileField and the filefield directory in
+1) Download the latest version of FileField and put the filefield directory in
-   sites/all/modules.
+   modules.
 
 2) Visit update.php on your site and run the update.
 

modules/geshifilter/README.txt

@@ -22,7 +22,7 @@ See installation procedure below for more information.
 INSTALLATION
 ------------
 1. Extract the GeSHi Filter module tarball and place the entire geshifilter
-  directory into your Drupal setup (e.g. in sites/all/modules).
+  directory into your Drupal modules directory.
 
 2. Download the GeSHi library from
   http://sourceforge.net/projects/geshi/files/geshi
@@ -30,8 +30,7 @@ INSTALLATION
   from the branch 1.1.x (also described as geshi-dev), which is not yet
   supported by the GeSHi filter module.
   Place the entire extracted 'geshi' folder (which contains geshi.php)
-  in the geshifilter directory (e.g. as sites/all/modules/geshifilter/geshi),
+  in the libraries directory (e.g. as libraries/geshi).
-  or better, in a libraries directory (e.g. as libraries/geshi).
 
 3. Enable this module as any other Drupal module by navigating to
   administer > site building > modules

modules/htmlpurifier/INSTALL.txt

@@ -8,7 +8,7 @@ and it's nice to have dom and iconv.
 * Download HTML Purifier from http://htmlpurifier.org/ You will need
   4.0.0 or later.
 
-* There are two possible ways to install the HTML Purifier library. 
+* There are two possible ways to install the HTML Purifier library.
 
   1. Module directory installation. This means installing the library
      folder under the module directory. This way has the advantage of
@@ -24,14 +24,12 @@ and it's nice to have dom and iconv.
      and enable it before enabling the htmlpurifier module so that in
      the install phase it can find the library.
 
-     Extract the library folder to sites/all/libraries or to
+     Extract the library folder to libraries directory.
-     sites/<site>/libraries for a specific site in a multisite Drupal
-     setup.
 
      The final setup should be, when making the library and module
      available to all sites:
 
-     sites/all/libraries/htmlpurifier/
+     libraries/htmlpurifier/
          HTMLPurifier
          HTMLPurifier.autoload.php
          HTMLPurifier.auto.php
@@ -44,11 +42,11 @@ and it's nice to have dom and iconv.
 
      Now you can safely upgrade your htmlpurifier module without
      having to re-deploy the HTML Purifier library.
-         
+
 * Go to Administer > Site building > Modules and enable this module
 
-* You can now create a new input format or add the HTML Purifier to an 
+* You can now create a new input format or add the HTML Purifier to an
-  existing input format. It is recommended that you place HTML Purifier as 
+  existing input format. It is recommended that you place HTML Purifier as
   the last filter in the input format. Reorder the filters if necessary.
 
 WARNING: Due to HTML Purifier's caching mechanism, dynamic filters MUST NOT

modules/i18n/INSTALL.txt

@@ -15,7 +15,7 @@ Updated documentation will be kept on-line at http://drupal.org/node/133977
 INSTALLATION:
 ============
 
-1. Create folder 'sites/all/modules/i18n' and copy all the modules files, keeping directory structure, to this folder.
+1. Create folder 'modules/i18n' and copy all the modules files, keeping directory structure, to this folder.
 2. If updating, run the update.php script following the standard procedure for Drupal updates.
 
 POST-INSTALLATION/CONFIGURATION:

modules/jquery_ui/README.txt

@@ -22,8 +22,8 @@ To submit bug reports and feature suggestions, or to track changes:
 
 -- INSTALLATION --
 
-* Copy the jquery_ui module directory to your sites/all/modules directory, so it
+* Copy the jquery_ui module directory to your modules directory, so it
-  is located in sites/all/modules/jquery_ui/.
+  is located in modules/jquery_ui/.
 
 * Download the jQuery UI 1.6 release from:
 

modules/lexicon/README.txt

@@ -6,18 +6,18 @@ http://www.drupal.org/project/lexicon
 
 DESCRIPTION
 -----------
-A lexicon is a stock of terms used in a particular profession, subject or style; a vocabulary. 
+A lexicon is a stock of terms used in a particular profession, subject or style; a vocabulary.
-The Lexicon module generates one or more Lexicon pages based on terms in taxonomies and optionally 
+The Lexicon module generates one or more Lexicon pages based on terms in taxonomies and optionally
 marks and links them in the content.
 
-The Lexicon module is a branch of the Glossary module (http://www.drupal.org/project/glossary) that 
+The Lexicon module is a branch of the Glossary module (http://www.drupal.org/project/glossary) that
-was changed to suit the needs of a project for the Dutch government. The main reason for the changes 
+was changed to suit the needs of a project for the Dutch government. The main reason for the changes
 is compliancy with the web guidelines of the Dutch government (http://www.webguidelines.nl).
 
 The main differences with the Glossary module are that the Lexicon module:
 
     * Produces output that is valid W3C XHTML 1.0 Strict.
-    * Enables showing lists of terms without marking the terms in content (this is still an option). 
+    * Enables showing lists of terms without marking the terms in content (this is still an option).
       You can choose which vocabularies act as Lexicons and you don't bind them to input filters.
     * Has configurable paths and titles for each Lexicon.
     * Optionally inserts a "go to top" link for each section on the Lexicon page.
@@ -34,7 +34,7 @@ Taxonomy
 
 INSTALLING
 ----------
-1. To install the module copy the 'lexicon' folder to your sites/all/modules directory.
+1. To install the module copy the 'lexicon' folder to your modules directory.
 
 2. Go to admin/build/modules. Enable the Lexicon module.
 Read more about installing modules at http://drupal.org/node/70151
@@ -50,4 +50,4 @@ CONFIGURING AND USING
 6. Optionally set the paths and titles of the Lexicons and save the configuration.
 7. Optionally put the suggested menu-items in the right menu and activate them.
 
-Have fun!
+Have fun!

modules/linkchecker/README.txt

@@ -28,7 +28,7 @@ Required:
    reported as broken and cannot verified as they should be.
 
    To make sure it always works - it's required to configure the $base_url in
-   the sites settings.php with your public sites URL. Better safe than sorry!
+   the config settings.php with your public sites URL. Better safe than sorry!
 
 
 Known issues:
@@ -37,7 +37,7 @@ There are a lot of known issues in drupal_http_request(). These have been solved
 in HTTPRL. As a workaround it's recommended to use HTTPRL in linkchecker.
 
 Issues list:
- 
+
 * #997648: drupal_http_request() always calls fread() one more time than necessary
 * #164365-12: drupal_http_request() does handle (invalid) non-absolute redirects
 * #205969-11: drupal_http_request() assumes presence of Reason-Phrase in response Status-Line

modules/node_clone/README.txt

@@ -43,10 +43,10 @@ CCK field-level permissions hooks. You should test your configuration
 carefully or not allow access to the clone functionality for non-admins if
 you rely on field-level permissions for important site features.
 
-To install this module, copy the folder with all the files to the
+To install this module, copy the folder with all the files to the modules
-/sites/all/modules  OR /sites/default/modules directory of your Drupal
+directory of your Drupal installation and enable it at /admin/build/modules. Two
-installation and enable it at /admin/build/modules.  Two new permissions are
+new permissions are available, but there are no changes to the database
-available, but there are no changes to the database structure.
+structure.
 
 Note: this module originally derived from code posted by Steve Ringwood
 (nevets@drupal) at http://drupal.org/node/73381#comment-137714

modules/path_alias_xt/README.txt

@@ -7,18 +7,18 @@ user-friendly page aliases not only to the base URL, e.g. "about-us" (for
 "node/123"), but also to any of the common extensions of the base URL, e.g.
 "about-us/edit", "about-us/track", "about-us/revisions*" etc.
 
-The extended aliases may also be used when specifying visibility control for 
+The extended aliases may also be used when specifying visibility control for
 blocks (e.g. "about-us*"), or in fact anywhere where you are prompted to
 specify pages to include or exclude.
-NOTE: It is for this feature that you need to follow the INSTALLATION 
+NOTE: It is for this feature that you need to follow the INSTALLATION
-instructions below. If don't care about this feature just enable the module at 
+instructions below. If don't care about this feature just enable the module at
 Administer >> Site building >> Modules and you're away.
 
 Requiring no configuration, the module then makes sure that these user-friendly
 (and SEO-friendly) aliases are shown everywhere, replacing their system-
 generated equivalents, whether it's in the browser address bar or on
 the page itself. Examples are the Edit, Track, Revisions etc. tabs, the page
-statistics pages as well as any other links on your pages. No more ugly URLs 
+statistics pages as well as any other links on your pages. No more ugly URLs
 like node/123/revisons/456/view or user/7/track.
 
 All of this makes everyone's user experience just that little more convenient
@@ -33,7 +33,7 @@ INSTALLATION
 
    With your runkit in place proceed with either step a) or b) (preferred).
 
-   a) In file path_alias_xt, find the line //dl('runkit.so'). Remove the 
+   a) In file path_alias_xt, find the line //dl('runkit.so'). Remove the
    leading double slashes.
    Or
    b) Edit your php.ini. You can use drupal page /admin/reports/status/php to
@@ -42,7 +42,7 @@ INSTALLATION
    Add this line to the other extension lines in your php.ini:
 
      extension = runkit.so
-   
+
    Note: for Windows the correct line is "extension = php_runkit.dll".
    By the way, while you're down there, check that your php.ini has:
 
@@ -53,7 +53,7 @@ INSTALLATION
    least display a clue as to what's going on.
 
 1. As with any other module, uncompress the tar-ball, path_alias_xt.tar.gz, into
-   the "sites/all/modules" subdirectory.
+   the "modules" subdirectory.
 2. Just in case, if you are installing to a live site, put the site off-line at
    Site configuration >> Site maintenance. You will only need about 60 seconds.
 3. Visit Site building >> Modules to enable the path_alias_xt module. Press
@@ -64,7 +64,7 @@ INSTALLATION
    either step 4a or 4b.
 
 4a.If you have placed the runkit extension in the /extension directory and have
-   edited your php.ini as per step 0b, you now restart your Drupal stack (or 
+   edited your php.ini as per step 0b, you now restart your Drupal stack (or
    just Apache). If you did step 0a, no restart should be necessary.
    In either case, verify the runkit has been loaded at /admin/reports/status or
    at /admin/reports/status/php.
@@ -169,5 +169,5 @@ should match this by default. You can verify the active "extension_dir" on the
 
 Windows
 -------
-To compile a PECL extension on Windows see for instance: 
+To compile a PECL extension on Windows see for instance:
 http://blog.renangoncalves.com/2010/01/15/how-to-compile-a-pecl-extension-on-windows

modules/pathauto/INSTALL.txt

@@ -6,8 +6,7 @@ Pathauto also relies on the Token module, which must be downloaded and
 enabled separately.
 
 1. Unpack the Pathauto folder and contents in the appropriate modules
-directory of your Drupal installation.  This is probably
+directory of your Drupal installation.
-  sites/all/modules/
 2. Enable the Pathauto module in the administration tools.
 3. If you're not using Drupal's default administrative account, make
 sure "administer pathauto" is enabled through access control administration.
@@ -16,14 +15,14 @@ sure "administer pathauto" is enabled through access control administration.
    For 6.x: Administer > Site building > URL alias > Automated alias settings
 
 **Transliteration support:
-If you desire transliteration support in the creation of URLs (e.g. the 
+If you desire transliteration support in the creation of URLs (e.g. the
-replacement of À with A) then you will need to rename the file 
+replacement of À with A) then you will need to rename the file
-i18n-ascii.example.txt to i18n-ascii.txt 
+i18n-ascii.example.txt to i18n-ascii.txt
 
-You can then freely edit the i18n-ascii.txt without worrying that your changes 
+You can then freely edit the i18n-ascii.txt without worrying that your changes
 will be over-written by upgrades of Pathauto.
 
-For details on how to transliterate any UTF8 character, please see the full 
+For details on how to transliterate any UTF8 character, please see the full
 i18n-ascii-fill.txt file information at http://drupal.org/node/185664
 
 **Upgrading from previous versions:
@@ -47,4 +46,3 @@ Upgrade to 6.x:
 Note that the settings page has moved so that it is more logically grouped with
 other URL alias related items under
   Administer > Site building > URL alias > Automated alias settings
-

modules/pathauto/pathauto.inc

@@ -717,7 +717,6 @@ function _pathauto_get_i18n_possible_files() {
   $file = 'i18n-ascii.txt';
   $files = array(
     conf_path() . '/' . $file,
-    "sites/all/$file",
     drupal_get_path('module', 'pathauto') . '/' . $file,
   );
   // Always prefer $conf['pathauto_i18n_file'] if defined.

modules/print/INSTALL.txt

@@ -2,8 +2,7 @@ INSTALLATION
 ------------
 
 Decompress the print-n.x-n.n.tar.gz file into your Drupal modules
-directory (usually sites/all/modules, see http://drupal.org/node/176044 for
+directory.
-more information).
 
 Enable the print module: Administer > Site building > Modules
   (admin/build/modules)
@@ -18,7 +17,7 @@ their maintainers.  DO NOT report bugs in those tools in the print module's
 issue queue at Drupal.org.
 
 supported paths:
-  * print module lib directory (usually sites/all/modules/print/lib)
+  * print module lib directory (usually modules/print/lib)
   * libraries directory (libraries)
 
 dompdf support:
@@ -65,8 +64,7 @@ wkhtmltopdf support:
   version may require a running X server (static uses patched libs that can
   work without one).
   2. Place the wkhtmltopdf executable into one of the supported paths.
-  (usually sites/all/modules/print/lib).  You can also place a symbolic link
+  (usually libraries). You can also place a symbolic link to the executable.
-  to the executable.
   3. Check http://code.google.com/p/wkhtmltopdf/ for further information.
 
 UPDATE

modules/search_restrict/README.txt

@@ -9,8 +9,8 @@ DESCRIPTION:
 
 Restrict by role who can search for each content type.
 
-Approach of this module is to re-write the search query, so that 
+Approach of this module is to re-write the search query, so that
-content is indexed and available as search results to users in role(s) 
+content is indexed and available as search results to users in role(s)
 that have permissions to view it, but not displayed to other roles.
 
 ********************************************************************
@@ -28,16 +28,15 @@ check the Drupal web site if you need assistance.  If you run into
 problems, you should always read the INSTALL.txt that comes with the
 Drupal package and read the online documentation.
 
-1. Place the entire module directory into your Drupal directory:
+1. Place the entire module directory into your Drupal modules directory.
-   sites/all/modules/
    
 
 2. Enable the module modules by navigating to:
 
    administer > build > modules
-     
+
   Click the 'Save configuration' button at the bottom to commit your
-  changes. 
+  changes.
 
 
 
@@ -62,6 +61,4 @@ Initial development sponsored by Greenpeace UK <http://www.greenpeace.org.uk>
 
 Drupal 6 update by:
 Hans Nilsson (Blackdog) <http://drupal.org/user/110169>
-Daniel F. Kudwien (Sun) <http://drupal.org/user/54136> 
+Daniel F. Kudwien (Sun) <http://drupal.org/user/54136>
-
-

modules/search_restrict/search_restrict_apache_solr/README.txt

@@ -26,16 +26,15 @@ check the Drupal web site if you need assistance.  If you run into
 problems, you should always read the INSTALL.txt that comes with the
 Drupal package and read the online documentation.
 
-1. Place the entire module directory into your Drupal directory:
+1. Place the entire module directory into your Drupal modules directory.
-   sites/all/modules/
    
 
 2. Enable the module modules by navigating to:
 
    administer > build > modules
-     
+
   Click the 'Save configuration' button at the bottom to commit your
-  changes. 
+  changes.
 
 
 
@@ -54,7 +53,3 @@ Write tests
 
 ********************************************************************
 ACKNOWLEDGEMENT
-
-
-
-

modules/storm/documentation/INSTALL.txt

@@ -3,7 +3,7 @@ Storm module for Drupal 6.x
 
 INSTALLATION:
 
-1) Copy this 'storm' directory into the /sites/all/modules directory of your Drupal installation.
+1) Copy this 'storm' directory into the modules directory of your Drupal installation.
 (Multisite installations may wish to use a different directory - see http://drupal.org/node/53705)
 
 2) Enable Storm (and whatever submodules of Storm that you wish), by visiting http://example.com/admin/build/modules. You will (almost) always need 'Storm', 'Storm Attribute' and 'Storm Organization'.
@@ -15,7 +15,7 @@ CONFIGURATION:
 
 - Set up permissions: Initially, it is recommended that you allow full access for your administrative role, and allow more once you are familiar with the system.
 
-- There are a number of settings forms linked from http://example.com/admin/settings/storm. After installation, you should visit these pages and 
+- There are a number of settings forms linked from http://example.com/admin/settings/storm. After installation, you should visit these pages and
 
 - Storm Attribute: This module gives additional settings for allowed field values, and values you can search for on the lists. In later versions of Storm, this may become part of the standard settings forms.
 

modules/view_revisions_by_content_type/README.txt

@@ -10,10 +10,7 @@ Developed for http://driverpacks.net/
 
 Installation
 ------------
-1) Place this module directory in your "modules" folder (this will usually be
+1) Place this module directory in your "modules" folder.
-   "sites/all/modules/"). Don't install your module in Drupal core's "modules"
-   folder, since that will cause problems and is bad practice in general. If
-   "sites/all/modules" doesn't exist yet, just create it.
 
 2) Enable the module.
 

modules/views/README.txt

@@ -1,13 +1,13 @@
 
 Welcome to Views 2. Please see the advanced help for more information.
 
-If you're having trouble installing this module, please ensure that your 
+If you're having trouble installing this module, please ensure that your
 tar program is not flattening the directory tree, truncating filenames
 or losing files.
 
 Installing Views:
 
-Place the entirety of this directory in sites/all/modules/views
+Place the entirety of this directory in modules/views
 
 Navigate to administer >> build >> modules. Enable Views and Views UI.
 
@@ -24,4 +24,4 @@ Recommended modules for use with Views:
   Views Bulk Operations
 
 Experimental modules:
-  Views OR
+  Views OR

modules/views/help/api-default-views.html

@@ -1,7 +1,7 @@
 Views can be stored in the database, which is typical of smaller sites and hobby sites. However, Views may also be stored directly in the code as "default" views, (which simply means they're available by default). Modules often come with views that are specific to the module data, but it's also possible -- and <b>highly</b> recommended -- that sites which have separate "development" and "production" sites export their views into default views in a site-specific module. This makes it very easy to transfer views from dev to production without making database changes.
 
 <h3>Creating a module</h3>
-First, create a directory in <em>sites/all/modules</em> for your new module. Call it whatever you like, but for this example we will call it <em>mymodule</em>.
+First, create a directory in <em>modules</em> for your new module. Call it whatever you like, but for this example we will call it <em>mymodule</em>.
 
 In this directory, create a <em>mymodule.module</em> file. It can be empty for now, but it should at least contain an opening PHP tag:
 <pre>&lt;?php
@@ -90,8 +90,8 @@ Be sure to use the right arguments line or the theme system will not properly tr
       ),
 </pre>
 
-  The first one is the global 'template_preprocess' function which all templates utilize. It does some basic things such as setting up $zebra and a few other items. See <a href="http://api.drupal.org/api/function/template_preprocess/6">api.drupal.org</a> for specifics. 
+  The first one is the global 'template_preprocess' function which all templates utilize. It does some basic things such as setting up $zebra and a few other items. See <a href="http://api.drupal.org/api/function/template_preprocess/6">api.drupal.org</a> for specifics.
-  
+
   The second one is the plugin specific preprocess. Like 'original hook' it should conform to the name used by the original template. i.e, if the original template was <em>views-view-list.tpl.php</em> then that preprocess function would be named <em>template_preprocess_views_view_list</em>.
 
   The third one is your module's preprocess function, if it needs one. In general, you probably will not need one, and you should only attempt to use one if you are reasonably familiar with the concept of preprocess functions and Drupal's theme system in general. See Drupal's theme documentation for more information.
@@ -102,4 +102,3 @@ Be sure to use the right arguments line or the theme system will not properly tr
   If you leave the path blank the template file will be searched for in "./" which is the Drupal install base path.
 </li>
 </ol>
-

modules/watcher/README.txt

@@ -53,8 +53,7 @@ To install Watcher, do the following:
   2. Download the latest stable version of Watcher from its project
      page: http://drupal.org/project/watcher
 
-  3. Unpack the file you downloaded into sites/all/modules or the
+  3. Unpack the file you downloaded into the modules directory of your site.
-     modules directory of your site.
 
   4. Go to Administer » Site building » Modules and enable the module.
 
@@ -250,4 +249,4 @@ and feedback.
 
 Some of the icons were either taken directly from the Tango Icon Library or were
 derived from Tango icons.
-http://tango.freedesktop.org/
+http://tango.freedesktop.org/