Doctrine

Timestamp:

02/19/08 02:41:37 (17 months ago)

Author:

guilhermeblanco

Message:

Updates in Getting Started manual chapter (fixes #794)

Files:

• branches/0.10/manual/docs/en/getting-started/installation.txt (modified) (1 diff)
• branches/0.10/manual/docs/en/getting-started/starting-new-project.txt (modified) (1 diff)
• branches/0.10/manual/docs/en/getting-started/working-with-existing-databases.txt (modified) (1 diff)
• branches/0.9/manual/docs/en/getting-started/installation.txt (modified) (1 diff)
• branches/0.9/manual/docs/en/getting-started/starting-new-project.txt (modified) (1 diff)
• branches/0.9/manual/docs/en/getting-started/working-with-existing-databases.txt (modified) (1 diff)
• trunk/manual/docs/en/getting-started/installation.txt (modified) (1 diff)
• trunk/manual/docs/en/getting-started/starting-new-project.txt (modified) (1 diff)
• trunk/manual/docs/en/getting-started/working-with-existing-databases.txt (modified) (1 diff)

branches/0.10/manual/docs/en/getting-started/installation.txt

@@ -1 @@
-The installation of doctrine is very easy. Just get the latest revision of
-Doctrine from http://svn.phpdoctrine.org/branches/0.10. 
+There are currently four different methods to install Doctrine.
 
-You need a SVN (Subversion) client for downloading Doctrine.
+* SVN (subversion)
+* SVN externals
+* Pear
+* Zip-package
 
-In order to check out Doctrine in the current directory using the **svn** command line tool use the following code: 
+It is recommended to download Doctrine via SVN (subversion), because in this case updating is easy. 
+If your project is already under version control with SVN, you should choose SVN externals. 
+
+
++++ SVN 
+
+The installation of doctrine via SVN is very easy. Just get the latest revision of Doctrine from http://svn.phpdoctrine.org/branches/0.10.
+
+In order to check out Doctrine in the current directory using the **svn** command line tool use the following code:
 
 <code type="bash">
-svn co http://svn.phpdoctrine.org/branches/0.10 . 
+svn co http://svn.phpdoctrine.org/branches/0.10 .
 </code>
 
-If you do not have a SVN client, chose one from the list below. Find the
-**Checkout** option and enter http://svn.phpdoctrine.org/branches/0.10 in the **path** or **repository url** parameter. There is no need for a username or password to check out Doctrine. 
+If you do not have a SVN client, chose one from the list below. Find the **Checkout** option and enter svn.phpdoctrine.org/branches/0.10 in the **path** or **repository url** parameter. There is no need for a username or password to check out Doctrine. 
 
 * [http://tortoisesvn.tigris.org/ TortoiseSVN] a Windows application that  integrates into Windows Explorer
 * [http://www.apple.com/downloads/macosx/development_tools/svnx.html svnx] a  Mac OS X GUI svn application 
 * Eclipse has SVN integration through the [http://subclipse.tigris.org/ subeclipse] plugin
+
+You can update to the latest version with
+
+<code type="bash">
+svn update
+</code>
+
+in your doctrine directory.
+
+
++++ SVN externals
+
+If your project is under version control with SVN, you should set up doctrine via svn externals. You can do this with the **svn** command line tool:
+
+<code type="bash"> 
+svn pe svn:externals /path/to/project
+</code>
+
+You have to put the following line in the editor and save the changes.
+
+<code>
+doctrine http://svn.phpdoctrine.org/branches/0.10
+</code>
+
+Afterwards you can download doctrine with
+
+<code>
+svn update
+</code>
+
+
++++ PEAR
+
+You can install Doctrine via PEAR with the following command:
+
+<code type="bash"> 
+pear install http://pear.phpdoctrine.org/Doctrine-0.10.1
+</code>
+
+
++++ Zip-package
+
+You can download Doctrine as a .zip or .tgz (for Linux) package from http://www.phpdoctrine.org/download.
+Simply unzip it to your project directory with your favorite zip tool.
+
+Under Linux you can extract the .tgz package with the following command line instruction:
+
+<code type="bash"> 
+tar xzf Doctrine-0.10.1.tgz
+</code> 

branches/0.10/manual/docs/en/getting-started/starting-new-project.txt

@@ -26 +26 @@
 <code type="php">
 //require the base Doctrine class
-require_once('lib/Doctrine.php');
+require_once('path-to-doctrine/lib/Doctrine.php');
 
 //register the autoloader

branches/0.10/manual/docs/en/getting-started/working-with-existing-databases.txt

@@ -26 +26 @@
 
 <code type="php">
-require_once('lib/Doctrine.php');
+require_once('path-to-doctrine/lib/Doctrine.php');
 
 spl_autoload_register(array('Doctrine', 'autoload'));

branches/0.9/manual/docs/en/getting-started/installation.txt

@@ -1 @@
-The installation of doctrine is very easy. Just get the latest revision of Doctrine from http://doctrine.pengus.net/svn/trunk. 
+There are currently four different methods to install Doctrine.
 
-You need a SVN (Subversion) client for downloading Doctrine.
+* SVN (subversion)
+* SVN externals
+* Pear
+* Zip-package
 
-In order to check out Doctrine in the current directory using the **svn** command line tool use the following code: 
+It is recommended to download Doctrine via SVN (subversion), because in this case updating is easy. 
+If your project is already under version control with SVN, you should choose SVN externals. 
+
+
++++ SVN 
+
+The installation of doctrine via SVN is very easy. Just get the latest revision of Doctrine from http://svn.phpdoctrine.org/branches/0.9.
+
+In order to check out Doctrine in the current directory using the **svn** command line tool use the following code:
 
 <code type="bash">
-svn co http://doctrine.pengus.net/svn/trunk . 
+svn co http://svn.phpdoctrine.org/branches/0.9 .
 </code>
 
-If you do not have a SVN client, chose one from the list below. Find the **Checkout** option and enter http://doctrine.pengus.net/svn/trunk in the **path** or **repository url** parameter. There is no need for a username or password to check out Doctrine. 
+If you do not have a SVN client, chose one from the list below. Find the **Checkout** option and enter svn.phpdoctrine.org/branches/0.9 in the **path** or **repository url** parameter. There is no need for a username or password to check out Doctrine. 
 
 * [http://tortoisesvn.tigris.org/ TortoiseSVN] a Windows application that  integrates into Windows Explorer
 * [http://www.apple.com/downloads/macosx/development_tools/svnx.html svnx] a  Mac OS X GUI svn application 
 * Eclipse has SVN integration through the [http://subclipse.tigris.org/ subeclipse] plugin
+
+You can update to the latest version with
+
+<code type="bash">
+svn update
+</code>
+
+in your doctrine directory.
+
+
++++ SVN externals
+
+If your project is under version control with SVN, you should set up doctrine via svn externals. You can do this with the **svn** command line tool:
+
+<code type="bash"> 
+svn pe svn:externals /path/to/project
+</code>
+
+You have to put the following line in the editor and save the changes.
+
+<code>
+doctrine http://svn.phpdoctrine.org/branches/0.9
+</code>
+
+Afterwards you can download doctrine with
+
+<code>
+svn update
+</code>
+
+
++++ PEAR
+
+You can install Doctrine via PEAR with the following command:
+
+<code type="bash"> 
+pear install http://pear.phpdoctrine.org/Doctrine-0.9.1
+</code>
+
+
++++ Zip-package
+
+You can download Doctrine as a .zip or .tgz (for Linux) package from http://www.phpdoctrine.org/download.
+Simply unzip it to your project directory with your favorite zip tool.
+
+Under Linux you can extract the .tgz package with the following command line instruction:
+
+<code type="bash"> 
+tar xzf Doctrine-0.9.1.tgz
+</code> 

branches/0.9/manual/docs/en/getting-started/starting-new-project.txt

@@ -26 +26 @@
 <code type="php">
 //require the base Doctrine class
-require_once('lib/Doctrine.php');
+require_once('path-to-doctrine/lib/Doctrine.php');
 
 //register the autoloader

branches/0.9/manual/docs/en/getting-started/working-with-existing-databases.txt

@@ -26 +26 @@
 
 <code type="php">
-require_once('lib/Doctrine.php');
+require_once('path-to-doctrine/lib/Doctrine.php');
 
 spl_autoload_register(array('Doctrine', 'autoload'));

trunk/manual/docs/en/getting-started/installation.txt

@@ -1 @@
-The installation of doctrine is very easy. Just get the latest revision of
-Doctrine from http://svn.phpdoctrine.org/trunk. 
+There are currently two different methods to install Doctrine.
 
-You need a SVN (Subversion) client for downloading Doctrine.
+* SVN (subversion)
+* SVN externals
 
-In order to check out Doctrine in the current directory using the **svn** command line tool use the following code: 
+It is recommended to download Doctrine via SVN (subversion), because in this case updating is easy.
+If your project is already under version control with SVN, you should choose SVN externals.
+
+
++++ SVN 
+
+The installation of doctrine via SVN is very easy. Just get the latest revision of Doctrine from http://svn.phpdoctrine.org/trunk.
+
+In order to check out Doctrine in the current directory using the **svn** command line tool use the following code:
 
 <code type="bash">
-svn co http://svn.phpdoctrine.org/trunk . 
+svn co http://svn.phpdoctrine.org/trunk .
 </code>
 
-If you do not have a SVN client, chose one from the list below. Find the
-**Checkout** option and enter http://svn.phpdoctrine.org/trunk in the **path** or **repository url** parameter. There is no need for a username or password to check out Doctrine. 
+If you do not have a SVN client, chose one from the list below. Find the **Checkout** option and enter svn.phpdoctrine.org/trunk in the **path** or **repository url** parameter. There is no need for a username or password to check out Doctrine. 
 
 * [http://tortoisesvn.tigris.org/ TortoiseSVN] a Windows application that  integrates into Windows Explorer
 * [http://www.apple.com/downloads/macosx/development_tools/svnx.html svnx] a  Mac OS X GUI svn application 
 * Eclipse has SVN integration through the [http://subclipse.tigris.org/ subeclipse] plugin
+
+You can update to the latest version with
+
+<code type="bash">
+svn update
+</code>
+
+in your doctrine directory.
+
+
++++ SVN externals
+
+If your project is under version control with SVN, you should set up doctrine via svn externals. You can do this with the **svn** command line tool:
+
+<code type="bash"> 
+svn pe svn:externals /path/to/project
+</code>
+
+You have to put the following line in the editor and save the changes.
+
+<code>
+doctrine http://svn.phpdoctrine.org/trunk
+</code>
+
+Afterwards you can download doctrine with
+
+<code>
+svn update
+</code>

trunk/manual/docs/en/getting-started/starting-new-project.txt

@@ -26 +26 @@
 <code type="php">
 //require the base Doctrine class
-require_once('lib/Doctrine.php');
+require_once('path-to-doctrine/lib/Doctrine.php');
 
 //register the autoloader

trunk/manual/docs/en/getting-started/working-with-existing-databases.txt

@@ -26 +26 @@
 
 <code type="php">
-require_once('lib/Doctrine.php');
+require_once('path-to-doctrine/lib/Doctrine.php');
 
 spl_autoload_register(array('Doctrine', 'autoload'));