FAQ: Change the sponsor amounts to USD

[privoxy.git] / doc / source / buildsource.sgml

diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index b5a0e36..81013cd 100644 (file)
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -22,56 +22,51 @@
 <para>
  To build <application>Privoxy</application> from source,
  <ulink url="http://www.gnu.org/software/autoconf/autoconf.html">autoconf</ulink>,
 <para>
  To build <application>Privoxy</application> from source,
  <ulink url="http://www.gnu.org/software/autoconf/autoconf.html">autoconf</ulink>,

- <ulink
- url="http://www.gnu.org/software/make/make.html">GNU make
- (gmake)</ulink>, and, of course, a C compiler like <ulink
- url="http://www.gnu.org/software/gcc/gcc.html">gcc</ulink> are required.
+ <ulink url="http://www.gnu.org/software/make/make.html">GNU make (gmake)</ulink>,
+ and, of course, a C compiler like
+ <ulink url="http://www.gnu.org/software/gcc/gcc.html">gcc</ulink> are required.

 </para>
 
 <para>
  When building from a source tarball,
 </para>
 
 <para>
  When building from a source tarball,

-<!--
- no longer available ...
- <ulink
- url="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz">nightly CVS
- tarball</ulink>),
---> first unpack the source:
+ first unpack the source:

 </para>
 
 </para>
 

- <screen>
+<screen>

  tar xzvf privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>-src.tar.gz
  cd privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>
 </screen>
 
 <para>
  tar xzvf privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>-src.tar.gz
  cd privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>
 </screen>
 
 <para>

- For retrieving the current CVS sources, you'll need a CVS client installed.
- Note that sources from CVS are typically development quality, and may not be
- stable, or well tested. To download CVS source, check the Sourceforge
- documentation, which might give commands like:
+ To build the development version, you can get the source code by doing:

 </para>
 
 </para>
 

- <screen>
-  cvs -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa login
-  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co current
-  cd current
+<screen>
+  cd &lt;root-dir>
+  git clone https://www.privoxy.org/git/privoxy.git

 </screen>
 
 <para>
 </screen>
 
 <para>

- This will create a directory named <filename>current/</filename>, which will
- contain the source tree.
+ This will create a directory named <filename>&lt;root-dir>/privoxy/</filename>,
+ which will contain the source tree.

 </para>
 
 <para>
 </para>
 
 <para>

+ Note that source code in Git is development quality, and may not be
+ stable or well tested.
+</para>
+
+<!-- para>

  You can also check out any <application>Privoxy</application>
  <quote>branch</quote>, just exchange the <application>current</application>
  name with the wanted branch name (Example: v_3_0_branch for the 3.0 cvs
  tree).
  You can also check out any <application>Privoxy</application>
  <quote>branch</quote>, just exchange the <application>current</application>
  name with the wanted branch name (Example: v_3_0_branch for the 3.0 cvs
  tree).

-</para>
+</para -->

 
 <para>
 
 <para>

- It is also strongly recommended to not run <application>Privoxy</application>
+ It is strongly recommended to not run <application>Privoxy</application>

  as root. You should configure/install/run <application>Privoxy</application> as
  as root. You should configure/install/run <application>Privoxy</application> as

- an unprivileged user, preferably by  creating a <quote>privoxy</quote> user
+ an unprivileged user, preferably by creating a <quote>privoxy</quote> user

  and group just for this purpose. See your local documentation for the correct
  command line to do add new users and groups (something like
  <command>adduser</command>, but the command syntax may vary from platform
  and group just for this purpose. See your local documentation for the correct
  command line to do add new users and groups (something like
  <command>adduser</command>, but the command syntax may vary from platform


@@ -95,7 +90,7 @@
 </para>
 
 <para>
 </para>
 
 <para>

- Then, to build from either unpacked tarball or CVS source:
+ Then, to build from either unpacked tarball or Git checkout:

 </para>
 
  <screen>
 </para>
 
  <screen>