X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=README;h=d1b983d76aebea4cfbc8391f764f28496cf42c1d;hp=7b1f4a2af072642cbbb1592dadae70f1a117df54;hb=1018e1e4c80f7e02cb0cd3c7e9d2f3f22feb74e8;hpb=9fe0457c5167062cae1ff13b5aa6e10116eec537

diff --git a/README b/README
index 7b1f4a2af0..d1b983d76a 100644
--- a/README
+++ b/README
@@ -203,11 +203,6 @@ interfaces should be included (among other things).  The following list
 of options was extracted from the output of './configure --help'.  Other
 options may be available there:
 
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer
-			  NOTE: This option is *required* for GIT builds!
-			  It should *not* be used to build a release.
-
   --enable-dummy          Enable building the dummy JTAG port driver
 
   --enable-parport        Enable building the pc parallel port driver
@@ -275,6 +270,8 @@ options may be available there:
 
   --enable-stlink         Enable building support for the ST-Link JTAG
                           Programmer
+  --enable-ti-icdi        Enable building support for the TI/Stellaris ICDI
+                          JTAG Programmer
 
   --enable-osbdm          Enable building support for the OSBDM (JTAG only)
                           Programmer
@@ -289,7 +286,7 @@ options may be available there:
 
   --disable-internal-jimtcl
                           Disable building internal jimtcl
-  --enable-libusb0        Use libusb-0.1 library for USB JTAG devices
+
   --enable-remote-bitbang Enable building support for the Remote Bitbang jtag
                           driver
 
@@ -421,7 +418,7 @@ Obtaining OpenOCD From GIT
 You can download the current GIT version with a GIT client of your
 choice from the main repository:
 
-   git://openocd.git.sourceforge.net/gitroot/openocd/openocd
+   git://git.code.sf.net/p/openocd/code
 
 You may prefer to use a mirror:
 
@@ -432,7 +429,7 @@ Using the GIT command line client, you might use the following command
 to set up a local copy of the current repository (make sure there is no
 directory called "openocd" in the current directory):
 
-   git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd
+   git clone git://git.code.sf.net/p/openocd/code openocd
 
 Then you can update that at your convenience using
 
@@ -441,7 +438,6 @@ Then you can update that at your convenience using
 There is also a gitweb interface, which you can use either to browse
 the repository or to download arbitrary snapshots using HTTP:
 
-   http://openocd.git.sourceforge.net/git/gitweb.cgi?p=openocd/openocd
    http://repo.or.cz/w/openocd.git
 
 Snapshots are compressed tarballs of the source tree, about 1.3 MBytes
@@ -452,9 +448,9 @@ Tips For Building From a GIT Repository
 ---------------------------------------
 
 Building OpenOCD from a repository requires a recent version of the GNU
-autotools (autoconf >= 2.59 and automake >= 1.9).
+autotools (autoconf >= 2.60 and automake >= 1.9).
 
 1) Run './bootstrap' to create the 'configure' script and prepare
    the build process for your host system.
 
-2) Run './configure --enable-maintainer-mode' with other options.
+2) Run './configure' with other options.