X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=INSTALL;h=c8e1f96f0237a52b97046c5ee7189df94c397f05;hp=618dede787aafa191058ef9bd34fdb763a3129a7;hb=0d04dd411e43b85c164e15e504db49607be72b3b;hpb=44fba3a03f28520463deaf655f1cfd77a401732d

diff --git a/INSTALL b/INSTALL
index 618dede7..c8e1f96f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,11 @@
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/INSTALL,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/doc/source/install.sgml,v $
  *
  * Purpose     :  INSTALL file to help with installing from source.
  *
  * Copyright   :  Written by and Copyright (C) 2001-2009 the
- *                Privoxy team. http://www.privoxy.org/
+ *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -31,7 +31,6 @@
  *                USA
  *
  *********************************************************************/
-   
 
 -------------------------------------------------------------------------------
 
@@ -40,29 +39,25 @@ compiler like gcc are required.
 
 When building from a source tarball, first unpack the source:
 
- tar xzvf privoxy-3.0.19-stable-src.tar.gz
- cd privoxy-3.0.19-stable
+  tar xzvf privoxy-3.0.33-stable-src.tar.gz
+  cd privoxy-3.0.33-stable
 
-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:
 
-  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
+  cd <root-dir>
+  git clone https://www.privoxy.org/git/privoxy.git
 
-This will create a directory named current/, which will contain the source
-tree.
+This will create a directory named <root-dir>/privoxy/, which will contain the
+source tree.
 
-You can also check out any Privoxy "branch", just exchange the current name
-with the wanted branch name (Example: v_3_0_branch for the 3.0 cvs tree).
+Note that source code in Git is development quality, and may not be stable or
+well tested.
 
-It is also strongly recommended to not run Privoxy as root. You should
-configure/install/run Privoxy as an unprivileged user, preferably by creating a
-"privoxy" 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
-adduser, but the command syntax may vary from platform to platform).
+It is strongly recommended to not run Privoxy as root. You should configure/
+install/run Privoxy as an unprivileged user, preferably by creating a "privoxy"
+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 adduser,
+but the command syntax may vary from platform to platform).
 
 /etc/passwd might then look like:
 
@@ -74,15 +69,15 @@ And then /etc/group, like:
 
 Some binary packages may do this for you.
 
-Then, to build from either unpacked tarball or CVS source:
+Then, to build from either unpacked tarball or Git checkout:
 
- autoheader
- autoconf
- ./configure      # (--help to see options)
- make             # (the make from GNU, sometimes called gmake)
- su               # Possibly required
- make -n install  # (to see where all the files will go)
- make -s install  # (to really install, -s to silence output)
+  autoheader
+  autoconf
+  ./configure      # (--help to see options)
+  make             # (the make from GNU, sometimes called gmake)
+  su               # Possibly required
+  make -n install  # (to see where all the files will go)
+  make -s install  # (to really install, -s to silence output)
 
 Using GNU make, you can have the first four steps automatically done for you by
 just typing:
@@ -95,10 +90,10 @@ To build an executable with security enhanced features so that users cannot
 easily bypass the proxy (e.g. "Go There Anyway"), or alter their own
 configurations, configure like this:
 
- ./configure  --disable-toggle  --disable-editor  --disable-force
+  ./configure  --disable-toggle  --disable-editor  --disable-force
 
-Then build as above. In Privoxy 3.0.7 and later, all of these options can also
-be disabled through the configuration file.
+Note that all of these options can also be disabled through the configuration
+file.
 
 WARNING: If installing as root, the install will fail unless a non-root user or
 group is specified, or a privoxy user and group already exist on the system. If
@@ -115,7 +110,7 @@ be run as this same user to insure write access to configuration and log files!
 Alternately, you can specify user and group on the make command line, but be
 sure both already exist:
 
- make -s install  USER=privoxy GROUP=privoxy
+  make -s install  USER=privoxy GROUP=privoxy
 
 The default installation path for make install is /usr/local. This may of
 course be customized with the various ./configure path options. If you are