generated

[privoxy.git] / doc / webserver / user-manual / installation.html

diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 7c77555..adce89d 100644 (file)
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -71,7 +71,7 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="INSTALLATION"
->3. Installation</A
+>2. Installation</A
 ></H1
 ><P
 > <SPAN
@@ -85,29 +85,7 @@ HREF="http://sourceforge.net/projects/ijbswa/"
 TARGET="_top"
 >Privoxy Project
  Page</A
->. For installing and compiling the source code, please look 
- into our Developer Manual.</P
-><P
-> If you like to live on the bleeding edge and are not afraid of using
- possibly unstable development versions, you can check out the up-to-the-minute
- version directly from <A
-HREF="http://sourceforge.net/cvs/?group_id=11118"
-TARGET="_top"
->the
- CVS repository</A
-> or simply download <A
-HREF="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz"
-TARGET="_top"
->the nightly CVS
- tarball.</A
-> Again, we refer you to the Developer Manual.</P
-><P
-> At present, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is known to run on
- Windows(95, 98, ME, 2000, XP), Linux (RedHat, Suse, Debian), Mac OSX,
- OS/2, AmigaOS, FreeBSD, NetBSD, BeOS, and many more flavors of Unix.</P
+>.</P
 ><P
 > Note: If you have a previous <SPAN
 CLASS="APPLICATION"
@@ -118,9 +96,8 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > installation on your system, you
  will need to remove it.  Some platforms do this for you as part 
- of their installation procedure. (See below for your platform).</P
-><P
-> In any case <I
+ of their installation procedure. (See below for your platform).
+ In any case <I
 CLASS="EMPHASIS"
 >be sure to backup your old configuration
  if it is valuable to you.</I
@@ -135,13 +112,23 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="INSTALLATION-PACK-RPM"
->3.1. Red Hat and SuSE RPMs</A
+NAME="INSTALLATION-PACKAGES"
+>2.1. Binary Packages</A
 ></H2
 ><P
+>How to install the binary packages depends on your operating system:</P
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="INSTALLATION-PACK-RPM"
+>2.1.1. Red Hat and SuSE RPMs</A
+></H3
+><P
 > RPMs can be installed with <TT
 CLASS="LITERAL"
->rpm -Uvh privoxy-2.9.14-1.rpm</TT
+>rpm -Uvh privoxy-2.9.15-1.rpm</TT
 >,
  and will use <TT
 CLASS="FILENAME"
@@ -170,7 +157,7 @@ automatically start Privoxy in the boot process.</P
 > If you have problems with failed dependencies, try rebuilding the SRC RPM: 
  <TT
 CLASS="LITERAL"
->rpm --rebuild privoxy-2.9.14-1.src.rpm;</TT
+>rpm --rebuild privoxy-2.9.15-1.src.rpm;</TT
 >. This 
  will use your locally installed libraries and RPM version. </P
 ><P
@@ -189,24 +176,24 @@ CLASS="APPLICATION"
 >.</P
 ></DIV
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
 ><A
 NAME="INSTALLATION-DEB"
->3.2. Debian</A
-></H2
+>2.1.2. Debian</A
+></H3
 ><P
 > FIXME.</P
 ></DIV
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
 ><A
 NAME="INSTALLATION-PACK-WIN"
->3.3. Windows</A
-></H2
+>2.1.3. Windows</A
+></H3
 ><P
 > Just double-click the installer, which will guide you through
  the installation process. You will find the configuration files
@@ -214,13 +201,13 @@ NAME="INSTALLATION-PACK-WIN"
  use the registry of Windows. </P
 ></DIV
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
 ><A
 NAME="INSTALLATION-PACK-BINTGZ"
->3.4. Solaris, NetBSD, FreeBSD, HP-UX</A
-></H2
+>2.1.4. Solaris, NetBSD, FreeBSD, HP-UX</A
+></H3
 ><P
 > Create a new directory, <TT
 CLASS="LITERAL"
