[Gnash-commit] gnash ChangeLog doc/C/gnashrc.xml

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/20 17:12:08

Modified files:
        .              : ChangeLog 
        doc/C          : gnashrc.xml 

Log message:
        * doc/C/gnashrc.xml: fixed description of whitelist/blacklist settings 
(if we change our mind we'll fix this again, but worth keeping in sync with 
code)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1676&r2=1.1677
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnashrc.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1676
retrieving revision 1.1677
diff -u -b -r1.1676 -r1.1677
--- ChangeLog   20 Nov 2006 16:44:09 -0000      1.1676
+++ ChangeLog   20 Nov 2006 17:12:07 -0000      1.1677
@@ -1,19 +1,27 @@
+2006-11-20 Sandro Santilli <address@hidden>
+
+       * doc/C/gnashrc.xml: fixed description of whitelist/blacklist 
+         settings.
+
 2006-11-20 Vitaly Alexeev <address@hidden>
+
        * plugin\win32\plugin.cpp: reanimated
        * win32\VC8\npgnash.vcproj: reanimated
 
 2006-11-20 Vitaly Alexeev <address@hidden>
 
-       * server\parser\movie_def_impl.cpp: usleep(x) ==> Sleep(x/1000) for 
win32,
-       'return _thread == 0' is invalid in win32 that 'pthread_t' is typedef 
struct {
+       * server\parser\movie_def_impl.cpp:
+         usleep(x) ==> Sleep(x/1000) for win32;
+         'return _thread == 0' is invalid in win32 that 'pthread_t'
+         is typedef struct {
     void * p;                   /* Pointer to actual object */
     unsigned int x;             /* Extra information - reuse count etc */
        } ptw32_handle_t;
        * server\video_stream_instance.h: typo
        * gui\gui.cpp: typo
        * backend\render_handler_ogl.cpp: GL/glx.h is absent in win32
-       * backend\sound_handler_sdl.cpp: sdl_audio_callback() is switched off 
for win32
-       because of segmentation fault
+       * backend\sound_handler_sdl.cpp: sdl_audio_callback() is switched
+         off for win32 because of segmentation fault
        * server\video_stream_instance.cpp: typo
        * reconfigured win32 dir
        

Index: doc/C/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnashrc.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/C/gnashrc.xml   6 Nov 2006 19:44:50 -0000       1.3
+++ doc/C/gnashrc.xml   20 Nov 2006 17:12:07 -0000      1.4
@@ -13,7 +13,7 @@
   <para>
     Gnash supports three types of configuration variables. The three
     types are an on/off value, a numeric value, or in the case of the
-    whitelist and blacklist, a list of domain names as ASCII text.
+    whitelist and blacklist, a list of hostnames as ASCII text.
   </para>
 
    <variablelist>
@@ -47,9 +47,10 @@
        <term>whitelist</term>
        <listitem>
          <para>
-           This is a list of domain names, seperated by a colon
-           <emphasis>:</emphasis>.  External flash movies from these
-            domains are always allowed to load.
+           This is a list of hostnames, seperated by a colon
+           <emphasis>:</emphasis>. If this list is not empty,
+           only external flash movies from these hosts are allowed to
+           load.
          </para>
        </listitem>
       </varlistentry>
@@ -58,9 +59,10 @@
        <term>blacklist</term>
        <listitem>
          <para>
-           This is a list of domain names, seperated by a colon
+           This is a list of hostnames, seperated by a colon
            <emphasis>:</emphasis>.  External flash movies from these
-            domains are never allowed to load.
+            domains are never allowed to load. If whitelist is present
+           and not empty, blacklist is not used.
          </para>
        </listitem>
       </varlistentry>
@@ -148,7 +150,9 @@
     set localhost on
 
     # These sites are OK
-    set whitelist www.doonesbury.com:www.cnn.com:www.9news.com
+    # uncommenting the following line will allow load of external
+    # movies *only* from the specified hosts.
+    #set whitelist www.doonesbury.com:www.cnn.com:www.9news.com
 
     # Don't access content from these sites
     set blacklist www.doubleclick.com:mochibot.com