diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 622aa4fe74d..a7f0c8d6340 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -8,7 +8,7 @@
# This makefile is for building and installing the documentation.
# When a release tarball is created, the documentation files are
-# prepared using the distprep target. In CVS-based trees these files
+# prepared using the distprep target. In Git-based trees these files
# don't exist, unless explicitly built, so we skip the installation in
# that case.
diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index 9a759d11b70..c9c51fe09cb 100644
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -292,7 +292,7 @@
Heap-Only
+ url="http://git.postgresql.org/gitweb?p=postgresql.git;a=blob;f=src/backend/access/heap/README.HOT;hb=HEAD">Heap-Only
Tuples
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
deleted file mode 100644
index 55de20cd8c9..00000000000
--- a/doc/src/sgml/cvs.sgml
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-
-
-
-
- Marc
- Fournier
-
-
- Tom
- Lane
-
-
- Thomas
- Lockhart
-
-
- David
- Fetter
-
-
- 1999-05-20
-
-
- The Source Code Repository
-
-
- The PostgreSQL source code is stored and managed using the
- CVS version control system. An official mirror using
- Git is also available, for those who wish to use a
- distributed version control system. This mirror is automatically
- updated whenever the main repository changes, so it always contains the latest
- versions of all branches.
-
-
-
- Using Git> is the most flexible way to work with the source, and it
- allows you to work offline without having constant access to the project servers.
- rsync> based CVS> also lets you work offline, but
- lacks many of the other advantages of Git>.
-
-
-
- Our wiki, and
- ,
- has additional details on working with CVS and Git.
-
-
-
- Getting The Source Via Git>
-
-
- With Git> you will make a copy of the entire code repository
- to your local machine, so you will have access to all history and branches
- offline. This is the fastest and most flexible way to develop or test
- patches.
-
-
-
- Git
-
-
-
- You will need an installed version of Git>, which you can get
- from . Many systems also have a recent
- version of Git> installed by default, or available in their
- package repository system.
-
-
-
-
-
- To being using the Git repository, make a clone of the official mirror:
-
-
-git clone git://git.postgresql.org/git/postgresql.git
-
-
- This will copy the full repository to your local machine, so it may take
- a while to complete, especially if you have a slow Internet connection.
-
-
-
- The Git mirror can also be reached via the HTTP protocol in case for example
- a firewall is blocking access to the Git protocol. Just replace the URL
- like:
-
-
-git clone http://git.postgresql.org/git/postgresql.git
-
-
- The HTTP protocol is less efficient than the Git protocol, so it will be
- slightly slower to use.
-
-
-
-
-
- Whenever you want to get the latest updates in the system, cd>
- into the repository, and run:
-
-
-git fetch
-
-
-
-
-
- Git> can do a lot more things than just fetch the source. For
- more information, consult the man pages for the product, or the website at
- >.
-
-
-
-
- Getting The Source Via Anonymous CVS
-
-
- If you would like to keep up with the current sources on a regular
- basis, you can fetch them from our CVS server
- and then use CVS to
- retrieve updates from time to time.
-
-
-
- Anonymous CVS
-
-
-
- You will need a local copy of CVS
- (Concurrent Version Control System), which you can get from
- (the official
- site with the latest version) or any GNU software archive site
- (often somewhat outdated). Many systems have a recent version of
- cvs installed by default.
-
-
-
-
-
- Do an initial login to the CVS server:
-
-
-cvs -d :pserver:anoncvs@anoncvs.postgresql.org:/projects/cvsroot login
-
-
- You will be prompted for a password; you can enter anything except
- an empty string.
-
-
-
- You should only need to do this once, since the password will be
- saved in .cvspass in your home directory.
-
-
-
-
-
- Fetch the PostgreSQL sources:
-
-cvs -z3 -d :pserver:anoncvs@anoncvs.postgresql.org:/projects/cvsroot co -P pgsql
-
-
- This installs the PostgreSQL sources into a
- subdirectory pgsql
- of the directory you are currently in.
-
-
-
- This initial checkout is a little slower than simply downloading
- a tar.gz file. The advantage of CVS>
- doesn't show up until you want to update the file set later on.
-
-
-
-
-
- Whenever you want to update to the latest CVS sources,
- cd into
- the pgsql subdirectory, and issue:
-
-cvs -z3 update -d -P
-
-
- This will fetch only the changes since the last time you updated.
- You can update in just a couple of minutes, typically, even over
- a modem-speed line.
-
-
-
-
-
- You can save yourself some typing by making a file .cvsrc
- in your home directory that contains:
-
-
-cvs -z3
-update -d -P
-
-
- This supplies the option to all cvs> commands, and the
- and options to cvs update>. Then you just have
- to say:
-
-cvs update
-
-
- to update your files.
-
-
-
-
-
- CVS can do a lot of other things, such
- as fetching prior revisions of the
- PostgreSQL sources rather than the
- latest development version. For more info consult the manual that
- comes with CVS, or see the online
- documentation at .
-
-
- CVS has deficiencies. For example,
- generating diffs that add or remove files requires write access to the
- CVS repository. To work around that deficiency, use
- cvsutils, which is packaged in several
- operating systems, and is available in source form at , or use Git>
- or another system designed to work offline.
-
-
-
- Note that building PostgreSQL from a CVS
- pull requires reasonably up-to-date versions of bison>
- and flex>, which are not needed to build from a distribution
- tarball because the files made with them are pre-built in a tarball.
- You will need Perl as well.
- Otherwise the tool requirements are the same as building from source.
-
-
-
-
- Getting The Source Via rsync
-
-
- An alternative to using anonymous CVS for retrieving the
- PostgreSQL source tree is
- rsync, an incremental file transfer tool.
- A major advantage to using rsync instead of
- plain cvs> is that it
- can reliably replicate the entire CVS repository
- on your local system, allowing fast local access to cvs>
- operations such as and .
- Other advantages include fast synchronization to the
- PostgreSQL server due to an efficient
- streaming transfer protocol which only sends the changes since the last
- update.
-
-
-
- You can download the CVS repository using this command:
-
-rsync -avzH --delete anoncvs.postgresql.org::pgsql-cvs cvsroot/
-
- For full instructions, see the "rsync" section in the
-
- PostgreSQL Build Farm instructions.
-
-
-
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index ef86190ef52..b107c02b023 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -137,12 +137,12 @@
-
+
diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index a1fea05c671..50c28ebdc0c 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -176,7 +176,7 @@ $ENV{PATH}=$ENV{PATH} . ';c:\some\where\bison\bin';
Bison and
Flex
- Bison and Flex are required to build from CVS, but not required when
+ Bison and Flex are required to build from Git, but not required when
building from a release file. Note that only Bison 1.875 or versions
2.2 and later will work. Also, Flex version 2.5.31 or later is required.
Bison can be downloaded from >.
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index e09ff1842f0..f3659ba0dd2 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -274,7 +274,7 @@ su - postgres
- If you are building from a CVS tree instead of
+ If you are building from a Git tree instead of
using a released source package, or if you want to do server development,
you also need the following packages:
@@ -295,7 +295,7 @@ su - postgres
GNU Flex> and Bison>
- are needed to build from a CVS checkout, or if you changed the actual
+ are needed to build from a Git checkout, or if you changed the actual
scanner and parser definition files. If you need them, be sure
to get Flex> 2.5.31 or later and
Bison> 1.875 or later. Other lex>
@@ -308,7 +308,7 @@ su - postgres
perl
- Perl> 5.8 or later is needed to build from a CVS checkout,
+ Perl> 5.8 or later is needed to build from a Git checkout,
or if you changed the input files for any of the build steps that
use Perl scripts. If building on Windows you will need
Perl> in any case.
@@ -361,7 +361,7 @@ su - postgres
You can also get the source directly from the version control repository, see
- .
+ .
]]>
@@ -2562,7 +2562,7 @@ make MAX_CONNECTIONS=5 check
Aside from the PostgreSQL source distribution, you will need GNU
make (HP's make will not do), and either GCC or HP's full ANSI C
- compiler. If you intend to build from CVS sources rather than a
+ compiler. If you intend to build from Git sources rather than a
distribution tarball, you will also need Flex (GNU lex) and Bison
(GNU yacc). We also recommend making sure you are fairly
up-to-date on HP patches. At a minimum, if you are building 64
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 79cd44fbd13..4d32f7db259 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -258,7 +258,7 @@
&release;
&contrib;
&external-projects;
- &cvs;
+ &sourcerepo;
&docguide;
&acronyms;
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index 06494318443..5704d3f897a 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -228,8 +228,8 @@
If the function or the options do not exist then your version is
more than old enough to warrant an upgrade.
If you run a prepackaged version, such as RPMs, say so, including any
- subversion the package might have. If you are talking about a CVS
- snapshot, mention that, including its date and time.
+ subversion the package might have. If you are talking about a Git
+ snapshot, mention that, including the commit hash.
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 1a1ad3d9fe9..9a1ca8f57bb 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -49,14 +49,12 @@ can be created without links to the main documentation. Don't use .
A complete list of changes for each release can be obtained by
- viewing the CVS logs for each release.
+ viewing the Git logs for each release.
The pgsql-committers
email list records all source code changes as well. There is also
- a web
+ a web
interface that shows changes to specific files.
-
diff --git a/doc/src/sgml/sourcerepo.sgml b/doc/src/sgml/sourcerepo.sgml
new file mode 100644
index 00000000000..9c815a82915
--- /dev/null
+++ b/doc/src/sgml/sourcerepo.sgml
@@ -0,0 +1,93 @@
+
+
+
+ The Source Code Repository
+
+
+ The PostgreSQL source code is stored and managed using the
+ Git version control system. An public mirror of this
+ is available and updated within a minute of the master repository.
+
+
+
+ Our wiki, ,
+ has additional details on working with Git.
+
+
+
+ Note that building PostgreSQL from the source
+ repository requires reasonably up-to-date versions of bison>
+ and flex>. These tools are not needed to build from a
+ distribution tarball since their output is included in the file.
+ You will need Perl as well, but otherwise the tool requirements are the
+ same.
+
+
+
+ Getting The Source Via Git>
+
+
+ With Git> you will make a copy of the entire code repository
+ to your local machine, so you will have access to all history and branches
+ offline. This is the fastest and most flexible way to develop or test
+ patches.
+
+
+
+ Git
+
+
+
+ You will need an installed version of Git>, which you can get
+ from . Many systems also have a recent
+ version of Git> installed by default, or available in their
+ package repository system.
+
+
+
+
+
+ To being using the Git repository, make a clone of the official mirror:
+
+
+git clone git://git.postgresql.org/git/postgresql.git
+
+
+ This will copy the full repository to your local machine, so it may take
+ a while to complete, especially if you have a slow Internet connection.
+
+
+
+ The Git mirror can also be reached via the HTTP protocol in case for example
+ a firewall is blocking access to the Git protocol. Just replace the URL
+ like:
+
+
+git clone http://git.postgresql.org/git/postgresql.git
+
+
+ The HTTP protocol is less efficient than the Git protocol, so it will be
+ slower to use.
+
+
+
+
+
+ Whenever you want to get the latest updates in the system, cd>
+ into the repository, and run:
+
+
+git fetch
+
+
+
+
+
+ Git> can do a lot more things than just fetch the source. For
+ more information, consult the man pages for the product, or the website at
+ >.
+
+
+
+