From d287534bc8abec2fe8544f3dcdb411d493e86f66 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 9 Mar 2003 14:21:27 +0000 Subject: [PATCH] Adjusted the phpGW Adminsitration Manual with: - up-to-date Version of the stable branch - no more extra branch for patches - references from sourceforge to savannah or subversions Did this in the sgml and the html version, as i dont have / know the tools to create the html+ps version from the sgml --- doc/en_US/html/admin/x62.html | 45 ++++++-------------------- doc/en_US/sgml/admin/installation.sgml | 25 +++++--------- 2 files changed, 18 insertions(+), 52 deletions(-) diff --git a/doc/en_US/html/admin/x62.html b/doc/en_US/html/admin/x62.html index a881f9e8af..e3269a9fa3 100644 --- a/doc/en_US/html/admin/x62.html +++ b/doc/en_US/html/admin/x62.html @@ -160,7 +160,7 @@ CLASS="USERINPUT" # cvs -z3 -d:pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgroupware co phpgroupware# cvs -z3 -d:pserver:anonymous@subversions.gnu.org:/cvsroot/phpgroupware co phpgroupware
# export CVSROOT=':pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgroupware'# export CVSROOT=':pserver:anonymous@subversions.gnu.org:/cvsroot/phpgroupware'
2.3.2.2. Stable Branch in CVS

Follow these steps (please adjust to your servers config):

Follow these steps (please adjust to your servers config and the up-to-date stable Version - 0.9.14 at the moment):

# cvs -z3 -d:pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgroupware co -r Version-0_9_12-branch phpgroupware# cvs -z3 -d:pserver:anonymous@subversions.gnu.org:/cvsroot/phpgroupware co -r Version-0_9_14-branch phpgroupware
# cvs co -r Version-0_9_12-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog# cvs co -r Version-0_9_14-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog

# export CVSROOT=':pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgroupware'# export CVSROOT=':pserver:anonymous@subversions.gnu.org:/cvsroot/phpgroupware'
# cvs co -r Version-0_9_12-branch phpgroupware# cvs co -r Version-0_9_14-branch phpgroupware
# cvs co -r Version-0_9_12-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog

2.3.2.3. Patched Branches in CVS

Recently the phpGroupWare developers started a branch for patches to released versions. This is to facilitate bugs being fixed in a released version without having to wait for the next offical release. There is a developer who has been assigned the responsibility for maintaining that branch and applying patches and fixes. To check out this version of the code using 0.9.12 as an example you would do the following:

# cvs -z3 -d:pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgroupware -r Version-0_9_12-patches phpgroupware# cvs co -r Version-0_9_14-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog

# export CVSROOT=':pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgwapps'# export CVSROOT=':pserver:anonymous@subversions.gnu.org:/cvsroot/phpgwapps'
\ No newline at end of file +> diff --git a/doc/en_US/sgml/admin/installation.sgml b/doc/en_US/sgml/admin/installation.sgml index 0c196bc40e..46c75de2fc 100755 --- a/doc/en_US/sgml/admin/installation.sgml +++ b/doc/en_US/sgml/admin/installation.sgml @@ -127,7 +127,7 @@ Installing from a CVS is fairly easy. The files should be checked out in the web You may have to get required permissions to install from CVS. Contact your system administrator if you dont have the permission to write to your webserver directory. -To see a list of applications currently available via CVS, go to [http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpgroupware/] +To see a list of applications currently available via CVS, go to [http://savannah.gnu.org/cgi-bin/viewcvs/phpgroupware/] Development Branch in CVS @@ -151,31 +151,22 @@ or if you prefer using CVSROOT: Stable Branch in CVS -Follow these steps (please adjust to your server's config): +Follow these steps (please adjust to your server's config and the up-to-date stable Version - 0.9.14 at the moment):
# cd /home/httpd/html -# cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/phpgroupware co -r Version-0_9_12-branch phpgroupware +# cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/phpgroupware co -r Version-0_9_14-branch phpgroupware # cd phpgroupware -# cvs co -r Version-0_9_12-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog +# cvs co -r Version-0_9_14-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog
or if you prefer using CVSROOT:
# export CVSROOT=':pserver:anoncvs@subversions.gnu.org:/cvsroot/phpgroupware' -# cvs co -r Version-0_9_12-branch phpgroupware +# cvs co -r Version-0_9_14-branch phpgroupware # cd phpgroupware -# cvs co -r Version-0_9_12-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog -
- - -Patched Branches in CVS - -Recently the phpGroupWare developers started a branch for patches to released versions. This is to facilitate bugs being fixed in a released version without having to wait for the next offical release. There is a developer who has been assigned the responsibility for maintaining that branch and applying patches and fixes. To check out this version of the code using 0.9.12 as an example you would do the following: - -
-# cvs -z3 -d:pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgroupware -r Version-0_9_12-patches phpgroupware +# cvs co -r Version-0_9_14-branch admin addressbook calendar email phpgwapi preferences setup todo notes infolog
@@ -476,14 +467,14 @@ You install the new application within the phpGroupWare install tree by copying -For example, this is the process to install the Headlines application: (see [http://www.sourceforge.net/projects/phpgwapps] for more applications) +For example, this is the process to install the Headlines application: (see [http://apps.phpgroupware.org] for more applications) Download the .tar.gz file for the application, or check out the source with cvs with
-# export CVSROOT=':pserver:anonymous@cvs.phpgroupware.sourceforge.net:/cvsroot/phpgwapps' +# export CVSROOT=':pserver:anonymous@subversions.gnu.org:/cvsroot/phpgroupware' # cvs login (just hit enter if prompted for a password) # cvs co headlines