From 50defa4fbfa1f6a9ca6c7348711ca5d283f2387a Mon Sep 17 00:00:00 2001
From: meus <meus@625475ce-881a-0410-a577-b389adb331d8>
Date: Wed, 28 Mar 2007 20:07:53 +0000
Subject: [PATCH] Changed some small text on the Requirement page and the
 Installation page.

---
 .../codes/Getting started - Installation.php  | 14 -------------
 ... - Installation - Include and autoload.php | 21 +++++++++++++++++++
 .../docs/Getting started - Installation.php   | 12 ++++++++---
 .../docs/Getting started - Requirements.php   |  3 +--
 manual/menu.php                               |  1 +
 5 files changed, 32 insertions(+), 19 deletions(-)
 delete mode 100644 manual/codes/Getting started - Installation.php
 create mode 100644 manual/docs/Getting started - Installation - Include and autoload.php

diff --git a/manual/codes/Getting started - Installation.php b/manual/codes/Getting started - Installation.php
deleted file mode 100644
index 21fbb94a3..000000000
--- a/manual/codes/Getting started - Installation.php	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-require_once("path-to-doctrine/Doctrine.php");
-
-// autoloading objects
-
-function __autoload($class) {
-    Doctrine::autoload($class);
-}
-
-// registering an autoload function, useful when multiple
-// frameworks are using __autoload()
-
-spl_autoload_register(array('Doctrine', 'autoload'));
-?>
diff --git a/manual/docs/Getting started - Installation - Include and autoload.php b/manual/docs/Getting started - Installation - Include and autoload.php
new file mode 100644
index 000000000..7950f2c1b
--- /dev/null
+++ b/manual/docs/Getting started - Installation - Include and autoload.php	
@@ -0,0 +1,21 @@
+In order to use Doctrine in your project it must first be included.
+
+<code type="php">
+require_once("path-to-doctrine/lib/Doctrine.php");
+</code>
+
+Doctrine support [http://www.php.net/autoload Autoloading] for including files so that you do not have to include anything more then the base file. There are two different strategies that can be used to do this:
+
+If you do use the **__autoload** function for your own logic you can use it. 
+
+<code type="php">
+function __autoload($class) {
+	Doctrine::autoload($class);
+}
+</code>
+
+If your project uses autoload and/or you have other libraries that use it you could use [http://www.php.net/manual/en/function.spl-autoload-register.php spl_autoload_register] to register more then one autoloading function. 
+
+<code type="php">
+spl_autoload_register(array('Doctrine', 'autoload'));
+</code>
diff --git a/manual/docs/Getting started - Installation.php b/manual/docs/Getting started - Installation.php
index 1bb094966..ef496684d 100644
--- a/manual/docs/Getting started - Installation.php	
+++ b/manual/docs/Getting started - Installation.php	
@@ -1,4 +1,10 @@
-The installation of doctrine is very easy. Just get the latest revision of Doctrine from
-http://doctrine.pengus.net/svn/trunk. 
-<br \><br \>
+The installation of doctrine is very easy. Just get the latest revision of Doctrine from http://doctrine.pengus.net/svn/trunk. 
+
 You need a SVN(Subversion) client for downloading Doctrine.
+
+To check out Doctrine using the **svn** command line tool in the current directory use:
+<code type="bash">
+svn co http://doctrine.pengus.net/svn/trunk . 
+</code>
+Do check out using a GUI based tool like [http://tortoisesvn.tigris.org/ TortoiseSVN] simply use the http://doctrine.pengus.net/svn/trunk in the the path field. No username or password is neccesary. 
+
diff --git a/manual/docs/Getting started - Requirements.php b/manual/docs/Getting started - Requirements.php
index 3fcc3431f..be29d5ba4 100644
--- a/manual/docs/Getting started - Requirements.php	
+++ b/manual/docs/Getting started - Requirements.php	
@@ -1,3 +1,2 @@
 Doctrine requires PHP >= 5.1. it doesn't require any external libraries.
-For database abstraction Doctrine uses PDO which is bundled with php by default. Doctrine also requires a little
-adodb-hack for table creation, which comes with doctrine as of beta4.
+For database abstraction Doctrine uses PDO which is bundled with php by default. Doctrine also requires a little adodb-hack for table creation, which comes with doctrine.
diff --git a/manual/menu.php b/manual/menu.php
index fd2057294..6ea24785d 100644
--- a/manual/menu.php
+++ b/manual/menu.php
@@ -1,6 +1,7 @@
 Getting started
     Requirements
     Installation
+        Include and autoload
     Compiling
     Starting new project
     Working with existing databases