diff --git a/manual/new/docs/.htaccess b/manual/docs/.htaccess similarity index 100% rename from manual/new/docs/.htaccess rename to manual/docs/.htaccess diff --git a/manual/new/docs/en.txt b/manual/docs/en.txt similarity index 100% rename from manual/new/docs/en.txt rename to manual/docs/en.txt diff --git a/manual/new/docs/en/_old-docs/Configuration - Custom getters and setters.php b/manual/docs/en/_old-docs/Configuration - Custom getters and setters.php similarity index 100% rename from manual/new/docs/en/_old-docs/Configuration - Custom getters and setters.php rename to manual/docs/en/_old-docs/Configuration - Custom getters and setters.php diff --git a/manual/new/docs/en/_old-docs/Configuration - Custom primary key column.php b/manual/docs/en/_old-docs/Configuration - Custom primary key column.php similarity index 100% rename from manual/new/docs/en/_old-docs/Configuration - Custom primary key column.php rename to manual/docs/en/_old-docs/Configuration - Custom primary key column.php diff --git a/manual/new/docs/en/_old-docs/Configuration - List of attributes.php b/manual/docs/en/_old-docs/Configuration - List of attributes.php similarity index 100% rename from manual/new/docs/en/_old-docs/Configuration - List of attributes.php rename to manual/docs/en/_old-docs/Configuration - List of attributes.php diff --git a/manual/new/docs/en/_old-docs/Configuration - Setting default eventlistener.php b/manual/docs/en/_old-docs/Configuration - Setting default eventlistener.php similarity index 100% rename from manual/new/docs/en/_old-docs/Configuration - Setting default eventlistener.php rename to manual/docs/en/_old-docs/Configuration - Setting default eventlistener.php diff --git a/manual/new/docs/en/_old-docs/Configuration - Setting default fetchmode.php b/manual/docs/en/_old-docs/Configuration - Setting default fetchmode.php similarity index 100% rename from manual/new/docs/en/_old-docs/Configuration - Setting default fetchmode.php rename to manual/docs/en/_old-docs/Configuration - Setting default fetchmode.php diff --git a/manual/new/docs/en/_old-docs/Configuration - Using sequences.php b/manual/docs/en/_old-docs/Configuration - Using sequences.php similarity index 100% rename from manual/new/docs/en/_old-docs/Configuration - Using sequences.php rename to manual/docs/en/_old-docs/Configuration - Using sequences.php diff --git a/manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Contains.php b/manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Contains.php similarity index 100% rename from manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Contains.php rename to manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Contains.php diff --git a/manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Like.php b/manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Like.php similarity index 100% rename from manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Like.php rename to manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Like.php diff --git a/manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Regexp.php b/manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Regexp.php similarity index 100% rename from manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Regexp.php rename to manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Functions - Regexp.php diff --git a/manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Operators - Logical operators.php b/manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Operators - Logical operators.php similarity index 100% rename from manual/new/docs/en/_old-docs/DQL (Doctrine Query Language) - Operators - Logical operators.php rename to manual/docs/en/_old-docs/DQL (Doctrine Query Language) - Operators - Logical operators.php diff --git a/manual/new/docs/en/_old-docs/Database operations - Limit and offset.php b/manual/docs/en/_old-docs/Database operations - Limit and offset.php similarity index 100% rename from manual/new/docs/en/_old-docs/Database operations - Limit and offset.php rename to manual/docs/en/_old-docs/Database operations - Limit and offset.php diff --git a/manual/new/docs/en/_old-docs/Database operations - Nested transactions.php b/manual/docs/en/_old-docs/Database operations - Nested transactions.php similarity index 100% rename from manual/new/docs/en/_old-docs/Database operations - Nested transactions.php rename to manual/docs/en/_old-docs/Database operations - Nested transactions.php diff --git a/manual/new/docs/en/_old-docs/Database operations - Query logging.php b/manual/docs/en/_old-docs/Database operations - Query logging.php similarity index 100% rename from manual/new/docs/en/_old-docs/Database operations - Query logging.php rename to manual/docs/en/_old-docs/Database operations - Query logging.php diff --git a/manual/new/docs/en/_old-docs/Database operations - Sequences.php b/manual/docs/en/_old-docs/Database operations - Sequences.php similarity index 100% rename from manual/new/docs/en/_old-docs/Database operations - Sequences.php rename to manual/docs/en/_old-docs/Database operations - Sequences.php diff --git a/manual/new/docs/en/_old-docs/Database operations - Transactions.php b/manual/docs/en/_old-docs/Database operations - Transactions.php similarity index 100% rename from manual/new/docs/en/_old-docs/Database operations - Transactions.php rename to manual/docs/en/_old-docs/Database operations - Transactions.php diff --git a/manual/new/docs/en/_old-docs/Object relational mapping - Relations - Composites and aggregates.php b/manual/docs/en/_old-docs/Object relational mapping - Relations - Composites and aggregates.php similarity index 100% rename from manual/new/docs/en/_old-docs/Object relational mapping - Relations - Composites and aggregates.php rename to manual/docs/en/_old-docs/Object relational mapping - Relations - Composites and aggregates.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Association.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Association.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Association.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Association.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Batch.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Batch.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Batch.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Batch.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Immediate.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Immediate.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Immediate.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Immediate.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Lazy.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Lazy.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Lazy.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Collection_Lazy.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_ForeignKey.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_ForeignKey.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_ForeignKey.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_ForeignKey.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Manager.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Manager.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Manager.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Manager.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Record.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Record.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Record.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Record.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Session.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Session.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Session.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Session.php diff --git a/manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Table.php b/manual/docs/en/_old-docs/Runtime classes - Doctrine_Table.php similarity index 100% rename from manual/new/docs/en/_old-docs/Runtime classes - Doctrine_Table.php rename to manual/docs/en/_old-docs/Runtime classes - Doctrine_Table.php diff --git a/manual/new/docs/en/_old-docs/Schema reference - Data types - Array.php b/manual/docs/en/_old-docs/Schema reference - Data types - Array.php similarity index 100% rename from manual/new/docs/en/_old-docs/Schema reference - Data types - Array.php rename to manual/docs/en/_old-docs/Schema reference - Data types - Array.php diff --git a/manual/new/docs/en/_old-docs/Schema reference - Foreign keys - Introduction.php b/manual/docs/en/_old-docs/Schema reference - Foreign keys - Introduction.php similarity index 100% rename from manual/new/docs/en/_old-docs/Schema reference - Foreign keys - Introduction.php rename to manual/docs/en/_old-docs/Schema reference - Foreign keys - Introduction.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Collection - Fetching strategies.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Collection - Fetching strategies.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Collection - Fetching strategies.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Collection - Fetching strategies.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Aggregate functions.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - Aggregate functions.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Aggregate functions.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - Aggregate functions.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Bound parameters.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - Bound parameters.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Bound parameters.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - Bound parameters.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - DQL - SQL conversion.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - DQL - SQL conversion.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - DQL - SQL conversion.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - DQL - SQL conversion.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Fetching strategies.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - Fetching strategies.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Fetching strategies.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - Fetching strategies.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Lazy property fetching.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - Lazy property fetching.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Lazy property fetching.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - Lazy property fetching.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Method overloading.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - Method overloading.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Method overloading.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - Method overloading.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Relation operators.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Query - Relation operators.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Query - Relation operators.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Query - Relation operators.php diff --git a/manual/new/docs/en/_old-docs/Working with objects - Component overview - Record - Adding records.php b/manual/docs/en/_old-docs/Working with objects - Component overview - Record - Adding records.php similarity index 100% rename from manual/new/docs/en/_old-docs/Working with objects - Component overview - Record - Adding records.php rename to manual/docs/en/_old-docs/Working with objects - Component overview - Record - Adding records.php diff --git a/manual/new/docs/en/basic-schema-mapping.txt b/manual/docs/en/basic-schema-mapping.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping.txt rename to manual/docs/en/basic-schema-mapping.txt diff --git a/manual/new/docs/en/basic-schema-mapping/columns.txt b/manual/docs/en/basic-schema-mapping/columns.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/columns.txt rename to manual/docs/en/basic-schema-mapping/columns.txt diff --git a/manual/new/docs/en/basic-schema-mapping/columns/column-aliases.txt b/manual/docs/en/basic-schema-mapping/columns/column-aliases.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/columns/column-aliases.txt rename to manual/docs/en/basic-schema-mapping/columns/column-aliases.txt diff --git a/manual/new/docs/en/basic-schema-mapping/columns/column-naming.txt b/manual/docs/en/basic-schema-mapping/columns/column-naming.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/columns/column-naming.txt rename to manual/docs/en/basic-schema-mapping/columns/column-naming.txt diff --git a/manual/new/docs/en/basic-schema-mapping/columns/data-types.txt b/manual/docs/en/basic-schema-mapping/columns/data-types.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/columns/data-types.txt rename to manual/docs/en/basic-schema-mapping/columns/data-types.txt diff --git a/manual/new/docs/en/basic-schema-mapping/columns/default-values.txt b/manual/docs/en/basic-schema-mapping/columns/default-values.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/columns/default-values.txt rename to manual/docs/en/basic-schema-mapping/columns/default-values.txt diff --git a/manual/new/docs/en/basic-schema-mapping/constraints-and-validators.txt b/manual/docs/en/basic-schema-mapping/constraints-and-validators.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/constraints-and-validators.txt rename to manual/docs/en/basic-schema-mapping/constraints-and-validators.txt diff --git a/manual/new/docs/en/basic-schema-mapping/indexes.txt b/manual/docs/en/basic-schema-mapping/indexes.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/indexes.txt rename to manual/docs/en/basic-schema-mapping/indexes.txt diff --git a/manual/new/docs/en/basic-schema-mapping/introduction.txt b/manual/docs/en/basic-schema-mapping/introduction.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/introduction.txt rename to manual/docs/en/basic-schema-mapping/introduction.txt diff --git a/manual/new/docs/en/basic-schema-mapping/record-identifiers.txt b/manual/docs/en/basic-schema-mapping/record-identifiers.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/record-identifiers.txt rename to manual/docs/en/basic-schema-mapping/record-identifiers.txt diff --git a/manual/new/docs/en/basic-schema-mapping/table-and-class-naming.txt b/manual/docs/en/basic-schema-mapping/table-and-class-naming.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/table-and-class-naming.txt rename to manual/docs/en/basic-schema-mapping/table-and-class-naming.txt diff --git a/manual/new/docs/en/basic-schema-mapping/table-options.txt b/manual/docs/en/basic-schema-mapping/table-options.txt similarity index 100% rename from manual/new/docs/en/basic-schema-mapping/table-options.txt rename to manual/docs/en/basic-schema-mapping/table-options.txt diff --git a/manual/new/docs/en/caching.txt b/manual/docs/en/caching.txt similarity index 100% rename from manual/new/docs/en/caching.txt rename to manual/docs/en/caching.txt diff --git a/manual/new/docs/en/caching/configuration.txt b/manual/docs/en/caching/configuration.txt similarity index 100% rename from manual/new/docs/en/caching/configuration.txt rename to manual/docs/en/caching/configuration.txt diff --git a/manual/new/docs/en/caching/introduction.txt b/manual/docs/en/caching/introduction.txt similarity index 100% rename from manual/new/docs/en/caching/introduction.txt rename to manual/docs/en/caching/introduction.txt diff --git a/manual/new/docs/en/caching/overview.txt b/manual/docs/en/caching/overview.txt similarity index 100% rename from manual/new/docs/en/caching/overview.txt rename to manual/docs/en/caching/overview.txt diff --git a/manual/new/docs/en/class-templates.txt b/manual/docs/en/class-templates.txt similarity index 100% rename from manual/new/docs/en/class-templates.txt rename to manual/docs/en/class-templates.txt diff --git a/manual/new/docs/en/coding-standards.txt b/manual/docs/en/coding-standards.txt similarity index 100% rename from manual/new/docs/en/coding-standards.txt rename to manual/docs/en/coding-standards.txt diff --git a/manual/new/docs/en/coding-standards/coding-style.txt b/manual/docs/en/coding-standards/coding-style.txt similarity index 100% rename from manual/new/docs/en/coding-standards/coding-style.txt rename to manual/docs/en/coding-standards/coding-style.txt diff --git a/manual/new/docs/en/coding-standards/naming-conventions.txt b/manual/docs/en/coding-standards/naming-conventions.txt similarity index 100% rename from manual/new/docs/en/coding-standards/naming-conventions.txt rename to manual/docs/en/coding-standards/naming-conventions.txt diff --git a/manual/new/docs/en/coding-standards/overview.txt b/manual/docs/en/coding-standards/overview.txt similarity index 100% rename from manual/new/docs/en/coding-standards/overview.txt rename to manual/docs/en/coding-standards/overview.txt diff --git a/manual/new/docs/en/coding-standards/php-file-formatting.txt b/manual/docs/en/coding-standards/php-file-formatting.txt similarity index 100% rename from manual/new/docs/en/coding-standards/php-file-formatting.txt rename to manual/docs/en/coding-standards/php-file-formatting.txt diff --git a/manual/new/docs/en/coding-standards/testing.txt b/manual/docs/en/coding-standards/testing.txt similarity index 100% rename from manual/new/docs/en/coding-standards/testing.txt rename to manual/docs/en/coding-standards/testing.txt diff --git a/manual/new/docs/en/configuration.txt b/manual/docs/en/configuration.txt similarity index 100% rename from manual/new/docs/en/configuration.txt rename to manual/docs/en/configuration.txt diff --git a/manual/new/docs/en/configuration/introduction.txt b/manual/docs/en/configuration/introduction.txt similarity index 100% rename from manual/new/docs/en/configuration/introduction.txt rename to manual/docs/en/configuration/introduction.txt diff --git a/manual/new/docs/en/configuration/levels-of-configuration.txt b/manual/docs/en/configuration/levels-of-configuration.txt similarity index 100% rename from manual/new/docs/en/configuration/levels-of-configuration.txt rename to manual/docs/en/configuration/levels-of-configuration.txt diff --git a/manual/new/docs/en/configuration/setting-attributes.txt b/manual/docs/en/configuration/setting-attributes.txt similarity index 100% rename from manual/new/docs/en/configuration/setting-attributes.txt rename to manual/docs/en/configuration/setting-attributes.txt diff --git a/manual/new/docs/en/connection-management.txt b/manual/docs/en/connection-management.txt similarity index 100% rename from manual/new/docs/en/connection-management.txt rename to manual/docs/en/connection-management.txt diff --git a/manual/new/docs/en/connection-management/connection-component-binding.txt b/manual/docs/en/connection-management/connection-component-binding.txt similarity index 100% rename from manual/new/docs/en/connection-management/connection-component-binding.txt rename to manual/docs/en/connection-management/connection-component-binding.txt diff --git a/manual/new/docs/en/connection-management/dsn-the-data-source-name.txt b/manual/docs/en/connection-management/dsn-the-data-source-name.txt similarity index 100% rename from manual/new/docs/en/connection-management/dsn-the-data-source-name.txt rename to manual/docs/en/connection-management/dsn-the-data-source-name.txt diff --git a/manual/new/docs/en/connection-management/lazy-connecting-to-database.txt b/manual/docs/en/connection-management/lazy-connecting-to-database.txt similarity index 100% rename from manual/new/docs/en/connection-management/lazy-connecting-to-database.txt rename to manual/docs/en/connection-management/lazy-connecting-to-database.txt diff --git a/manual/new/docs/en/connection-management/managing-connections.txt b/manual/docs/en/connection-management/managing-connections.txt similarity index 100% rename from manual/new/docs/en/connection-management/managing-connections.txt rename to manual/docs/en/connection-management/managing-connections.txt diff --git a/manual/new/docs/en/connection-management/opening-a-new-connection.txt b/manual/docs/en/connection-management/opening-a-new-connection.txt similarity index 100% rename from manual/new/docs/en/connection-management/opening-a-new-connection.txt rename to manual/docs/en/connection-management/opening-a-new-connection.txt diff --git a/manual/new/docs/en/data-fixtures.txt b/manual/docs/en/data-fixtures.txt similarity index 100% rename from manual/new/docs/en/data-fixtures.txt rename to manual/docs/en/data-fixtures.txt diff --git a/manual/new/docs/en/database-abstraction.txt b/manual/docs/en/database-abstraction.txt similarity index 100% rename from manual/new/docs/en/database-abstraction.txt rename to manual/docs/en/database-abstraction.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language.txt b/manual/docs/en/dql-doctrine-query-language.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language.txt rename to manual/docs/en/dql-doctrine-query-language.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/bnf.txt b/manual/docs/en/dql-doctrine-query-language/bnf.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/bnf.txt rename to manual/docs/en/dql-doctrine-query-language/bnf.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/conditional-expressions.txt b/manual/docs/en/dql-doctrine-query-language/conditional-expressions.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/conditional-expressions.txt rename to manual/docs/en/dql-doctrine-query-language/conditional-expressions.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/delete-queries.txt b/manual/docs/en/dql-doctrine-query-language/delete-queries.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/delete-queries.txt rename to manual/docs/en/dql-doctrine-query-language/delete-queries.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/examples.txt b/manual/docs/en/dql-doctrine-query-language/examples.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/examples.txt rename to manual/docs/en/dql-doctrine-query-language/examples.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/from-clause.txt b/manual/docs/en/dql-doctrine-query-language/from-clause.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/from-clause.txt rename to manual/docs/en/dql-doctrine-query-language/from-clause.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/functional-expressions.txt b/manual/docs/en/dql-doctrine-query-language/functional-expressions.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/functional-expressions.txt rename to manual/docs/en/dql-doctrine-query-language/functional-expressions.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/group-by-having-clauses.txt b/manual/docs/en/dql-doctrine-query-language/group-by-having-clauses.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/group-by-having-clauses.txt rename to manual/docs/en/dql-doctrine-query-language/group-by-having-clauses.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/indexby-keyword.txt b/manual/docs/en/dql-doctrine-query-language/indexby-keyword.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/indexby-keyword.txt rename to manual/docs/en/dql-doctrine-query-language/indexby-keyword.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/introduction.txt b/manual/docs/en/dql-doctrine-query-language/introduction.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/introduction.txt rename to manual/docs/en/dql-doctrine-query-language/introduction.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/join-syntax.txt b/manual/docs/en/dql-doctrine-query-language/join-syntax.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/join-syntax.txt rename to manual/docs/en/dql-doctrine-query-language/join-syntax.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/limit-and-offset-clauses.txt b/manual/docs/en/dql-doctrine-query-language/limit-and-offset-clauses.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/limit-and-offset-clauses.txt rename to manual/docs/en/dql-doctrine-query-language/limit-and-offset-clauses.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/order-by-clause.txt b/manual/docs/en/dql-doctrine-query-language/order-by-clause.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/order-by-clause.txt rename to manual/docs/en/dql-doctrine-query-language/order-by-clause.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/select-queries.txt b/manual/docs/en/dql-doctrine-query-language/select-queries.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/select-queries.txt rename to manual/docs/en/dql-doctrine-query-language/select-queries.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/subqueries.txt b/manual/docs/en/dql-doctrine-query-language/subqueries.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/subqueries.txt rename to manual/docs/en/dql-doctrine-query-language/subqueries.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/update-queries.txt b/manual/docs/en/dql-doctrine-query-language/update-queries.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/update-queries.txt rename to manual/docs/en/dql-doctrine-query-language/update-queries.txt diff --git a/manual/new/docs/en/dql-doctrine-query-language/where-clause.txt b/manual/docs/en/dql-doctrine-query-language/where-clause.txt similarity index 100% rename from manual/new/docs/en/dql-doctrine-query-language/where-clause.txt rename to manual/docs/en/dql-doctrine-query-language/where-clause.txt diff --git a/manual/new/docs/en/event-listeners.txt b/manual/docs/en/event-listeners.txt similarity index 100% rename from manual/new/docs/en/event-listeners.txt rename to manual/docs/en/event-listeners.txt diff --git a/manual/new/docs/en/exceptions-and-warnings.txt b/manual/docs/en/exceptions-and-warnings.txt similarity index 100% rename from manual/new/docs/en/exceptions-and-warnings.txt rename to manual/docs/en/exceptions-and-warnings.txt diff --git a/manual/new/docs/en/file-parser.txt b/manual/docs/en/file-parser.txt similarity index 100% rename from manual/new/docs/en/file-parser.txt rename to manual/docs/en/file-parser.txt diff --git a/manual/new/docs/en/getting-started.txt b/manual/docs/en/getting-started.txt similarity index 100% rename from manual/new/docs/en/getting-started.txt rename to manual/docs/en/getting-started.txt diff --git a/manual/new/docs/en/getting-started/installation.txt b/manual/docs/en/getting-started/installation.txt similarity index 100% rename from manual/new/docs/en/getting-started/installation.txt rename to manual/docs/en/getting-started/installation.txt diff --git a/manual/new/docs/en/getting-started/starting-new-project.txt b/manual/docs/en/getting-started/starting-new-project.txt similarity index 100% rename from manual/new/docs/en/getting-started/starting-new-project.txt rename to manual/docs/en/getting-started/starting-new-project.txt diff --git a/manual/new/docs/en/getting-started/working-with-existing-databases.txt b/manual/docs/en/getting-started/working-with-existing-databases.txt similarity index 100% rename from manual/new/docs/en/getting-started/working-with-existing-databases.txt rename to manual/docs/en/getting-started/working-with-existing-databases.txt diff --git a/manual/new/docs/en/hierarchical-data.txt b/manual/docs/en/hierarchical-data.txt similarity index 100% rename from manual/new/docs/en/hierarchical-data.txt rename to manual/docs/en/hierarchical-data.txt diff --git a/manual/new/docs/en/hierarchical-data/adjacency-list.txt b/manual/docs/en/hierarchical-data/adjacency-list.txt similarity index 100% rename from manual/new/docs/en/hierarchical-data/adjacency-list.txt rename to manual/docs/en/hierarchical-data/adjacency-list.txt diff --git a/manual/new/docs/en/hierarchical-data/introduction.txt b/manual/docs/en/hierarchical-data/introduction.txt similarity index 100% rename from manual/new/docs/en/hierarchical-data/introduction.txt rename to manual/docs/en/hierarchical-data/introduction.txt diff --git a/manual/new/docs/en/hierarchical-data/materialized-path.txt b/manual/docs/en/hierarchical-data/materialized-path.txt similarity index 100% rename from manual/new/docs/en/hierarchical-data/materialized-path.txt rename to manual/docs/en/hierarchical-data/materialized-path.txt diff --git a/manual/new/docs/en/hierarchical-data/nested-set.txt b/manual/docs/en/hierarchical-data/nested-set.txt similarity index 100% rename from manual/new/docs/en/hierarchical-data/nested-set.txt rename to manual/docs/en/hierarchical-data/nested-set.txt diff --git a/manual/new/docs/en/improving-performance.txt b/manual/docs/en/improving-performance.txt similarity index 100% rename from manual/new/docs/en/improving-performance.txt rename to manual/docs/en/improving-performance.txt diff --git a/manual/new/docs/en/improving-performance/bundle-your-class-files.txt b/manual/docs/en/improving-performance/bundle-your-class-files.txt similarity index 100% rename from manual/new/docs/en/improving-performance/bundle-your-class-files.txt rename to manual/docs/en/improving-performance/bundle-your-class-files.txt diff --git a/manual/new/docs/en/improving-performance/fetch-only-what-you-need.txt b/manual/docs/en/improving-performance/fetch-only-what-you-need.txt similarity index 100% rename from manual/new/docs/en/improving-performance/fetch-only-what-you-need.txt rename to manual/docs/en/improving-performance/fetch-only-what-you-need.txt diff --git a/manual/new/docs/en/improving-performance/introduction.txt b/manual/docs/en/improving-performance/introduction.txt similarity index 100% rename from manual/new/docs/en/improving-performance/introduction.txt rename to manual/docs/en/improving-performance/introduction.txt diff --git a/manual/new/docs/en/improving-performance/other-tips.txt b/manual/docs/en/improving-performance/other-tips.txt similarity index 100% rename from manual/new/docs/en/improving-performance/other-tips.txt rename to manual/docs/en/improving-performance/other-tips.txt diff --git a/manual/new/docs/en/improving-performance/use-a-bytecode-cache.txt b/manual/docs/en/improving-performance/use-a-bytecode-cache.txt similarity index 100% rename from manual/new/docs/en/improving-performance/use-a-bytecode-cache.txt rename to manual/docs/en/improving-performance/use-a-bytecode-cache.txt diff --git a/manual/new/docs/en/mapping-relations.txt b/manual/docs/en/mapping-relations.txt similarity index 100% rename from manual/new/docs/en/mapping-relations.txt rename to manual/docs/en/mapping-relations.txt diff --git a/manual/new/docs/en/migration.txt b/manual/docs/en/migration.txt similarity index 100% rename from manual/new/docs/en/migration.txt rename to manual/docs/en/migration.txt diff --git a/manual/new/docs/en/native-sql.txt b/manual/docs/en/native-sql.txt similarity index 100% rename from manual/new/docs/en/native-sql.txt rename to manual/docs/en/native-sql.txt diff --git a/manual/new/docs/en/object-relational-mapping.txt b/manual/docs/en/object-relational-mapping.txt similarity index 100% rename from manual/new/docs/en/object-relational-mapping.txt rename to manual/docs/en/object-relational-mapping.txt diff --git a/manual/new/docs/en/plugins.txt b/manual/docs/en/plugins.txt similarity index 100% rename from manual/new/docs/en/plugins.txt rename to manual/docs/en/plugins.txt diff --git a/manual/new/docs/en/plugins/cache.txt b/manual/docs/en/plugins/cache.txt similarity index 100% rename from manual/new/docs/en/plugins/cache.txt rename to manual/docs/en/plugins/cache.txt diff --git a/manual/new/docs/en/plugins/eventlisteners.txt b/manual/docs/en/plugins/eventlisteners.txt similarity index 100% rename from manual/new/docs/en/plugins/eventlisteners.txt rename to manual/docs/en/plugins/eventlisteners.txt diff --git a/manual/new/docs/en/plugins/hook.txt b/manual/docs/en/plugins/hook.txt similarity index 100% rename from manual/new/docs/en/plugins/hook.txt rename to manual/docs/en/plugins/hook.txt diff --git a/manual/new/docs/en/plugins/locking-manager.txt b/manual/docs/en/plugins/locking-manager.txt similarity index 100% rename from manual/new/docs/en/plugins/locking-manager.txt rename to manual/docs/en/plugins/locking-manager.txt diff --git a/manual/new/docs/en/plugins/profiler.txt b/manual/docs/en/plugins/profiler.txt similarity index 100% rename from manual/new/docs/en/plugins/profiler.txt rename to manual/docs/en/plugins/profiler.txt diff --git a/manual/new/docs/en/plugins/validators.txt b/manual/docs/en/plugins/validators.txt similarity index 100% rename from manual/new/docs/en/plugins/validators.txt rename to manual/docs/en/plugins/validators.txt diff --git a/manual/new/docs/en/plugins/view.txt b/manual/docs/en/plugins/view.txt similarity index 100% rename from manual/new/docs/en/plugins/view.txt rename to manual/docs/en/plugins/view.txt diff --git a/manual/new/docs/en/real-world-examples.txt b/manual/docs/en/real-world-examples.txt similarity index 100% rename from manual/new/docs/en/real-world-examples.txt rename to manual/docs/en/real-world-examples.txt diff --git a/manual/new/docs/en/real-world-examples/album-lister.txt b/manual/docs/en/real-world-examples/album-lister.txt similarity index 100% rename from manual/new/docs/en/real-world-examples/album-lister.txt rename to manual/docs/en/real-world-examples/album-lister.txt diff --git a/manual/new/docs/en/real-world-examples/forum-application.txt b/manual/docs/en/real-world-examples/forum-application.txt similarity index 100% rename from manual/new/docs/en/real-world-examples/forum-application.txt rename to manual/docs/en/real-world-examples/forum-application.txt diff --git a/manual/new/docs/en/real-world-examples/user-management-system.txt b/manual/docs/en/real-world-examples/user-management-system.txt similarity index 100% rename from manual/new/docs/en/real-world-examples/user-management-system.txt rename to manual/docs/en/real-world-examples/user-management-system.txt diff --git a/manual/new/docs/en/relations.txt b/manual/docs/en/relations.txt similarity index 100% rename from manual/new/docs/en/relations.txt rename to manual/docs/en/relations.txt diff --git a/manual/new/docs/en/schema-files.txt b/manual/docs/en/schema-files.txt similarity index 100% rename from manual/new/docs/en/schema-files.txt rename to manual/docs/en/schema-files.txt diff --git a/manual/new/docs/en/searching.txt b/manual/docs/en/searching.txt similarity index 100% rename from manual/new/docs/en/searching.txt rename to manual/docs/en/searching.txt diff --git a/manual/new/docs/en/technology.txt b/manual/docs/en/technology.txt similarity index 100% rename from manual/new/docs/en/technology.txt rename to manual/docs/en/technology.txt diff --git a/manual/new/docs/en/technology/architecture.txt b/manual/docs/en/technology/architecture.txt similarity index 100% rename from manual/new/docs/en/technology/architecture.txt rename to manual/docs/en/technology/architecture.txt diff --git a/manual/new/docs/en/technology/design-patterns-used.txt b/manual/docs/en/technology/design-patterns-used.txt similarity index 100% rename from manual/new/docs/en/technology/design-patterns-used.txt rename to manual/docs/en/technology/design-patterns-used.txt diff --git a/manual/new/docs/en/technology/internal-optimizations.txt b/manual/docs/en/technology/internal-optimizations.txt similarity index 100% rename from manual/new/docs/en/technology/internal-optimizations.txt rename to manual/docs/en/technology/internal-optimizations.txt diff --git a/manual/new/docs/en/technology/speed.txt b/manual/docs/en/technology/speed.txt similarity index 100% rename from manual/new/docs/en/technology/speed.txt rename to manual/docs/en/technology/speed.txt diff --git a/manual/new/docs/en/transactions.txt b/manual/docs/en/transactions.txt similarity index 100% rename from manual/new/docs/en/transactions.txt rename to manual/docs/en/transactions.txt diff --git a/manual/new/docs/en/transactions/introduction.txt b/manual/docs/en/transactions/introduction.txt similarity index 100% rename from manual/new/docs/en/transactions/introduction.txt rename to manual/docs/en/transactions/introduction.txt diff --git a/manual/new/docs/en/transactions/isolation-levels.txt b/manual/docs/en/transactions/isolation-levels.txt similarity index 100% rename from manual/new/docs/en/transactions/isolation-levels.txt rename to manual/docs/en/transactions/isolation-levels.txt diff --git a/manual/new/docs/en/transactions/locking-strategies.txt b/manual/docs/en/transactions/locking-strategies.txt similarity index 100% rename from manual/new/docs/en/transactions/locking-strategies.txt rename to manual/docs/en/transactions/locking-strategies.txt diff --git a/manual/new/docs/en/transactions/nesting.txt b/manual/docs/en/transactions/nesting.txt similarity index 100% rename from manual/new/docs/en/transactions/nesting.txt rename to manual/docs/en/transactions/nesting.txt diff --git a/manual/new/docs/en/transactions/savepoints.txt b/manual/docs/en/transactions/savepoints.txt similarity index 100% rename from manual/new/docs/en/transactions/savepoints.txt rename to manual/docs/en/transactions/savepoints.txt diff --git a/manual/new/docs/en/transactions/unit-of-work.txt b/manual/docs/en/transactions/unit-of-work.txt similarity index 100% rename from manual/new/docs/en/transactions/unit-of-work.txt rename to manual/docs/en/transactions/unit-of-work.txt diff --git a/manual/new/docs/en/working-with-objects.txt b/manual/docs/en/working-with-objects.txt similarity index 100% rename from manual/new/docs/en/working-with-objects.txt rename to manual/docs/en/working-with-objects.txt diff --git a/manual/new/docs/en/working-with-objects/component-overview.txt b/manual/docs/en/working-with-objects/component-overview.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/component-overview.txt rename to manual/docs/en/working-with-objects/component-overview.txt diff --git a/manual/new/docs/en/working-with-objects/component-overview/collection.txt b/manual/docs/en/working-with-objects/component-overview/collection.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/component-overview/collection.txt rename to manual/docs/en/working-with-objects/component-overview/collection.txt diff --git a/manual/new/docs/en/working-with-objects/component-overview/connection.txt b/manual/docs/en/working-with-objects/component-overview/connection.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/component-overview/connection.txt rename to manual/docs/en/working-with-objects/component-overview/connection.txt diff --git a/manual/new/docs/en/working-with-objects/component-overview/manager.txt b/manual/docs/en/working-with-objects/component-overview/manager.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/component-overview/manager.txt rename to manual/docs/en/working-with-objects/component-overview/manager.txt diff --git a/manual/new/docs/en/working-with-objects/component-overview/record.txt b/manual/docs/en/working-with-objects/component-overview/record.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/component-overview/record.txt rename to manual/docs/en/working-with-objects/component-overview/record.txt diff --git a/manual/new/docs/en/working-with-objects/component-overview/table.txt b/manual/docs/en/working-with-objects/component-overview/table.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/component-overview/table.txt rename to manual/docs/en/working-with-objects/component-overview/table.txt diff --git a/manual/new/docs/en/working-with-objects/dealing-with-relations.txt b/manual/docs/en/working-with-objects/dealing-with-relations.txt similarity index 100% rename from manual/new/docs/en/working-with-objects/dealing-with-relations.txt rename to manual/docs/en/working-with-objects/dealing-with-relations.txt diff --git a/manual/new/index.php b/manual/index.php similarity index 100% rename from manual/new/index.php rename to manual/index.php diff --git a/manual/new/lib/.htaccess b/manual/lib/.htaccess similarity index 100% rename from manual/new/lib/.htaccess rename to manual/lib/.htaccess diff --git a/manual/new/lib/Text/Wiki/Doc.php b/manual/lib/Text/Wiki/Doc.php similarity index 100% rename from manual/new/lib/Text/Wiki/Doc.php rename to manual/lib/Text/Wiki/Doc.php diff --git a/manual/new/lib/Text/Wiki/Parse/Doc/Code.php b/manual/lib/Text/Wiki/Parse/Doc/Code.php similarity index 100% rename from manual/new/lib/Text/Wiki/Parse/Doc/Code.php rename to manual/lib/Text/Wiki/Parse/Doc/Code.php diff --git a/manual/new/lib/Text/Wiki/Parse/Doc/Doclink.php b/manual/lib/Text/Wiki/Parse/Doc/Doclink.php similarity index 100% rename from manual/new/lib/Text/Wiki/Parse/Doc/Doclink.php rename to manual/lib/Text/Wiki/Parse/Doc/Doclink.php diff --git a/manual/new/lib/Text/Wiki/Parse/Doc/Prefilter.php b/manual/lib/Text/Wiki/Parse/Doc/Prefilter.php similarity index 100% rename from manual/new/lib/Text/Wiki/Parse/Doc/Prefilter.php rename to manual/lib/Text/Wiki/Parse/Doc/Prefilter.php diff --git a/manual/new/lib/Text/Wiki/Parse/Doc/Table.php b/manual/lib/Text/Wiki/Parse/Doc/Table.php similarity index 100% rename from manual/new/lib/Text/Wiki/Parse/Doc/Table.php rename to manual/lib/Text/Wiki/Parse/Doc/Table.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex.php b/manual/lib/Text/Wiki/Render/Latex.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex.php rename to manual/lib/Text/Wiki/Render/Latex.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/Code.php b/manual/lib/Text/Wiki/Render/Latex/Code.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/Code.php rename to manual/lib/Text/Wiki/Render/Latex/Code.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/Doclink.php b/manual/lib/Text/Wiki/Render/Latex/Doclink.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/Doclink.php rename to manual/lib/Text/Wiki/Render/Latex/Doclink.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/Heading.php b/manual/lib/Text/Wiki/Render/Latex/Heading.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/Heading.php rename to manual/lib/Text/Wiki/Render/Latex/Heading.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/List.php b/manual/lib/Text/Wiki/Render/Latex/List.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/List.php rename to manual/lib/Text/Wiki/Render/Latex/List.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/Phplookup.php b/manual/lib/Text/Wiki/Render/Latex/Phplookup.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/Phplookup.php rename to manual/lib/Text/Wiki/Render/Latex/Phplookup.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/Table.php b/manual/lib/Text/Wiki/Render/Latex/Table.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/Table.php rename to manual/lib/Text/Wiki/Render/Latex/Table.php diff --git a/manual/new/lib/Text/Wiki/Render/Latex/Url.php b/manual/lib/Text/Wiki/Render/Latex/Url.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Latex/Url.php rename to manual/lib/Text/Wiki/Render/Latex/Url.php diff --git a/manual/new/lib/Text/Wiki/Render/Xhtml/Blockquote.php b/manual/lib/Text/Wiki/Render/Xhtml/Blockquote.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Xhtml/Blockquote.php rename to manual/lib/Text/Wiki/Render/Xhtml/Blockquote.php diff --git a/manual/new/lib/Text/Wiki/Render/Xhtml/Code.php b/manual/lib/Text/Wiki/Render/Xhtml/Code.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Xhtml/Code.php rename to manual/lib/Text/Wiki/Render/Xhtml/Code.php diff --git a/manual/new/lib/Text/Wiki/Render/Xhtml/Doclink.php b/manual/lib/Text/Wiki/Render/Xhtml/Doclink.php similarity index 100% rename from manual/new/lib/Text/Wiki/Render/Xhtml/Doclink.php rename to manual/lib/Text/Wiki/Render/Xhtml/Doclink.php diff --git a/manual/new/lib/highlight.php b/manual/lib/highlight.php similarity index 100% rename from manual/new/lib/highlight.php rename to manual/lib/highlight.php diff --git a/manual/new/.htaccess b/manual/new/.htaccess deleted file mode 100644 index 6b6605260..000000000 --- a/manual/new/.htaccess +++ /dev/null @@ -1,5 +0,0 @@ -# RewriteEngine on - -# RewriteRule ^chapter/(.*)/(.*)$ index.php [r=404] -# RewriteRule ^chapter/(.*)$ index.php?chapter=$1 -# RewriteRule ^one-page$ index.php?one-page=1 diff --git a/manual/new/scripts/mootools.v1.11.js b/manual/scripts/mootools.v1.11.js similarity index 100% rename from manual/new/scripts/mootools.v1.11.js rename to manual/scripts/mootools.v1.11.js diff --git a/manual/new/scripts/toc.js b/manual/scripts/toc.js similarity index 100% rename from manual/new/scripts/toc.js rename to manual/scripts/toc.js diff --git a/manual/new/scripts/tree.js b/manual/scripts/tree.js similarity index 100% rename from manual/new/scripts/tree.js rename to manual/scripts/tree.js diff --git a/manual/new/styles/basic.css b/manual/styles/basic.css similarity index 100% rename from manual/new/styles/basic.css rename to manual/styles/basic.css diff --git a/manual/new/styles/iefix.css b/manual/styles/iefix.css similarity index 100% rename from manual/new/styles/iefix.css rename to manual/styles/iefix.css diff --git a/manual/new/styles/print.css b/manual/styles/print.css similarity index 100% rename from manual/new/styles/print.css rename to manual/styles/print.css diff --git a/manual/new/templates/.htaccess b/manual/templates/.htaccess similarity index 100% rename from manual/new/templates/.htaccess rename to manual/templates/.htaccess diff --git a/manual/new/templates/index.tpl.php b/manual/templates/index.tpl.php similarity index 100% rename from manual/new/templates/index.tpl.php rename to manual/templates/index.tpl.php diff --git a/manual/new/templates/latex.tpl.php b/manual/templates/latex.tpl.php similarity index 100% rename from manual/new/templates/latex.tpl.php rename to manual/templates/latex.tpl.php diff --git a/manual/new/templates/xhtml.tpl.php b/manual/templates/xhtml.tpl.php similarity index 100% rename from manual/new/templates/xhtml.tpl.php rename to manual/templates/xhtml.tpl.php diff --git a/manual/new/tmp/.htaccess b/manual/tmp/.htaccess similarity index 100% rename from manual/new/tmp/.htaccess rename to manual/tmp/.htaccess