commit 8f7d0b74e7b3a5bedc5af79cfa0c429ea3e4b027 Author: Ximin Luo <infinity0@gmx.com> Date: Wed Nov 20 14:00:56 2013 +0000 merge proxy/modules README so that there are less files to read/install --- proxy/README | 11 ++++++++++- proxy/modules/README | 8 -------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/proxy/README b/proxy/README index 8cb31b4..18de1c8 100644 --- a/proxy/README +++ b/proxy/README @@ -1,4 +1,13 @@ -This directory contains the flash proxy JavaScript proxy program and +The proxy directory contains the flash proxy JavaScript proxy program and associated HTML and media files. End users don't have to do anything with these files. They are meant to be installed on a centralized web server and then accessed through a browser. + +The modules subdirectory contains modules and plugins for making flash +proxies work with other systems such as web publishing platforms. + +See a collection of modules for other platforms at +https://github.com/glamrock/cupcake. + +For a plugin for Mozilla Firefox, see +https://addons.mozilla.org/en-us/firefox/addon/tor-flashproxy-badge/. diff --git a/proxy/modules/README b/proxy/modules/README deleted file mode 100644 index 520a47b..0000000 --- a/proxy/modules/README +++ /dev/null @@ -1,8 +0,0 @@ -This directory contains modules and plugins for making flash proxies -work with other systems such as web publishing platforms. - -See a collection of modules for other platforms at -https://github.com/glamrock/cupcake. - -For a plugin for Mozilla Firefox, see -https://addons.mozilla.org/en-us/firefox/addon/tor-flashproxy-badge/.