Changeset 2205

Show
Ignore:
Timestamp:
23/10/08 12:14:09 (1 year ago)
Author:
taher
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r2202 r2205  
     12008-10-23  Taher Shihadeh  <taher@unixwars.com> 
     2 
     3        * admin/Page.py, admin/ModuleBalancer.py, admin/PageInfoSource.py, 
     4        doc/config.txt, doc/config_info_sources.txt, 
     5        doc/cookbook_django.txt, doc/index.txt, doc/config_quickstart.txt: 
     6        unify naming conventions to address issue 
     7        http://code.google.com/p/cherokee/issues/detail?id=152. 
     8 
    192008-10-17  Alvaro Lopez Ortega  <alvaro@octality.com> 
    210 
    …… 
    142150        redirections, and 176 ensure that bug#146 is fixed: 
    143151        http://code.google.com/p/cherokee/issues/detail?id=146 
    144          
     152 
    145153        * cherokee/validator_htdigest.c (extract_user_entry): Fixes an 
    146154        error processing htdigest files. Reported by Eric Drechsel 

  • cherokee/trunk/admin/ModuleBalancer.py

    r2105 r2205  
    66 
    77NOTE_BALANCER      = 'Allow to select how the connections will be dispatched.' 
    8 NO_GENERAL_SOURCES = 'There are no Information Sources configured. Please proceed to configure an <a href="/source">Info Source</a>.' 
    9 NO_SOURCE_WARNING  = 'A load balancer must be configured to use at least one data source.' 
     8NO_GENERAL_SOURCES = 'There are no Information Sources configured. Please proceed to configure an <a href="/source">Information Source</a>.' 
     9NO_SOURCE_WARNING  = 'A load balancer must be configured to use at least one information source.' 
    1010 
    1111class ModuleBalancerGeneric (Module, FormHelper): 
    …… 
    3535            txt += self.Dialog(NO_SOURCE_WARNING, type_='warning') 
    3636        else: 
    37             txt += '<h2>Info Sources</h2>' 
     37            txt += '<h2>Information Sources</h2>' 
    3838            table = Table(3,1, style='width="100%"') 
    3939            table += ('Nick', 'Host', '') 
    …… 
    5151            txt += str(table) 
    5252 
    53         txt += '<h2>Assign Info Sources</h2>' 
     53        txt += '<h2>Assign Information Sources</h2>' 
    5454        if not general_left: 
    5555            txt += 'It is already balancing among all the configured ' + \ 

  • cherokee/trunk/admin/Page.py

    r2136 r2205  
    4343<li id="general"><a href="/general">General</a></li> 
    4444<li id="vserver"><a href="/vserver">Virtual Servers</a></li> 
    45 <li id="source"><a href="/source">Info Sources</a></li> 
     45<li id="source"><a href="/source">Information Sources</a></li> 
    4646<li id="icon"><a href="/icons">Icons</a></li> 
    4747<li id="mime"><a href="/mime">Mime Types</a></li> 

  • cherokee/trunk/admin/PageInfoSource.py

    r2074 r2205  
    2323 
    2424HELPS = [ 
    25     ('config_info_sources', "Info Sources") 
     25    ('config_info_sources', "Information Sources") 
    2626] 
    2727 

  • cherokee/trunk/doc/config.txt

    r1992 r2205  
    66  . link:config_virtual_servers.html[Virtual servers]: Server definition. 
    77    - link:config_virtual_servers_rule.html[Rule Options]: Specifying the matching rules. 
    8   . link:config_info_sources.html[Info Sources]: Defining information sources. 
     8  . link:config_info_sources.html[Information Sources]: Defining information sources. 
    99  . link:config_icons.html[Icons]: Icon managment. 
    1010  . link:config_mime_types.html[Mime Types]: Setting up the MIME types. 

  • cherokee/trunk/doc/config_info_sources.txt

    r2043 r2205  
    3232whatever options do not apply. 
    3333 
    34 image::media/images/admin_info_sources.png[Info Sources] 
     34image::media/images/admin_info_sources.png[Information Sources] 
    3535 
    3636Unix Sockets 

  • cherokee/trunk/doc/config_quickstart.txt

    r2123 r2205  
    3333  facilities, etc. 
    3434 
    35 * link:config_info_sources.html[Info Sources]: 
     35* link:config_info_sources.html[Information Sources]: 
    3636  Define the resources that will be providing information. For 
    3737  instance, PHP. 

  • cherokee/trunk/doc/cookbook_django.txt

    r2058 r2205  
    7171service. This is done by adding one or more information sources. 
    7272 
    73 image::media/images/cookbook_django_infosources.png[Info Sources] 
     73image::media/images/cookbook_django_infosources.png[Information Sources] 
    7474 
    7575Note that you will have to manually launch the `spawner` if 

  • cherokee/trunk/doc/index.txt

    r2043 r2205  
    3535  . link:config_virtual_servers.html[Virtual servers]: Server definition. 
    3636    - link:config_virtual_servers_rule.html[Rule Options]: Specifying the matching rules. 
    37   . link:config_info_sources.html[Info Sources]: Defining information sources. 
     37  . link:config_info_sources.html[Information Sources]: Defining information sources. 
    3838  . link:config_icons.html[Icons]: Icon managment. 
    3939  . link:config_mime_types.html[Mime Types]: Setting up the MIME types.