diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml index 03dacedf28c..4ca028be8fc 100644 --- a/doc/src/sgml/cvs.sgml +++ b/doc/src/sgml/cvs.sgml @@ -1,5 +1,5 @@ @@ -32,8 +32,8 @@ Thomas Lockhart At least two methods, - anonymous CVS and CVSup, - are available to pull the CVS code tree from the + anonymous CVS and CVSup, + are available to pull the CVS code tree from the PostgreSQL server to your local machine. @@ -42,7 +42,7 @@ Thomas Lockhart If you would like to keep up with the current sources on a regular - basis, you can fetch them from our CVS server + basis, you can fetch them from our CVS server and then use CVS to retrieve updates from time to time. @@ -52,12 +52,12 @@ Thomas Lockhart - You will need a local copy of CVS + You will need a local copy of CVS (Concurrent Version Control System), which you can get from http://www.cyclic.com/ or - any GNU software archive site. + any GNU software archive site. We currently recommend version 1.10 (the most recent at the time - of writing). Many systems have a recent version of + of writing). Many systems have a recent version of cvs installed by default. @@ -83,7 +83,7 @@ $ cvs -d :pserver:anoncvs@anoncvs.postgresql.org:/projects/cvsroot login cvs -z3 -d :pserver:anoncvs@anoncvs.postgresql.org:/projects/cvsroot co -P pgsql - which installs the PostgreSQL sources into a + which installs the PostgreSQL sources into a subdirectory pgsql of the directory you are currently in. @@ -152,7 +152,7 @@ $ cvs update $ chmod -R go-w pgsql to set the permissions properly. - This bug is fixed as of + This bug is fixed as of CVS version 1.9.28. @@ -208,10 +208,10 @@ $ cvs checkout -r REL6_4 tc When you tag more than one file with the same tag you can think about the tag as a curve drawn through a matrix of filename vs. revision number. Say we have 5 files with the following revisions: - + file1 file2 file3 file4 file5 - + 1.1 1.1 1.1 1.1 /--1.1* <-*- TAG 1.2*- 1.2 1.2 -1.2*- 1.3 \- 1.3*- 1.3 / 1.3 @@ -291,7 +291,7 @@ cvs commit Getting The Source Via <productname>CVSup</productname> - An alternative to using anonymous CVS for retrieving + An alternative to using anonymous CVS for retrieving the PostgreSQL source tree is CVSup. CVSup was developed by @@ -323,9 +323,9 @@ cvs commit - Decide where you want to keep your local copy of the + Decide where you want to keep your local copy of the CVS repository. On one of our systems we - recently set up a repository in /home/cvs/, + recently set up a repository in /home/cvs/, but had formerly kept it under a PostgreSQL development tree in /opt/postgres/cvs/. If you intend to keep your @@ -337,7 +337,7 @@ setenv CVSROOT /home/cvs in your .cshrc file, or a similar line in your .bashrc or - .profile file, depending on your shell. + .profile file, depending on your shell. @@ -372,7 +372,7 @@ CVSROOT/ which cvsup - Then, simply run + Then, simply run cvsup using: @@ -417,7 +417,7 @@ $ cvsup -L 2 postgres.cvsup # prefix directory where CVSup will store the actual distribution(s) *default prefix=/home/cvs -# complete distribution, including all below +# complete distribution, including all below pgsql # individual distributions vs 'the whole thing' @@ -450,7 +450,7 @@ pgsql # prefix directory where CVSup will store the actual distribution(s) *default prefix=/usr/local/pgsql -# complete distribution, including all below +# complete distribution, including all below pgsql # individual distributions vs 'the whole thing' @@ -466,7 +466,7 @@ pgsql Installing <productname>CVSup</productname> - CVSup is available as source, pre-built + CVSup is available as source, pre-built binaries, or Linux RPMs. It is far easier to use a binary than to build from source, primarily because the very capable, but voluminous, Modula-3 compiler is required for the build. @@ -478,7 +478,7 @@ pgsql You can use pre-built binaries if you have a platform for which binaries - are posted on + are posted on the PostgreSQL ftp site, or if you are running FreeBSD, for which CVSup is available as a port. @@ -487,7 +487,7 @@ pgsql CVSup was originally developed as a tool for distributing the FreeBSD - source tree. It is available as a port, and for those running + source tree. It is available as a port, and for those running FreeBSD, if this is not sufficient to tell how to obtain and install it then please contribute a procedure here. @@ -516,7 +516,7 @@ pgsql If you are running FreeBSD, install the CVSup port. - + If you have another platform, check for and download the appropriate binary from @@ -536,7 +536,7 @@ pgsql - If the binary is in the top level of the tar file, then simply + If the binary is in the top level of the tar file, then simply unpack the tar file into your target directory: @@ -549,7 +549,7 @@ $ mv cvsup.1 ../doc/man/man1/ - If there is a directory structure in the tar file, then unpack + If there is a directory structure in the tar file, then unpack the tar file within /usr/local/src and move the binaries into the appropriate location as above. @@ -604,7 +604,7 @@ $ which cvsup Pick up the Modula-3 distribution from Polytechnique Montréal, - who are actively maintaining the code base originally developed by + who are actively maintaining the code base originally developed by the DEC Systems Research Center. The PM3 RPM distribution is roughly @@ -815,7 +815,7 @@ Regards, John I've deposited a statically built cvsup client executable (and man pages -and test configuration) in +and test configuration) in /pub/incoming/cvsup-15.1-client-linux.tar.gz @@ -832,7 +832,7 @@ yet) but each major package (there are 4) can be built without needing the makefiles with two commands each. Not difficult at all. John gives some hints in his e-mail on how to build a static executable, and on how to shrink the size of the executable by leaving out the GUI support. -Again, easy to do. +Again, easy to do. My client test case, picking up a sub-tree of the FreeBSD distribution, worked flawlessly. I haven't tried running a server.