[svn-commits] tilghman: branch 1.6.0 r125192 - in /branches/1.6.0: ./ configs/http.conf.sample

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jun 25 20:13:45 2008
New Revision: 125192

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125192
Log:
Merged revisions 125191 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r125191 | tilghman | 2008-06-25 20:11:43 -0500 (Wed, 25 Jun 2008) | 6 lines

Update sample configuration to match what are now the defaults for the prefix.
(closes issue #12838, related to issue #12198)
 Reported by: pabelanger
 Patches: 
       http.conf.diff2 uploaded by pabelanger (license 224)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/http.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/http.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/http.conf.sample?view=diff&rev=125192&r1=125191&r2=125192
==============================================================================
--- branches/1.6.0/configs/http.conf.sample (original)
+++ branches/1.6.0/configs/http.conf.sample Wed Jun 25 20:13:45 2008
@@ -9,7 +9,7 @@
 ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
 ;   and "bindport" options, then you should be able to view the documentation
 ;   remotely by browsing to:
-;       http://<server_ip>:<bindport/asterisk/static/docs/index.html
+;       http://<server_ip>:<bindport>/static/docs/index.html
 ;
 [general]
 ;
@@ -27,8 +27,8 @@
 ;bindport=8088
 ;
 ; Prefix allows you to specify a prefix for all requests
-; to the server.  The default is "asterisk" so that all
-; requests must begin with /asterisk
+; to the server.  The default is blank.  If uncommented
+; all requests must begin with /asterisk
 ;
 ;prefix=asterisk
 ;
@@ -43,7 +43,7 @@
 ; For example, if you are using the Asterisk-gui,
 ; it is convenient to enable the following redirect:
 ;
-;redirect = / /asterisk/static/config/cfgbasic.html
+;redirect = / /static/config/cfgbasic.html
 ;
 ; HTTPS support. In addition to enabled=yes, you need to
 ; explicitly enable ssl, define the port to use,