@@ -230,13 +217,13 @@ CLASS="LITERAL"
  things go. FIXME.</P
 ></DIV
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
 ><A
 NAME="INSTALLATION-OS2"
->3.5. OS/2</A
-></H2
+>2.1.5. OS/2</A
+></H3
 ><P
 > First, make sure that no previous installations of
  <SPAN
@@ -264,13 +251,13 @@ CLASS="APPLICATION"
  into will contain all of the configuration files.</P
 ></DIV
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
 ><A
 NAME="INSTALLATION-MAC"
->3.6. Max OSX</A
-></H2
+>2.1.6. Max OSX</A
+></H3
 ><P
 > Unzip the downloaded package (you can either double-click on the file
  in the finder, or on the desktop if you downloaded it there).  Then,
@@ -295,13 +282,13 @@ CLASS="LITERAL"
 >.</P
 ></DIV
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
 ><A
 NAME="INSTALLATION-AMIGA"
->3.7. AmigaOS</A
-></H2
+>2.1.7. AmigaOS</A
+></H3
 ><P
 > Copy and then unpack the <TT
 CLASS="FILENAME"
@@ -339,6 +326,159 @@ CLASS="APPLICATION"
 ></DIV
 ></DIV
 ><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="INSTALLATION-SOURCE"
+>2.2. Building from Source</A
+></H2
+><P
+> The most convenient way to obtain the <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> sources
+ is to download the source tarball from our <A
+HREF="http://sf.net/projects/ijbswa/"
+TARGET="_top"
+>project
+ page</A
+>.</P
+><P
+> If you like to live on the bleeding edge and are not afraid of using
+ possibly unstable development versions, you can check out the up-to-the-minute
+ version directly from <A
+HREF="http://sourceforge.net/cvs/?group_id=11118"
+TARGET="_top"
+>the
+ CVS repository</A
+> or simply download <A
+HREF="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz"
+TARGET="_top"
+>the nightly CVS
+ tarball.</A
+></P
+><P
+> To build <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> from source, 
+ <A
+HREF="http://www.gnu.org/software/autoconf/autoconf.html"
+TARGET="_top"
+>autoconf</A
+>,
+ <A
+HREF="http://www.gnu.org/software/make/make.html"
+TARGET="_top"
+>GNU make
+ (gmake)</A
+>, and, of course, a C compiler like <A
+HREF="http://www.gnu.org/software/gcc/gcc.html"
+TARGET="_top"
+>gcc</A
+> are required.</P
+><P
+> When building from a source tarball (either release version or
+ <A
+HREF="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz"
+TARGET="_top"
+>nightly CVS
+ tarball</A
+>), first unpack the source: </P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+> tar xzvf privoxy-2.9.15-beta-src* [.tgz or .tar.gz]
+ cd privoxy-2.9.15-beta</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+> For retrieving the current CVS sources, you'll need CVS installed.
+ Note that sources from CVS are development quality, and may not be
+ stable, or well tested. To download CVS source:</P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>  cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
+  cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co current
+  cd current</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+> This will create a directory named <TT
+CLASS="FILENAME"
+>current/</TT
+>, which will 
+ contain the source tree.</P
+><P
+> Then, in either case, to build from unpacked tarball or CVS source:</P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+> autoheader
+ autoconf
+ ./configure      # (--help to see options)
+ make             # (the make from gnu, gmake for *BSD) 
+ su 
+ make -n install  # (to see where all the files will go)
+ make install     # (to really install)</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>  If you have gnu make, you can have the first four steps 
+  automatically done for you by just typing:</P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>  make</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>  in the freshly downloaded or unpacked source directory.</P
+><P
+> For more detailed instructions on how to build Redhat and SuSE RPMs,
+ Windows self-extracting installers, building on platforms with
+ special requirements etc, please consult the <A
+HREF="../developer-manual/newrelease.html"
+TARGET="_top"
+>developer manual</A
+>.</P
+></DIV
+></DIV
+><DIV
 CLASS="NAVFOOTER"
 ><HR
 ALIGN="LEFT"