From 4033e6051b1178d30ffa223f2ad05414c5eecafe Mon Sep 17 00:00:00 2001 From: judas_iscariote Date: Thu, 23 Feb 2006 01:22:17 +0000 Subject: [PATCH] renamed to a simpler "docs" git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3521 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- {Shorewall-docs2 => docs}/6to4.xml | 0 {Shorewall-docs2 => docs}/Accounting.xml | 0 {Shorewall-docs2 => docs}/Actions.xml | 0 {Shorewall-docs2 => docs}/CorpNetwork.xml | 0 {Shorewall-docs2 => docs}/Documentation.xml | 0 {Shorewall-docs2 => docs}/Documentation_Index.xml | 0 {Shorewall-docs2 => docs}/ECN.xml | 0 {Shorewall-docs2 => docs}/ErrorMessages.xml | 0 {Shorewall-docs2 => docs}/FAQ.xml | 0 {Shorewall-docs2 => docs}/FAQ_fr.xml | 0 {Shorewall-docs2 => docs}/FTP.xml | 0 {Shorewall-docs2 => docs}/GenericTunnels.xml | 0 {Shorewall-docs2 => docs}/GnuCopyright.xml | 0 {Shorewall-docs2 => docs}/IPIP.xml | 0 {Shorewall-docs2 => docs}/IPP2P.xml | 0 {Shorewall-docs2 => docs}/IPSEC-2.6.xml | 0 {Shorewall-docs2 => docs}/IPSEC.xml | 0 {Shorewall-docs2 => docs}/Install.xml | 0 {Shorewall-docs2 => docs}/Introduction.xml | 0 {Shorewall-docs2 => docs}/Kernel2.6.xml | 0 {Shorewall-docs2 => docs}/MAC_Validation.xml | 0 {Shorewall-docs2 => docs}/Macros.xml | 0 {Shorewall-docs2 => docs}/MultiISP.xml | 0 {Shorewall-docs2 => docs}/Multiple_Zones.xml | 0 {Shorewall-docs2 => docs}/NAT.xml | 0 {Shorewall-docs2 => docs}/NetfilterOverview.xml | 0 {Shorewall-docs2 => docs}/OPENVPN.xml | 0 {Shorewall-docs2 => docs}/PPTP.xml | 0 {Shorewall-docs2 => docs}/PacketHandling.xml | 0 {Shorewall-docs2 => docs}/PortKnocking.xml | 0 {Shorewall-docs2 => docs}/ProxyARP.xml | 0 {Shorewall-docs2 => docs}/ReleaseModel.xml | 0 {Shorewall-docs2 => docs}/Shorewall_Doesnt.xml | 0 {Shorewall-docs2 => docs}/Shorewall_Squid_Usage.xml | 0 .../Shorewall_and_Aliased_Interfaces.xml | 0 {Shorewall-docs2 => docs}/Shorewall_and_Kazaa.xml | 0 {Shorewall-docs2 => docs}/Shorewall_and_Routing.xml | 0 {Shorewall-docs2 => docs}/SimpleBridge.xml | 0 {Shorewall-docs2 => docs}/UPnP.xml | 0 {Shorewall-docs2 => docs}/User_defined_Actions.xml | 0 {Shorewall-docs2 => docs}/VPN.xml | 0 {Shorewall-docs2 => docs}/VPNBasics.xml | 0 {Shorewall-docs2 => docs}/Xen.xml | 0 {Shorewall-docs2 => docs}/XenMyWay.xml | 0 {Shorewall-docs2 => docs}/blacklisting_support.xml | 0 {Shorewall-docs2 => docs}/bridge.xml | 0 {Shorewall-docs2 => docs}/bridge_fr.xml | 0 .../configuration_file_basics.xml | 0 {Shorewall-docs2 => docs}/dhcp.xml | 0 {Shorewall-docs2 => docs}/fallback.xml | 0 {Shorewall-docs2 => docs}/html.css | 0 {Shorewall-docs2 => docs}/images/BD21298_.gif | Bin {Shorewall-docs2 => docs}/images/BD21298_1.gif | Bin {Shorewall-docs2 => docs}/images/BD21298_2.gif | Bin {Shorewall-docs2 => docs}/images/BD21298_3.gif | Bin .../images/Blizzard-of-05-p1000205.jpg | Bin .../images/Blizzard-of-05-p1000206.jpg | Bin .../images/Blizzard-of-05-p1000207.jpg | Bin .../images/Blizzard-of-05-p1000208.jpg | Bin .../images/Blizzard-of-05-p1000209.jpg | Bin {Shorewall-docs2 => docs}/images/CorpNetwork.gif | Bin {Shorewall-docs2 => docs}/images/DMZ4.JPG | Bin {Shorewall-docs2 => docs}/images/DMZ5.JPG | Bin {Shorewall-docs2 => docs}/images/DMZ6.JPG | Bin {Shorewall-docs2 => docs}/images/Hiking1.jpg | Bin {Shorewall-docs2 => docs}/images/Legend.png | Bin {Shorewall-docs2 => docs}/images/Legend.vdx | 0 {Shorewall-docs2 => docs}/images/Legend.vsd | Bin {Shorewall-docs2 => docs}/images/Logo.png | Bin {Shorewall-docs2 => docs}/images/Logo1.gif | Bin {Shorewall-docs2 => docs}/images/Logo1.png | Bin {Shorewall-docs2 => docs}/images/Logo2.gif | Bin {Shorewall-docs2 => docs}/images/Logo3.png | Bin {Shorewall-docs2 => docs}/images/MDKlinux.jpg | Bin {Shorewall-docs2 => docs}/images/Mobile.png | Bin {Shorewall-docs2 => docs}/images/Mobile.vdx | 0 {Shorewall-docs2 => docs}/images/Mobile.vsd | Bin {Shorewall-docs2 => docs}/images/MultiPPTP.png | Bin {Shorewall-docs2 => docs}/images/MultiPPTP.vdx | 0 {Shorewall-docs2 => docs}/images/MultiPPTP.vsd | Bin {Shorewall-docs2 => docs}/images/MultiZone1.png | Bin {Shorewall-docs2 => docs}/images/MultiZone1.vdx | 0 {Shorewall-docs2 => docs}/images/MultiZone1.vsd | Bin {Shorewall-docs2 => docs}/images/MultiZone1A.png | Bin {Shorewall-docs2 => docs}/images/MultiZone1A.vdx | 0 {Shorewall-docs2 => docs}/images/MultiZone1A.vsd | Bin {Shorewall-docs2 => docs}/images/MultiZone1B.png | Bin {Shorewall-docs2 => docs}/images/MultiZone1B.vdx | 0 {Shorewall-docs2 => docs}/images/MultiZone1B.vsd | Bin {Shorewall-docs2 => docs}/images/MultiZone2.png | Bin {Shorewall-docs2 => docs}/images/MultiZone2.vdx | 0 {Shorewall-docs2 => docs}/images/MultiZone2.vsd | Bin {Shorewall-docs2 => docs}/images/MultiZone3.png | Bin {Shorewall-docs2 => docs}/images/MultiZone3.vdx | 0 {Shorewall-docs2 => docs}/images/Netfilter.png | Bin {Shorewall-docs2 => docs}/images/Netfilter.vdx | 0 {Shorewall-docs2 => docs}/images/Netfilter.vsd | Bin {Shorewall-docs2 => docs}/images/ORE.jpg | Bin {Shorewall-docs2 => docs}/images/P1000048.jpg | Bin {Shorewall-docs2 => docs}/images/P1000049.jpg | Bin {Shorewall-docs2 => docs}/images/P1000050.jpg | Bin {Shorewall-docs2 => docs}/images/ProtectedBy.png | Bin {Shorewall-docs2 => docs}/images/Proxmox.png | Bin {Shorewall-docs2 => docs}/images/QoS.png | Bin {Shorewall-docs2 => docs}/images/SY00079.gif | Bin .../images/Shorewall_Banner.gif | Bin {Shorewall-docs2 => docs}/images/SimpleBridge.dia | Bin {Shorewall-docs2 => docs}/images/SimpleBridge.png | Bin {Shorewall-docs2 => docs}/images/State_Diagram.png | Bin {Shorewall-docs2 => docs}/images/State_Diagram.vdx | 0 {Shorewall-docs2 => docs}/images/State_Diagram.vsd | Bin {Shorewall-docs2 => docs}/images/ThreeNets.png | Bin {Shorewall-docs2 => docs}/images/ThreeNets.vdx | 0 {Shorewall-docs2 => docs}/images/ThreeNets.vsd | Bin {Shorewall-docs2 => docs}/images/Thumbs.db | Bin {Shorewall-docs2 => docs}/images/Tom.jpg | Bin {Shorewall-docs2 => docs}/images/TomNTarry.png | Bin {Shorewall-docs2 => docs}/images/TransportMode.png | Bin {Shorewall-docs2 => docs}/images/TransportMode.vdx | 0 {Shorewall-docs2 => docs}/images/Troubleshoot.odg | Bin {Shorewall-docs2 => docs}/images/Troubleshoot.png | Bin {Shorewall-docs2 => docs}/images/TwoIPv6Nets1.png | Bin {Shorewall-docs2 => docs}/images/TwoISPs.png | Bin {Shorewall-docs2 => docs}/images/TwoISPs.vdx | 0 {Shorewall-docs2 => docs}/images/TwoNets1.jpg | Bin {Shorewall-docs2 => docs}/images/TwoNets1.png | Bin {Shorewall-docs2 => docs}/images/TwoNets1.vdx | 0 {Shorewall-docs2 => docs}/images/TwoNets1.vsd | Bin {Shorewall-docs2 => docs}/images/VPN.png | Bin {Shorewall-docs2 => docs}/images/VPNBasics.png | Bin {Shorewall-docs2 => docs}/images/VPNBasics.vdx | 0 .../images/Vexira_Antivirus_Logo.gif | Bin {Shorewall-docs2 => docs}/images/Xen1.png | Bin {Shorewall-docs2 => docs}/images/Xen1.vdx | 0 {Shorewall-docs2 => docs}/images/Xen2.png | Bin {Shorewall-docs2 => docs}/images/Xen2.vdx | 0 {Shorewall-docs2 => docs}/images/Xen3.png | Bin {Shorewall-docs2 => docs}/images/Xen3.vdx | 0 {Shorewall-docs2 => docs}/images/Xen4.png | Bin {Shorewall-docs2 => docs}/images/Xen4.vdx | 0 {Shorewall-docs2 => docs}/images/Xen5.dia | Bin {Shorewall-docs2 => docs}/images/Xen5.png | Bin {Shorewall-docs2 => docs}/images/ZoneDiagram.png | Bin {Shorewall-docs2 => docs}/images/ZoneDiagram.vdx | 0 {Shorewall-docs2 => docs}/images/ZoneDiagram.vsd | Bin {Shorewall-docs2 => docs}/images/alz_logo2.gif | Bin {Shorewall-docs2 => docs}/images/apache_pb1.gif | Bin {Shorewall-docs2 => docs}/images/basics.png | Bin {Shorewall-docs2 => docs}/images/basics.vdx | 0 {Shorewall-docs2 => docs}/images/basics.vsd | Bin {Shorewall-docs2 => docs}/images/basics1.png | Bin {Shorewall-docs2 => docs}/images/basics1.vdx | 0 {Shorewall-docs2 => docs}/images/basics1.vsd | Bin {Shorewall-docs2 => docs}/images/basics2.png | Bin {Shorewall-docs2 => docs}/images/basics2.vdx | 0 {Shorewall-docs2 => docs}/images/bridge.png | Bin {Shorewall-docs2 => docs}/images/bridge.vdx | 0 {Shorewall-docs2 => docs}/images/bridge2.png | Bin {Shorewall-docs2 => docs}/images/bridge2.vdx | 0 {Shorewall-docs2 => docs}/images/bridge3.png | Bin {Shorewall-docs2 => docs}/images/bridge3.vdx | 0 {Shorewall-docs2 => docs}/images/but3.png | Bin {Shorewall-docs2 => docs}/images/cache_now.gif | Bin {Shorewall-docs2 => docs}/images/clamav-logo.png | Bin {Shorewall-docs2 => docs}/images/compaq.gif | Bin {Shorewall-docs2 => docs}/images/courier-imap.png | Bin {Shorewall-docs2 => docs}/images/debian.jpg | Bin {Shorewall-docs2 => docs}/images/dmz1.png | Bin {Shorewall-docs2 => docs}/images/dmz1.vdx | 0 {Shorewall-docs2 => docs}/images/dmz1.vsd | Bin {Shorewall-docs2 => docs}/images/dmz2.png | Bin {Shorewall-docs2 => docs}/images/dmz2.vdx | 0 {Shorewall-docs2 => docs}/images/dmz2.vsd | Bin {Shorewall-docs2 => docs}/images/dmz3.png | Bin {Shorewall-docs2 => docs}/images/dmz3.vdx | 0 {Shorewall-docs2 => docs}/images/dmz3.vsd | Bin {Shorewall-docs2 => docs}/images/dmz4.png | Bin {Shorewall-docs2 => docs}/images/dmz4.vdx | 0 {Shorewall-docs2 => docs}/images/dmz4.vsd | Bin {Shorewall-docs2 => docs}/images/dmz5.png | Bin {Shorewall-docs2 => docs}/images/dmz5.vdx | 0 {Shorewall-docs2 => docs}/images/dmz5.vsd | Bin {Shorewall-docs2 => docs}/images/dmz6.png | Bin {Shorewall-docs2 => docs}/images/dmz6.vdx | 0 {Shorewall-docs2 => docs}/images/dmz6.vsd | Bin {Shorewall-docs2 => docs}/images/dyndns_anim2.gif | Bin {Shorewall-docs2 => docs}/images/j0213519.gif | Bin {Shorewall-docs2 => docs}/images/j0233056.gif | Bin {Shorewall-docs2 => docs}/images/leaflogo.gif | Bin {Shorewall-docs2 => docs}/images/leaflogo.jpg | Bin {Shorewall-docs2 => docs}/images/linux_powered.gif | Bin {Shorewall-docs2 => docs}/images/logo-sm.jpg | Bin {Shorewall-docs2 => docs}/images/logo2.png | Bin {Shorewall-docs2 => docs}/images/medbutton.png | Bin {Shorewall-docs2 => docs}/images/menuconfig.jpg | Bin {Shorewall-docs2 => docs}/images/menuconfig1.jpg | Bin {Shorewall-docs2 => docs}/images/netfilter2.6.png | Bin {Shorewall-docs2 => docs}/images/netfilterconf.png | Bin {Shorewall-docs2 => docs}/images/netfilterlogo.png | Bin {Shorewall-docs2 => docs}/images/netmap.png | Bin {Shorewall-docs2 => docs}/images/netmap.vdx | 0 {Shorewall-docs2 => docs}/images/netopts.jpg | Bin {Shorewall-docs2 => docs}/images/network.png | Bin {Shorewall-docs2 => docs}/images/network.vdx | 0 {Shorewall-docs2 => docs}/images/network.vsd | Bin {Shorewall-docs2 => docs}/images/network.xpm | 0 {Shorewall-docs2 => docs}/images/network1.png | Bin {Shorewall-docs2 => docs}/images/network1.vdx | 0 {Shorewall-docs2 => docs}/images/network2.png | Bin {Shorewall-docs2 => docs}/images/network2.vdx | 0 {Shorewall-docs2 => docs}/images/network3.png | Bin {Shorewall-docs2 => docs}/images/network3.vdx | 0 {Shorewall-docs2 => docs}/images/network4.png | Bin {Shorewall-docs2 => docs}/images/network4.vdx | 0 {Shorewall-docs2 => docs}/images/new10.gif | Bin {Shorewall-docs2 => docs}/images/newlog.gif | Bin {Shorewall-docs2 => docs}/images/ninjalogo.png | Bin {Shorewall-docs2 => docs}/images/obrasinf.gif | Bin {Shorewall-docs2 => docs}/images/ol600_01mic.png | Bin {Shorewall-docs2 => docs}/images/openlogo-nd-50.png | Bin {Shorewall-docs2 => docs}/images/openwrt.png | Bin {Shorewall-docs2 => docs}/images/opera.png | Bin .../images/penguin_in_red_compaq_racer.gif | Bin .../images/penquin_in_blue_racer_sm2.gif | Bin {Shorewall-docs2 => docs}/images/postfix-white.gif | Bin {Shorewall-docs2 => docs}/images/poweredby.png | Bin .../images/poweredbycompaqlog0.gif | Bin {Shorewall-docs2 => docs}/images/ppp.jpg | Bin {Shorewall-docs2 => docs}/images/proxyarp.png | Bin {Shorewall-docs2 => docs}/images/proxyarp.vdx | 0 {Shorewall-docs2 => docs}/images/proxyarp.vsd | Bin {Shorewall-docs2 => docs}/images/proxyarp1.png | Bin {Shorewall-docs2 => docs}/images/proxyarp1.vdx | 0 {Shorewall-docs2 => docs}/images/publish | 0 {Shorewall-docs2 => docs}/images/pure.jpg | Bin {Shorewall-docs2 => docs}/images/pureftp-d.jpg | Bin {Shorewall-docs2 => docs}/images/razor.gif | Bin {Shorewall-docs2 => docs}/images/sf_logo_metal2.jpg | Bin {Shorewall-docs2 => docs}/images/sflogo.png | Bin {Shorewall-docs2 => docs}/images/shorewall.jpg | Bin {Shorewall-docs2 => docs}/images/small-picture.gif | Bin {Shorewall-docs2 => docs}/images/squidnow.gif | Bin {Shorewall-docs2 => docs}/images/staticnat.png | Bin {Shorewall-docs2 => docs}/images/staticnat.vdx | 0 {Shorewall-docs2 => docs}/images/staticnat.vsd | Bin {Shorewall-docs2 => docs}/images/updated.gif | Bin {Shorewall-docs2 => docs}/images/washington.jpg | Bin {Shorewall-docs2 => docs}/images/~$$network.~vdx | Bin {Shorewall-docs2 => docs}/images/~$$proxyarp1.~vdx | Bin .../images/~$$state_diagram.~vdx | Bin {Shorewall-docs2 => docs}/ipsets.xml | 0 {Shorewall-docs2 => docs}/kernel.xml | 0 {Shorewall-docs2 => docs}/myfiles.xml | 0 {Shorewall-docs2 => docs}/netmap.xml | 0 {Shorewall-docs2 => docs}/ping.xml | 0 {Shorewall-docs2 => docs}/ports.xml | 0 {Shorewall-docs2 => docs}/quotes.xml | 0 {Shorewall-docs2 => docs}/samba.xml | 0 .../shorewall_extension_scripts.xml | 0 {Shorewall-docs2 => docs}/shorewall_features.xml | 0 {Shorewall-docs2 => docs}/shorewall_logging.xml | 0 .../shorewall_prerequisites.xml | 0 .../shorewall_quickstart_guide.xml | 0 {Shorewall-docs2 => docs}/shorewall_setup_guide.xml | 0 .../shorewall_setup_guide_fr.xml | 0 {Shorewall-docs2 => docs}/standalone.xml | 0 {Shorewall-docs2 => docs}/standalone_fr.xml | 0 {Shorewall-docs2 => docs}/standalone_ru.xml | 0 .../starting_and_stopping_shorewall.xml | 0 {Shorewall-docs2 => docs}/support.xml | 0 {Shorewall-docs2 => docs}/template.xml | 0 {Shorewall-docs2 => docs}/three-interface.xml | 0 {Shorewall-docs2 => docs}/three-interface_fr.xml | 0 {Shorewall-docs2 => docs}/three-interface_ru.xml | 0 {Shorewall-docs2 => docs}/traffic_shaping.xml | 0 {Shorewall-docs2 => docs}/troubleshoot.xml | 0 {Shorewall-docs2 => docs}/two-interface.xml | 0 {Shorewall-docs2 => docs}/two-interface_fr.xml | 0 {Shorewall-docs2 => docs}/two-interface_ru.xml | 0 {Shorewall-docs2 => docs}/upgrade_issues.xml | 0 {Shorewall-docs2 => docs}/useful_links.xml | 0 .../whitelisting_under_shorewall.xml | 0 282 files changed, 0 insertions(+), 0 deletions(-) rename {Shorewall-docs2 => docs}/6to4.xml (100%) rename {Shorewall-docs2 => docs}/Accounting.xml (100%) rename {Shorewall-docs2 => docs}/Actions.xml (100%) rename {Shorewall-docs2 => docs}/CorpNetwork.xml (100%) rename {Shorewall-docs2 => docs}/Documentation.xml (100%) rename {Shorewall-docs2 => docs}/Documentation_Index.xml (100%) rename {Shorewall-docs2 => docs}/ECN.xml (100%) rename {Shorewall-docs2 => docs}/ErrorMessages.xml (100%) rename {Shorewall-docs2 => docs}/FAQ.xml (100%) rename {Shorewall-docs2 => docs}/FAQ_fr.xml (100%) rename {Shorewall-docs2 => docs}/FTP.xml (100%) rename {Shorewall-docs2 => docs}/GenericTunnels.xml (100%) rename {Shorewall-docs2 => docs}/GnuCopyright.xml (100%) rename {Shorewall-docs2 => docs}/IPIP.xml (100%) rename {Shorewall-docs2 => docs}/IPP2P.xml (100%) rename {Shorewall-docs2 => docs}/IPSEC-2.6.xml (100%) rename {Shorewall-docs2 => docs}/IPSEC.xml (100%) rename {Shorewall-docs2 => docs}/Install.xml (100%) rename {Shorewall-docs2 => docs}/Introduction.xml (100%) rename {Shorewall-docs2 => docs}/Kernel2.6.xml (100%) rename {Shorewall-docs2 => docs}/MAC_Validation.xml (100%) rename {Shorewall-docs2 => docs}/Macros.xml (100%) rename {Shorewall-docs2 => docs}/MultiISP.xml (100%) rename {Shorewall-docs2 => docs}/Multiple_Zones.xml (100%) rename {Shorewall-docs2 => docs}/NAT.xml (100%) rename {Shorewall-docs2 => docs}/NetfilterOverview.xml (100%) rename {Shorewall-docs2 => docs}/OPENVPN.xml (100%) rename {Shorewall-docs2 => docs}/PPTP.xml (100%) rename {Shorewall-docs2 => docs}/PacketHandling.xml (100%) rename {Shorewall-docs2 => docs}/PortKnocking.xml (100%) rename {Shorewall-docs2 => docs}/ProxyARP.xml (100%) rename {Shorewall-docs2 => docs}/ReleaseModel.xml (100%) rename {Shorewall-docs2 => docs}/Shorewall_Doesnt.xml (100%) rename {Shorewall-docs2 => docs}/Shorewall_Squid_Usage.xml (100%) rename {Shorewall-docs2 => docs}/Shorewall_and_Aliased_Interfaces.xml (100%) rename {Shorewall-docs2 => docs}/Shorewall_and_Kazaa.xml (100%) rename {Shorewall-docs2 => docs}/Shorewall_and_Routing.xml (100%) rename {Shorewall-docs2 => docs}/SimpleBridge.xml (100%) rename {Shorewall-docs2 => docs}/UPnP.xml (100%) rename {Shorewall-docs2 => docs}/User_defined_Actions.xml (100%) rename {Shorewall-docs2 => docs}/VPN.xml (100%) rename {Shorewall-docs2 => docs}/VPNBasics.xml (100%) rename {Shorewall-docs2 => docs}/Xen.xml (100%) rename {Shorewall-docs2 => docs}/XenMyWay.xml (100%) rename {Shorewall-docs2 => docs}/blacklisting_support.xml (100%) rename {Shorewall-docs2 => docs}/bridge.xml (100%) rename {Shorewall-docs2 => docs}/bridge_fr.xml (100%) rename {Shorewall-docs2 => docs}/configuration_file_basics.xml (100%) rename {Shorewall-docs2 => docs}/dhcp.xml (100%) rename {Shorewall-docs2 => docs}/fallback.xml (100%) rename {Shorewall-docs2 => docs}/html.css (100%) rename {Shorewall-docs2 => docs}/images/BD21298_.gif (100%) rename {Shorewall-docs2 => docs}/images/BD21298_1.gif (100%) rename {Shorewall-docs2 => docs}/images/BD21298_2.gif (100%) rename {Shorewall-docs2 => docs}/images/BD21298_3.gif (100%) rename {Shorewall-docs2 => docs}/images/Blizzard-of-05-p1000205.jpg (100%) rename {Shorewall-docs2 => docs}/images/Blizzard-of-05-p1000206.jpg (100%) rename {Shorewall-docs2 => docs}/images/Blizzard-of-05-p1000207.jpg (100%) rename {Shorewall-docs2 => docs}/images/Blizzard-of-05-p1000208.jpg (100%) rename {Shorewall-docs2 => docs}/images/Blizzard-of-05-p1000209.jpg (100%) rename {Shorewall-docs2 => docs}/images/CorpNetwork.gif (100%) rename {Shorewall-docs2 => docs}/images/DMZ4.JPG (100%) rename {Shorewall-docs2 => docs}/images/DMZ5.JPG (100%) rename {Shorewall-docs2 => docs}/images/DMZ6.JPG (100%) rename {Shorewall-docs2 => docs}/images/Hiking1.jpg (100%) rename {Shorewall-docs2 => docs}/images/Legend.png (100%) rename {Shorewall-docs2 => docs}/images/Legend.vdx (100%) rename {Shorewall-docs2 => docs}/images/Legend.vsd (100%) rename {Shorewall-docs2 => docs}/images/Logo.png (100%) rename {Shorewall-docs2 => docs}/images/Logo1.gif (100%) rename {Shorewall-docs2 => docs}/images/Logo1.png (100%) rename {Shorewall-docs2 => docs}/images/Logo2.gif (100%) rename {Shorewall-docs2 => docs}/images/Logo3.png (100%) rename {Shorewall-docs2 => docs}/images/MDKlinux.jpg (100%) rename {Shorewall-docs2 => docs}/images/Mobile.png (100%) rename {Shorewall-docs2 => docs}/images/Mobile.vdx (100%) rename {Shorewall-docs2 => docs}/images/Mobile.vsd (100%) rename {Shorewall-docs2 => docs}/images/MultiPPTP.png (100%) rename {Shorewall-docs2 => docs}/images/MultiPPTP.vdx (100%) rename {Shorewall-docs2 => docs}/images/MultiPPTP.vsd (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1.png (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1.vdx (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1.vsd (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1A.png (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1A.vdx (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1A.vsd (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1B.png (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1B.vdx (100%) rename {Shorewall-docs2 => docs}/images/MultiZone1B.vsd (100%) rename {Shorewall-docs2 => docs}/images/MultiZone2.png (100%) rename {Shorewall-docs2 => docs}/images/MultiZone2.vdx (100%) rename {Shorewall-docs2 => docs}/images/MultiZone2.vsd (100%) rename {Shorewall-docs2 => docs}/images/MultiZone3.png (100%) rename {Shorewall-docs2 => docs}/images/MultiZone3.vdx (100%) rename {Shorewall-docs2 => docs}/images/Netfilter.png (100%) rename {Shorewall-docs2 => docs}/images/Netfilter.vdx (100%) rename {Shorewall-docs2 => docs}/images/Netfilter.vsd (100%) rename {Shorewall-docs2 => docs}/images/ORE.jpg (100%) rename {Shorewall-docs2 => docs}/images/P1000048.jpg (100%) rename {Shorewall-docs2 => docs}/images/P1000049.jpg (100%) rename {Shorewall-docs2 => docs}/images/P1000050.jpg (100%) rename {Shorewall-docs2 => docs}/images/ProtectedBy.png (100%) rename {Shorewall-docs2 => docs}/images/Proxmox.png (100%) rename {Shorewall-docs2 => docs}/images/QoS.png (100%) rename {Shorewall-docs2 => docs}/images/SY00079.gif (100%) rename {Shorewall-docs2 => docs}/images/Shorewall_Banner.gif (100%) rename {Shorewall-docs2 => docs}/images/SimpleBridge.dia (100%) rename {Shorewall-docs2 => docs}/images/SimpleBridge.png (100%) rename {Shorewall-docs2 => docs}/images/State_Diagram.png (100%) rename {Shorewall-docs2 => docs}/images/State_Diagram.vdx (100%) rename {Shorewall-docs2 => docs}/images/State_Diagram.vsd (100%) rename {Shorewall-docs2 => docs}/images/ThreeNets.png (100%) rename {Shorewall-docs2 => docs}/images/ThreeNets.vdx (100%) rename {Shorewall-docs2 => docs}/images/ThreeNets.vsd (100%) rename {Shorewall-docs2 => docs}/images/Thumbs.db (100%) rename {Shorewall-docs2 => docs}/images/Tom.jpg (100%) rename {Shorewall-docs2 => docs}/images/TomNTarry.png (100%) rename {Shorewall-docs2 => docs}/images/TransportMode.png (100%) rename {Shorewall-docs2 => docs}/images/TransportMode.vdx (100%) rename {Shorewall-docs2 => docs}/images/Troubleshoot.odg (100%) rename {Shorewall-docs2 => docs}/images/Troubleshoot.png (100%) rename {Shorewall-docs2 => docs}/images/TwoIPv6Nets1.png (100%) rename {Shorewall-docs2 => docs}/images/TwoISPs.png (100%) rename {Shorewall-docs2 => docs}/images/TwoISPs.vdx (100%) rename {Shorewall-docs2 => docs}/images/TwoNets1.jpg (100%) rename {Shorewall-docs2 => docs}/images/TwoNets1.png (100%) rename {Shorewall-docs2 => docs}/images/TwoNets1.vdx (100%) rename {Shorewall-docs2 => docs}/images/TwoNets1.vsd (100%) rename {Shorewall-docs2 => docs}/images/VPN.png (100%) rename {Shorewall-docs2 => docs}/images/VPNBasics.png (100%) rename {Shorewall-docs2 => docs}/images/VPNBasics.vdx (100%) rename {Shorewall-docs2 => docs}/images/Vexira_Antivirus_Logo.gif (100%) rename {Shorewall-docs2 => docs}/images/Xen1.png (100%) rename {Shorewall-docs2 => docs}/images/Xen1.vdx (100%) rename {Shorewall-docs2 => docs}/images/Xen2.png (100%) rename {Shorewall-docs2 => docs}/images/Xen2.vdx (100%) rename {Shorewall-docs2 => docs}/images/Xen3.png (100%) rename {Shorewall-docs2 => docs}/images/Xen3.vdx (100%) rename {Shorewall-docs2 => docs}/images/Xen4.png (100%) rename {Shorewall-docs2 => docs}/images/Xen4.vdx (100%) rename {Shorewall-docs2 => docs}/images/Xen5.dia (100%) rename {Shorewall-docs2 => docs}/images/Xen5.png (100%) rename {Shorewall-docs2 => docs}/images/ZoneDiagram.png (100%) rename {Shorewall-docs2 => docs}/images/ZoneDiagram.vdx (100%) rename {Shorewall-docs2 => docs}/images/ZoneDiagram.vsd (100%) rename {Shorewall-docs2 => docs}/images/alz_logo2.gif (100%) rename {Shorewall-docs2 => docs}/images/apache_pb1.gif (100%) rename {Shorewall-docs2 => docs}/images/basics.png (100%) rename {Shorewall-docs2 => docs}/images/basics.vdx (100%) rename {Shorewall-docs2 => docs}/images/basics.vsd (100%) rename {Shorewall-docs2 => docs}/images/basics1.png (100%) rename {Shorewall-docs2 => docs}/images/basics1.vdx (100%) rename {Shorewall-docs2 => docs}/images/basics1.vsd (100%) rename {Shorewall-docs2 => docs}/images/basics2.png (100%) rename {Shorewall-docs2 => docs}/images/basics2.vdx (100%) rename {Shorewall-docs2 => docs}/images/bridge.png (100%) rename {Shorewall-docs2 => docs}/images/bridge.vdx (100%) rename {Shorewall-docs2 => docs}/images/bridge2.png (100%) rename {Shorewall-docs2 => docs}/images/bridge2.vdx (100%) rename {Shorewall-docs2 => docs}/images/bridge3.png (100%) rename {Shorewall-docs2 => docs}/images/bridge3.vdx (100%) rename {Shorewall-docs2 => docs}/images/but3.png (100%) rename {Shorewall-docs2 => docs}/images/cache_now.gif (100%) rename {Shorewall-docs2 => docs}/images/clamav-logo.png (100%) rename {Shorewall-docs2 => docs}/images/compaq.gif (100%) rename {Shorewall-docs2 => docs}/images/courier-imap.png (100%) rename {Shorewall-docs2 => docs}/images/debian.jpg (100%) rename {Shorewall-docs2 => docs}/images/dmz1.png (100%) rename {Shorewall-docs2 => docs}/images/dmz1.vdx (100%) rename {Shorewall-docs2 => docs}/images/dmz1.vsd (100%) rename {Shorewall-docs2 => docs}/images/dmz2.png (100%) rename {Shorewall-docs2 => docs}/images/dmz2.vdx (100%) rename {Shorewall-docs2 => docs}/images/dmz2.vsd (100%) rename {Shorewall-docs2 => docs}/images/dmz3.png (100%) rename {Shorewall-docs2 => docs}/images/dmz3.vdx (100%) rename {Shorewall-docs2 => docs}/images/dmz3.vsd (100%) rename {Shorewall-docs2 => docs}/images/dmz4.png (100%) rename {Shorewall-docs2 => docs}/images/dmz4.vdx (100%) rename {Shorewall-docs2 => docs}/images/dmz4.vsd (100%) rename {Shorewall-docs2 => docs}/images/dmz5.png (100%) rename {Shorewall-docs2 => docs}/images/dmz5.vdx (100%) rename {Shorewall-docs2 => docs}/images/dmz5.vsd (100%) rename {Shorewall-docs2 => docs}/images/dmz6.png (100%) rename {Shorewall-docs2 => docs}/images/dmz6.vdx (100%) rename {Shorewall-docs2 => docs}/images/dmz6.vsd (100%) rename {Shorewall-docs2 => docs}/images/dyndns_anim2.gif (100%) rename {Shorewall-docs2 => docs}/images/j0213519.gif (100%) rename {Shorewall-docs2 => docs}/images/j0233056.gif (100%) rename {Shorewall-docs2 => docs}/images/leaflogo.gif (100%) rename {Shorewall-docs2 => docs}/images/leaflogo.jpg (100%) rename {Shorewall-docs2 => docs}/images/linux_powered.gif (100%) rename {Shorewall-docs2 => docs}/images/logo-sm.jpg (100%) rename {Shorewall-docs2 => docs}/images/logo2.png (100%) rename {Shorewall-docs2 => docs}/images/medbutton.png (100%) rename {Shorewall-docs2 => docs}/images/menuconfig.jpg (100%) rename {Shorewall-docs2 => docs}/images/menuconfig1.jpg (100%) rename {Shorewall-docs2 => docs}/images/netfilter2.6.png (100%) rename {Shorewall-docs2 => docs}/images/netfilterconf.png (100%) rename {Shorewall-docs2 => docs}/images/netfilterlogo.png (100%) rename {Shorewall-docs2 => docs}/images/netmap.png (100%) rename {Shorewall-docs2 => docs}/images/netmap.vdx (100%) rename {Shorewall-docs2 => docs}/images/netopts.jpg (100%) rename {Shorewall-docs2 => docs}/images/network.png (100%) rename {Shorewall-docs2 => docs}/images/network.vdx (100%) rename {Shorewall-docs2 => docs}/images/network.vsd (100%) rename {Shorewall-docs2 => docs}/images/network.xpm (100%) rename {Shorewall-docs2 => docs}/images/network1.png (100%) rename {Shorewall-docs2 => docs}/images/network1.vdx (100%) rename {Shorewall-docs2 => docs}/images/network2.png (100%) rename {Shorewall-docs2 => docs}/images/network2.vdx (100%) rename {Shorewall-docs2 => docs}/images/network3.png (100%) rename {Shorewall-docs2 => docs}/images/network3.vdx (100%) rename {Shorewall-docs2 => docs}/images/network4.png (100%) rename {Shorewall-docs2 => docs}/images/network4.vdx (100%) rename {Shorewall-docs2 => docs}/images/new10.gif (100%) rename {Shorewall-docs2 => docs}/images/newlog.gif (100%) rename {Shorewall-docs2 => docs}/images/ninjalogo.png (100%) rename {Shorewall-docs2 => docs}/images/obrasinf.gif (100%) rename {Shorewall-docs2 => docs}/images/ol600_01mic.png (100%) rename {Shorewall-docs2 => docs}/images/openlogo-nd-50.png (100%) rename {Shorewall-docs2 => docs}/images/openwrt.png (100%) rename {Shorewall-docs2 => docs}/images/opera.png (100%) rename {Shorewall-docs2 => docs}/images/penguin_in_red_compaq_racer.gif (100%) rename {Shorewall-docs2 => docs}/images/penquin_in_blue_racer_sm2.gif (100%) rename {Shorewall-docs2 => docs}/images/postfix-white.gif (100%) rename {Shorewall-docs2 => docs}/images/poweredby.png (100%) rename {Shorewall-docs2 => docs}/images/poweredbycompaqlog0.gif (100%) rename {Shorewall-docs2 => docs}/images/ppp.jpg (100%) rename {Shorewall-docs2 => docs}/images/proxyarp.png (100%) rename {Shorewall-docs2 => docs}/images/proxyarp.vdx (100%) rename {Shorewall-docs2 => docs}/images/proxyarp.vsd (100%) rename {Shorewall-docs2 => docs}/images/proxyarp1.png (100%) rename {Shorewall-docs2 => docs}/images/proxyarp1.vdx (100%) rename {Shorewall-docs2 => docs}/images/publish (100%) rename {Shorewall-docs2 => docs}/images/pure.jpg (100%) rename {Shorewall-docs2 => docs}/images/pureftp-d.jpg (100%) rename {Shorewall-docs2 => docs}/images/razor.gif (100%) rename {Shorewall-docs2 => docs}/images/sf_logo_metal2.jpg (100%) rename {Shorewall-docs2 => docs}/images/sflogo.png (100%) rename {Shorewall-docs2 => docs}/images/shorewall.jpg (100%) rename {Shorewall-docs2 => docs}/images/small-picture.gif (100%) rename {Shorewall-docs2 => docs}/images/squidnow.gif (100%) rename {Shorewall-docs2 => docs}/images/staticnat.png (100%) rename {Shorewall-docs2 => docs}/images/staticnat.vdx (100%) rename {Shorewall-docs2 => docs}/images/staticnat.vsd (100%) rename {Shorewall-docs2 => docs}/images/updated.gif (100%) rename {Shorewall-docs2 => docs}/images/washington.jpg (100%) rename {Shorewall-docs2 => docs}/images/~$$network.~vdx (100%) rename {Shorewall-docs2 => docs}/images/~$$proxyarp1.~vdx (100%) rename {Shorewall-docs2 => docs}/images/~$$state_diagram.~vdx (100%) rename {Shorewall-docs2 => docs}/ipsets.xml (100%) rename {Shorewall-docs2 => docs}/kernel.xml (100%) rename {Shorewall-docs2 => docs}/myfiles.xml (100%) rename {Shorewall-docs2 => docs}/netmap.xml (100%) rename {Shorewall-docs2 => docs}/ping.xml (100%) rename {Shorewall-docs2 => docs}/ports.xml (100%) rename {Shorewall-docs2 => docs}/quotes.xml (100%) rename {Shorewall-docs2 => docs}/samba.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_extension_scripts.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_features.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_logging.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_prerequisites.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_quickstart_guide.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_setup_guide.xml (100%) rename {Shorewall-docs2 => docs}/shorewall_setup_guide_fr.xml (100%) rename {Shorewall-docs2 => docs}/standalone.xml (100%) rename {Shorewall-docs2 => docs}/standalone_fr.xml (100%) rename {Shorewall-docs2 => docs}/standalone_ru.xml (100%) rename {Shorewall-docs2 => docs}/starting_and_stopping_shorewall.xml (100%) rename {Shorewall-docs2 => docs}/support.xml (100%) rename {Shorewall-docs2 => docs}/template.xml (100%) rename {Shorewall-docs2 => docs}/three-interface.xml (100%) rename {Shorewall-docs2 => docs}/three-interface_fr.xml (100%) rename {Shorewall-docs2 => docs}/three-interface_ru.xml (100%) rename {Shorewall-docs2 => docs}/traffic_shaping.xml (100%) rename {Shorewall-docs2 => docs}/troubleshoot.xml (100%) rename {Shorewall-docs2 => docs}/two-interface.xml (100%) rename {Shorewall-docs2 => docs}/two-interface_fr.xml (100%) rename {Shorewall-docs2 => docs}/two-interface_ru.xml (100%) rename {Shorewall-docs2 => docs}/upgrade_issues.xml (100%) rename {Shorewall-docs2 => docs}/useful_links.xml (100%) rename {Shorewall-docs2 => docs}/whitelisting_under_shorewall.xml (100%) diff --git a/Shorewall-docs2/6to4.xml b/docs/6to4.xml similarity index 100% rename from Shorewall-docs2/6to4.xml rename to docs/6to4.xml diff --git a/Shorewall-docs2/Accounting.xml b/docs/Accounting.xml similarity index 100% rename from Shorewall-docs2/Accounting.xml rename to docs/Accounting.xml diff --git a/Shorewall-docs2/Actions.xml b/docs/Actions.xml similarity index 100% rename from Shorewall-docs2/Actions.xml rename to docs/Actions.xml diff --git a/Shorewall-docs2/CorpNetwork.xml b/docs/CorpNetwork.xml similarity index 100% rename from Shorewall-docs2/CorpNetwork.xml rename to docs/CorpNetwork.xml diff --git a/Shorewall-docs2/Documentation.xml b/docs/Documentation.xml similarity index 100% rename from Shorewall-docs2/Documentation.xml rename to docs/Documentation.xml diff --git a/Shorewall-docs2/Documentation_Index.xml b/docs/Documentation_Index.xml similarity index 100% rename from Shorewall-docs2/Documentation_Index.xml rename to docs/Documentation_Index.xml diff --git a/Shorewall-docs2/ECN.xml b/docs/ECN.xml similarity index 100% rename from Shorewall-docs2/ECN.xml rename to docs/ECN.xml diff --git a/Shorewall-docs2/ErrorMessages.xml b/docs/ErrorMessages.xml similarity index 100% rename from Shorewall-docs2/ErrorMessages.xml rename to docs/ErrorMessages.xml diff --git a/Shorewall-docs2/FAQ.xml b/docs/FAQ.xml similarity index 100% rename from Shorewall-docs2/FAQ.xml rename to docs/FAQ.xml diff --git a/Shorewall-docs2/FAQ_fr.xml b/docs/FAQ_fr.xml similarity index 100% rename from Shorewall-docs2/FAQ_fr.xml rename to docs/FAQ_fr.xml diff --git a/Shorewall-docs2/FTP.xml b/docs/FTP.xml similarity index 100% rename from Shorewall-docs2/FTP.xml rename to docs/FTP.xml diff --git a/Shorewall-docs2/GenericTunnels.xml b/docs/GenericTunnels.xml similarity index 100% rename from Shorewall-docs2/GenericTunnels.xml rename to docs/GenericTunnels.xml diff --git a/Shorewall-docs2/GnuCopyright.xml b/docs/GnuCopyright.xml similarity index 100% rename from Shorewall-docs2/GnuCopyright.xml rename to docs/GnuCopyright.xml diff --git a/Shorewall-docs2/IPIP.xml b/docs/IPIP.xml similarity index 100% rename from Shorewall-docs2/IPIP.xml rename to docs/IPIP.xml diff --git a/Shorewall-docs2/IPP2P.xml b/docs/IPP2P.xml similarity index 100% rename from Shorewall-docs2/IPP2P.xml rename to docs/IPP2P.xml diff --git a/Shorewall-docs2/IPSEC-2.6.xml b/docs/IPSEC-2.6.xml similarity index 100% rename from Shorewall-docs2/IPSEC-2.6.xml rename to docs/IPSEC-2.6.xml diff --git a/Shorewall-docs2/IPSEC.xml b/docs/IPSEC.xml similarity index 100% rename from Shorewall-docs2/IPSEC.xml rename to docs/IPSEC.xml diff --git a/Shorewall-docs2/Install.xml b/docs/Install.xml similarity index 100% rename from Shorewall-docs2/Install.xml rename to docs/Install.xml diff --git a/Shorewall-docs2/Introduction.xml b/docs/Introduction.xml similarity index 100% rename from Shorewall-docs2/Introduction.xml rename to docs/Introduction.xml diff --git a/Shorewall-docs2/Kernel2.6.xml b/docs/Kernel2.6.xml similarity index 100% rename from Shorewall-docs2/Kernel2.6.xml rename to docs/Kernel2.6.xml diff --git a/Shorewall-docs2/MAC_Validation.xml b/docs/MAC_Validation.xml similarity index 100% rename from Shorewall-docs2/MAC_Validation.xml rename to docs/MAC_Validation.xml diff --git a/Shorewall-docs2/Macros.xml b/docs/Macros.xml similarity index 100% rename from Shorewall-docs2/Macros.xml rename to docs/Macros.xml diff --git a/Shorewall-docs2/MultiISP.xml b/docs/MultiISP.xml similarity index 100% rename from Shorewall-docs2/MultiISP.xml rename to docs/MultiISP.xml diff --git a/Shorewall-docs2/Multiple_Zones.xml b/docs/Multiple_Zones.xml similarity index 100% rename from Shorewall-docs2/Multiple_Zones.xml rename to docs/Multiple_Zones.xml diff --git a/Shorewall-docs2/NAT.xml b/docs/NAT.xml similarity index 100% rename from Shorewall-docs2/NAT.xml rename to docs/NAT.xml diff --git a/Shorewall-docs2/NetfilterOverview.xml b/docs/NetfilterOverview.xml similarity index 100% rename from Shorewall-docs2/NetfilterOverview.xml rename to docs/NetfilterOverview.xml diff --git a/Shorewall-docs2/OPENVPN.xml b/docs/OPENVPN.xml similarity index 100% rename from Shorewall-docs2/OPENVPN.xml rename to docs/OPENVPN.xml diff --git a/Shorewall-docs2/PPTP.xml b/docs/PPTP.xml similarity index 100% rename from Shorewall-docs2/PPTP.xml rename to docs/PPTP.xml diff --git a/Shorewall-docs2/PacketHandling.xml b/docs/PacketHandling.xml similarity index 100% rename from Shorewall-docs2/PacketHandling.xml rename to docs/PacketHandling.xml diff --git a/Shorewall-docs2/PortKnocking.xml b/docs/PortKnocking.xml similarity index 100% rename from Shorewall-docs2/PortKnocking.xml rename to docs/PortKnocking.xml diff --git a/Shorewall-docs2/ProxyARP.xml b/docs/ProxyARP.xml similarity index 100% rename from Shorewall-docs2/ProxyARP.xml rename to docs/ProxyARP.xml diff --git a/Shorewall-docs2/ReleaseModel.xml b/docs/ReleaseModel.xml similarity index 100% rename from Shorewall-docs2/ReleaseModel.xml rename to docs/ReleaseModel.xml diff --git a/Shorewall-docs2/Shorewall_Doesnt.xml b/docs/Shorewall_Doesnt.xml similarity index 100% rename from Shorewall-docs2/Shorewall_Doesnt.xml rename to docs/Shorewall_Doesnt.xml diff --git a/Shorewall-docs2/Shorewall_Squid_Usage.xml b/docs/Shorewall_Squid_Usage.xml similarity index 100% rename from Shorewall-docs2/Shorewall_Squid_Usage.xml rename to docs/Shorewall_Squid_Usage.xml diff --git a/Shorewall-docs2/Shorewall_and_Aliased_Interfaces.xml b/docs/Shorewall_and_Aliased_Interfaces.xml similarity index 100% rename from Shorewall-docs2/Shorewall_and_Aliased_Interfaces.xml rename to docs/Shorewall_and_Aliased_Interfaces.xml diff --git a/Shorewall-docs2/Shorewall_and_Kazaa.xml b/docs/Shorewall_and_Kazaa.xml similarity index 100% rename from Shorewall-docs2/Shorewall_and_Kazaa.xml rename to docs/Shorewall_and_Kazaa.xml diff --git a/Shorewall-docs2/Shorewall_and_Routing.xml b/docs/Shorewall_and_Routing.xml similarity index 100% rename from Shorewall-docs2/Shorewall_and_Routing.xml rename to docs/Shorewall_and_Routing.xml diff --git a/Shorewall-docs2/SimpleBridge.xml b/docs/SimpleBridge.xml similarity index 100% rename from Shorewall-docs2/SimpleBridge.xml rename to docs/SimpleBridge.xml diff --git a/Shorewall-docs2/UPnP.xml b/docs/UPnP.xml similarity index 100% rename from Shorewall-docs2/UPnP.xml rename to docs/UPnP.xml diff --git a/Shorewall-docs2/User_defined_Actions.xml b/docs/User_defined_Actions.xml similarity index 100% rename from Shorewall-docs2/User_defined_Actions.xml rename to docs/User_defined_Actions.xml diff --git a/Shorewall-docs2/VPN.xml b/docs/VPN.xml similarity index 100% rename from Shorewall-docs2/VPN.xml rename to docs/VPN.xml diff --git a/Shorewall-docs2/VPNBasics.xml b/docs/VPNBasics.xml similarity index 100% rename from Shorewall-docs2/VPNBasics.xml rename to docs/VPNBasics.xml diff --git a/Shorewall-docs2/Xen.xml b/docs/Xen.xml similarity index 100% rename from Shorewall-docs2/Xen.xml rename to docs/Xen.xml diff --git a/Shorewall-docs2/XenMyWay.xml b/docs/XenMyWay.xml similarity index 100% rename from Shorewall-docs2/XenMyWay.xml rename to docs/XenMyWay.xml diff --git a/Shorewall-docs2/blacklisting_support.xml b/docs/blacklisting_support.xml similarity index 100% rename from Shorewall-docs2/blacklisting_support.xml rename to docs/blacklisting_support.xml diff --git a/Shorewall-docs2/bridge.xml b/docs/bridge.xml similarity index 100% rename from Shorewall-docs2/bridge.xml rename to docs/bridge.xml diff --git a/Shorewall-docs2/bridge_fr.xml b/docs/bridge_fr.xml similarity index 100% rename from Shorewall-docs2/bridge_fr.xml rename to docs/bridge_fr.xml diff --git a/Shorewall-docs2/configuration_file_basics.xml b/docs/configuration_file_basics.xml similarity index 100% rename from Shorewall-docs2/configuration_file_basics.xml rename to docs/configuration_file_basics.xml diff --git a/Shorewall-docs2/dhcp.xml b/docs/dhcp.xml similarity index 100% rename from Shorewall-docs2/dhcp.xml rename to docs/dhcp.xml diff --git a/Shorewall-docs2/fallback.xml b/docs/fallback.xml similarity index 100% rename from Shorewall-docs2/fallback.xml rename to docs/fallback.xml diff --git a/Shorewall-docs2/html.css b/docs/html.css similarity index 100% rename from Shorewall-docs2/html.css rename to docs/html.css diff --git a/Shorewall-docs2/images/BD21298_.gif b/docs/images/BD21298_.gif similarity index 100% rename from Shorewall-docs2/images/BD21298_.gif rename to docs/images/BD21298_.gif diff --git a/Shorewall-docs2/images/BD21298_1.gif b/docs/images/BD21298_1.gif similarity index 100% rename from Shorewall-docs2/images/BD21298_1.gif rename to docs/images/BD21298_1.gif diff --git a/Shorewall-docs2/images/BD21298_2.gif b/docs/images/BD21298_2.gif similarity index 100% rename from Shorewall-docs2/images/BD21298_2.gif rename to docs/images/BD21298_2.gif diff --git a/Shorewall-docs2/images/BD21298_3.gif b/docs/images/BD21298_3.gif similarity index 100% rename from Shorewall-docs2/images/BD21298_3.gif rename to docs/images/BD21298_3.gif diff --git a/Shorewall-docs2/images/Blizzard-of-05-p1000205.jpg b/docs/images/Blizzard-of-05-p1000205.jpg similarity index 100% rename from Shorewall-docs2/images/Blizzard-of-05-p1000205.jpg rename to docs/images/Blizzard-of-05-p1000205.jpg diff --git a/Shorewall-docs2/images/Blizzard-of-05-p1000206.jpg b/docs/images/Blizzard-of-05-p1000206.jpg similarity index 100% rename from Shorewall-docs2/images/Blizzard-of-05-p1000206.jpg rename to docs/images/Blizzard-of-05-p1000206.jpg diff --git a/Shorewall-docs2/images/Blizzard-of-05-p1000207.jpg b/docs/images/Blizzard-of-05-p1000207.jpg similarity index 100% rename from Shorewall-docs2/images/Blizzard-of-05-p1000207.jpg rename to docs/images/Blizzard-of-05-p1000207.jpg diff --git a/Shorewall-docs2/images/Blizzard-of-05-p1000208.jpg b/docs/images/Blizzard-of-05-p1000208.jpg similarity index 100% rename from Shorewall-docs2/images/Blizzard-of-05-p1000208.jpg rename to docs/images/Blizzard-of-05-p1000208.jpg diff --git a/Shorewall-docs2/images/Blizzard-of-05-p1000209.jpg b/docs/images/Blizzard-of-05-p1000209.jpg similarity index 100% rename from Shorewall-docs2/images/Blizzard-of-05-p1000209.jpg rename to docs/images/Blizzard-of-05-p1000209.jpg diff --git a/Shorewall-docs2/images/CorpNetwork.gif b/docs/images/CorpNetwork.gif similarity index 100% rename from Shorewall-docs2/images/CorpNetwork.gif rename to docs/images/CorpNetwork.gif diff --git a/Shorewall-docs2/images/DMZ4.JPG b/docs/images/DMZ4.JPG similarity index 100% rename from Shorewall-docs2/images/DMZ4.JPG rename to docs/images/DMZ4.JPG diff --git a/Shorewall-docs2/images/DMZ5.JPG b/docs/images/DMZ5.JPG similarity index 100% rename from Shorewall-docs2/images/DMZ5.JPG rename to docs/images/DMZ5.JPG diff --git a/Shorewall-docs2/images/DMZ6.JPG b/docs/images/DMZ6.JPG similarity index 100% rename from Shorewall-docs2/images/DMZ6.JPG rename to docs/images/DMZ6.JPG diff --git a/Shorewall-docs2/images/Hiking1.jpg b/docs/images/Hiking1.jpg similarity index 100% rename from Shorewall-docs2/images/Hiking1.jpg rename to docs/images/Hiking1.jpg diff --git a/Shorewall-docs2/images/Legend.png b/docs/images/Legend.png similarity index 100% rename from Shorewall-docs2/images/Legend.png rename to docs/images/Legend.png diff --git a/Shorewall-docs2/images/Legend.vdx b/docs/images/Legend.vdx similarity index 100% rename from Shorewall-docs2/images/Legend.vdx rename to docs/images/Legend.vdx diff --git a/Shorewall-docs2/images/Legend.vsd b/docs/images/Legend.vsd similarity index 100% rename from Shorewall-docs2/images/Legend.vsd rename to docs/images/Legend.vsd diff --git a/Shorewall-docs2/images/Logo.png b/docs/images/Logo.png similarity index 100% rename from Shorewall-docs2/images/Logo.png rename to docs/images/Logo.png diff --git a/Shorewall-docs2/images/Logo1.gif b/docs/images/Logo1.gif similarity index 100% rename from Shorewall-docs2/images/Logo1.gif rename to docs/images/Logo1.gif diff --git a/Shorewall-docs2/images/Logo1.png b/docs/images/Logo1.png similarity index 100% rename from Shorewall-docs2/images/Logo1.png rename to docs/images/Logo1.png diff --git a/Shorewall-docs2/images/Logo2.gif b/docs/images/Logo2.gif similarity index 100% rename from Shorewall-docs2/images/Logo2.gif rename to docs/images/Logo2.gif diff --git a/Shorewall-docs2/images/Logo3.png b/docs/images/Logo3.png similarity index 100% rename from Shorewall-docs2/images/Logo3.png rename to docs/images/Logo3.png diff --git a/Shorewall-docs2/images/MDKlinux.jpg b/docs/images/MDKlinux.jpg similarity index 100% rename from Shorewall-docs2/images/MDKlinux.jpg rename to docs/images/MDKlinux.jpg diff --git a/Shorewall-docs2/images/Mobile.png b/docs/images/Mobile.png similarity index 100% rename from Shorewall-docs2/images/Mobile.png rename to docs/images/Mobile.png diff --git a/Shorewall-docs2/images/Mobile.vdx b/docs/images/Mobile.vdx similarity index 100% rename from Shorewall-docs2/images/Mobile.vdx rename to docs/images/Mobile.vdx diff --git a/Shorewall-docs2/images/Mobile.vsd b/docs/images/Mobile.vsd similarity index 100% rename from Shorewall-docs2/images/Mobile.vsd rename to docs/images/Mobile.vsd diff --git a/Shorewall-docs2/images/MultiPPTP.png b/docs/images/MultiPPTP.png similarity index 100% rename from Shorewall-docs2/images/MultiPPTP.png rename to docs/images/MultiPPTP.png diff --git a/Shorewall-docs2/images/MultiPPTP.vdx b/docs/images/MultiPPTP.vdx similarity index 100% rename from Shorewall-docs2/images/MultiPPTP.vdx rename to docs/images/MultiPPTP.vdx diff --git a/Shorewall-docs2/images/MultiPPTP.vsd b/docs/images/MultiPPTP.vsd similarity index 100% rename from Shorewall-docs2/images/MultiPPTP.vsd rename to docs/images/MultiPPTP.vsd diff --git a/Shorewall-docs2/images/MultiZone1.png b/docs/images/MultiZone1.png similarity index 100% rename from Shorewall-docs2/images/MultiZone1.png rename to docs/images/MultiZone1.png diff --git a/Shorewall-docs2/images/MultiZone1.vdx b/docs/images/MultiZone1.vdx similarity index 100% rename from Shorewall-docs2/images/MultiZone1.vdx rename to docs/images/MultiZone1.vdx diff --git a/Shorewall-docs2/images/MultiZone1.vsd b/docs/images/MultiZone1.vsd similarity index 100% rename from Shorewall-docs2/images/MultiZone1.vsd rename to docs/images/MultiZone1.vsd diff --git a/Shorewall-docs2/images/MultiZone1A.png b/docs/images/MultiZone1A.png similarity index 100% rename from Shorewall-docs2/images/MultiZone1A.png rename to docs/images/MultiZone1A.png diff --git a/Shorewall-docs2/images/MultiZone1A.vdx b/docs/images/MultiZone1A.vdx similarity index 100% rename from Shorewall-docs2/images/MultiZone1A.vdx rename to docs/images/MultiZone1A.vdx diff --git a/Shorewall-docs2/images/MultiZone1A.vsd b/docs/images/MultiZone1A.vsd similarity index 100% rename from Shorewall-docs2/images/MultiZone1A.vsd rename to docs/images/MultiZone1A.vsd diff --git a/Shorewall-docs2/images/MultiZone1B.png b/docs/images/MultiZone1B.png similarity index 100% rename from Shorewall-docs2/images/MultiZone1B.png rename to docs/images/MultiZone1B.png diff --git a/Shorewall-docs2/images/MultiZone1B.vdx b/docs/images/MultiZone1B.vdx similarity index 100% rename from Shorewall-docs2/images/MultiZone1B.vdx rename to docs/images/MultiZone1B.vdx diff --git a/Shorewall-docs2/images/MultiZone1B.vsd b/docs/images/MultiZone1B.vsd similarity index 100% rename from Shorewall-docs2/images/MultiZone1B.vsd rename to docs/images/MultiZone1B.vsd diff --git a/Shorewall-docs2/images/MultiZone2.png b/docs/images/MultiZone2.png similarity index 100% rename from Shorewall-docs2/images/MultiZone2.png rename to docs/images/MultiZone2.png diff --git a/Shorewall-docs2/images/MultiZone2.vdx b/docs/images/MultiZone2.vdx similarity index 100% rename from Shorewall-docs2/images/MultiZone2.vdx rename to docs/images/MultiZone2.vdx diff --git a/Shorewall-docs2/images/MultiZone2.vsd b/docs/images/MultiZone2.vsd similarity index 100% rename from Shorewall-docs2/images/MultiZone2.vsd rename to docs/images/MultiZone2.vsd diff --git a/Shorewall-docs2/images/MultiZone3.png b/docs/images/MultiZone3.png similarity index 100% rename from Shorewall-docs2/images/MultiZone3.png rename to docs/images/MultiZone3.png diff --git a/Shorewall-docs2/images/MultiZone3.vdx b/docs/images/MultiZone3.vdx similarity index 100% rename from Shorewall-docs2/images/MultiZone3.vdx rename to docs/images/MultiZone3.vdx diff --git a/Shorewall-docs2/images/Netfilter.png b/docs/images/Netfilter.png similarity index 100% rename from Shorewall-docs2/images/Netfilter.png rename to docs/images/Netfilter.png diff --git a/Shorewall-docs2/images/Netfilter.vdx b/docs/images/Netfilter.vdx similarity index 100% rename from Shorewall-docs2/images/Netfilter.vdx rename to docs/images/Netfilter.vdx diff --git a/Shorewall-docs2/images/Netfilter.vsd b/docs/images/Netfilter.vsd similarity index 100% rename from Shorewall-docs2/images/Netfilter.vsd rename to docs/images/Netfilter.vsd diff --git a/Shorewall-docs2/images/ORE.jpg b/docs/images/ORE.jpg similarity index 100% rename from Shorewall-docs2/images/ORE.jpg rename to docs/images/ORE.jpg diff --git a/Shorewall-docs2/images/P1000048.jpg b/docs/images/P1000048.jpg similarity index 100% rename from Shorewall-docs2/images/P1000048.jpg rename to docs/images/P1000048.jpg diff --git a/Shorewall-docs2/images/P1000049.jpg b/docs/images/P1000049.jpg similarity index 100% rename from Shorewall-docs2/images/P1000049.jpg rename to docs/images/P1000049.jpg diff --git a/Shorewall-docs2/images/P1000050.jpg b/docs/images/P1000050.jpg similarity index 100% rename from Shorewall-docs2/images/P1000050.jpg rename to docs/images/P1000050.jpg diff --git a/Shorewall-docs2/images/ProtectedBy.png b/docs/images/ProtectedBy.png similarity index 100% rename from Shorewall-docs2/images/ProtectedBy.png rename to docs/images/ProtectedBy.png diff --git a/Shorewall-docs2/images/Proxmox.png b/docs/images/Proxmox.png similarity index 100% rename from Shorewall-docs2/images/Proxmox.png rename to docs/images/Proxmox.png diff --git a/Shorewall-docs2/images/QoS.png b/docs/images/QoS.png similarity index 100% rename from Shorewall-docs2/images/QoS.png rename to docs/images/QoS.png diff --git a/Shorewall-docs2/images/SY00079.gif b/docs/images/SY00079.gif similarity index 100% rename from Shorewall-docs2/images/SY00079.gif rename to docs/images/SY00079.gif diff --git a/Shorewall-docs2/images/Shorewall_Banner.gif b/docs/images/Shorewall_Banner.gif similarity index 100% rename from Shorewall-docs2/images/Shorewall_Banner.gif rename to docs/images/Shorewall_Banner.gif diff --git a/Shorewall-docs2/images/SimpleBridge.dia b/docs/images/SimpleBridge.dia similarity index 100% rename from Shorewall-docs2/images/SimpleBridge.dia rename to docs/images/SimpleBridge.dia diff --git a/Shorewall-docs2/images/SimpleBridge.png b/docs/images/SimpleBridge.png similarity index 100% rename from Shorewall-docs2/images/SimpleBridge.png rename to docs/images/SimpleBridge.png diff --git a/Shorewall-docs2/images/State_Diagram.png b/docs/images/State_Diagram.png similarity index 100% rename from Shorewall-docs2/images/State_Diagram.png rename to docs/images/State_Diagram.png diff --git a/Shorewall-docs2/images/State_Diagram.vdx b/docs/images/State_Diagram.vdx similarity index 100% rename from Shorewall-docs2/images/State_Diagram.vdx rename to docs/images/State_Diagram.vdx diff --git a/Shorewall-docs2/images/State_Diagram.vsd b/docs/images/State_Diagram.vsd similarity index 100% rename from Shorewall-docs2/images/State_Diagram.vsd rename to docs/images/State_Diagram.vsd diff --git a/Shorewall-docs2/images/ThreeNets.png b/docs/images/ThreeNets.png similarity index 100% rename from Shorewall-docs2/images/ThreeNets.png rename to docs/images/ThreeNets.png diff --git a/Shorewall-docs2/images/ThreeNets.vdx b/docs/images/ThreeNets.vdx similarity index 100% rename from Shorewall-docs2/images/ThreeNets.vdx rename to docs/images/ThreeNets.vdx diff --git a/Shorewall-docs2/images/ThreeNets.vsd b/docs/images/ThreeNets.vsd similarity index 100% rename from Shorewall-docs2/images/ThreeNets.vsd rename to docs/images/ThreeNets.vsd diff --git a/Shorewall-docs2/images/Thumbs.db b/docs/images/Thumbs.db similarity index 100% rename from Shorewall-docs2/images/Thumbs.db rename to docs/images/Thumbs.db diff --git a/Shorewall-docs2/images/Tom.jpg b/docs/images/Tom.jpg similarity index 100% rename from Shorewall-docs2/images/Tom.jpg rename to docs/images/Tom.jpg diff --git a/Shorewall-docs2/images/TomNTarry.png b/docs/images/TomNTarry.png similarity index 100% rename from Shorewall-docs2/images/TomNTarry.png rename to docs/images/TomNTarry.png diff --git a/Shorewall-docs2/images/TransportMode.png b/docs/images/TransportMode.png similarity index 100% rename from Shorewall-docs2/images/TransportMode.png rename to docs/images/TransportMode.png diff --git a/Shorewall-docs2/images/TransportMode.vdx b/docs/images/TransportMode.vdx similarity index 100% rename from Shorewall-docs2/images/TransportMode.vdx rename to docs/images/TransportMode.vdx diff --git a/Shorewall-docs2/images/Troubleshoot.odg b/docs/images/Troubleshoot.odg similarity index 100% rename from Shorewall-docs2/images/Troubleshoot.odg rename to docs/images/Troubleshoot.odg diff --git a/Shorewall-docs2/images/Troubleshoot.png b/docs/images/Troubleshoot.png similarity index 100% rename from Shorewall-docs2/images/Troubleshoot.png rename to docs/images/Troubleshoot.png diff --git a/Shorewall-docs2/images/TwoIPv6Nets1.png b/docs/images/TwoIPv6Nets1.png similarity index 100% rename from Shorewall-docs2/images/TwoIPv6Nets1.png rename to docs/images/TwoIPv6Nets1.png diff --git a/Shorewall-docs2/images/TwoISPs.png b/docs/images/TwoISPs.png similarity index 100% rename from Shorewall-docs2/images/TwoISPs.png rename to docs/images/TwoISPs.png diff --git a/Shorewall-docs2/images/TwoISPs.vdx b/docs/images/TwoISPs.vdx similarity index 100% rename from Shorewall-docs2/images/TwoISPs.vdx rename to docs/images/TwoISPs.vdx diff --git a/Shorewall-docs2/images/TwoNets1.jpg b/docs/images/TwoNets1.jpg similarity index 100% rename from Shorewall-docs2/images/TwoNets1.jpg rename to docs/images/TwoNets1.jpg diff --git a/Shorewall-docs2/images/TwoNets1.png b/docs/images/TwoNets1.png similarity index 100% rename from Shorewall-docs2/images/TwoNets1.png rename to docs/images/TwoNets1.png diff --git a/Shorewall-docs2/images/TwoNets1.vdx b/docs/images/TwoNets1.vdx similarity index 100% rename from Shorewall-docs2/images/TwoNets1.vdx rename to docs/images/TwoNets1.vdx diff --git a/Shorewall-docs2/images/TwoNets1.vsd b/docs/images/TwoNets1.vsd similarity index 100% rename from Shorewall-docs2/images/TwoNets1.vsd rename to docs/images/TwoNets1.vsd diff --git a/Shorewall-docs2/images/VPN.png b/docs/images/VPN.png similarity index 100% rename from Shorewall-docs2/images/VPN.png rename to docs/images/VPN.png diff --git a/Shorewall-docs2/images/VPNBasics.png b/docs/images/VPNBasics.png similarity index 100% rename from Shorewall-docs2/images/VPNBasics.png rename to docs/images/VPNBasics.png diff --git a/Shorewall-docs2/images/VPNBasics.vdx b/docs/images/VPNBasics.vdx similarity index 100% rename from Shorewall-docs2/images/VPNBasics.vdx rename to docs/images/VPNBasics.vdx diff --git a/Shorewall-docs2/images/Vexira_Antivirus_Logo.gif b/docs/images/Vexira_Antivirus_Logo.gif similarity index 100% rename from Shorewall-docs2/images/Vexira_Antivirus_Logo.gif rename to docs/images/Vexira_Antivirus_Logo.gif diff --git a/Shorewall-docs2/images/Xen1.png b/docs/images/Xen1.png similarity index 100% rename from Shorewall-docs2/images/Xen1.png rename to docs/images/Xen1.png diff --git a/Shorewall-docs2/images/Xen1.vdx b/docs/images/Xen1.vdx similarity index 100% rename from Shorewall-docs2/images/Xen1.vdx rename to docs/images/Xen1.vdx diff --git a/Shorewall-docs2/images/Xen2.png b/docs/images/Xen2.png similarity index 100% rename from Shorewall-docs2/images/Xen2.png rename to docs/images/Xen2.png diff --git a/Shorewall-docs2/images/Xen2.vdx b/docs/images/Xen2.vdx similarity index 100% rename from Shorewall-docs2/images/Xen2.vdx rename to docs/images/Xen2.vdx diff --git a/Shorewall-docs2/images/Xen3.png b/docs/images/Xen3.png similarity index 100% rename from Shorewall-docs2/images/Xen3.png rename to docs/images/Xen3.png diff --git a/Shorewall-docs2/images/Xen3.vdx b/docs/images/Xen3.vdx similarity index 100% rename from Shorewall-docs2/images/Xen3.vdx rename to docs/images/Xen3.vdx diff --git a/Shorewall-docs2/images/Xen4.png b/docs/images/Xen4.png similarity index 100% rename from Shorewall-docs2/images/Xen4.png rename to docs/images/Xen4.png diff --git a/Shorewall-docs2/images/Xen4.vdx b/docs/images/Xen4.vdx similarity index 100% rename from Shorewall-docs2/images/Xen4.vdx rename to docs/images/Xen4.vdx diff --git a/Shorewall-docs2/images/Xen5.dia b/docs/images/Xen5.dia similarity index 100% rename from Shorewall-docs2/images/Xen5.dia rename to docs/images/Xen5.dia diff --git a/Shorewall-docs2/images/Xen5.png b/docs/images/Xen5.png similarity index 100% rename from Shorewall-docs2/images/Xen5.png rename to docs/images/Xen5.png diff --git a/Shorewall-docs2/images/ZoneDiagram.png b/docs/images/ZoneDiagram.png similarity index 100% rename from Shorewall-docs2/images/ZoneDiagram.png rename to docs/images/ZoneDiagram.png diff --git a/Shorewall-docs2/images/ZoneDiagram.vdx b/docs/images/ZoneDiagram.vdx similarity index 100% rename from Shorewall-docs2/images/ZoneDiagram.vdx rename to docs/images/ZoneDiagram.vdx diff --git a/Shorewall-docs2/images/ZoneDiagram.vsd b/docs/images/ZoneDiagram.vsd similarity index 100% rename from Shorewall-docs2/images/ZoneDiagram.vsd rename to docs/images/ZoneDiagram.vsd diff --git a/Shorewall-docs2/images/alz_logo2.gif b/docs/images/alz_logo2.gif similarity index 100% rename from Shorewall-docs2/images/alz_logo2.gif rename to docs/images/alz_logo2.gif diff --git a/Shorewall-docs2/images/apache_pb1.gif b/docs/images/apache_pb1.gif similarity index 100% rename from Shorewall-docs2/images/apache_pb1.gif rename to docs/images/apache_pb1.gif diff --git a/Shorewall-docs2/images/basics.png b/docs/images/basics.png similarity index 100% rename from Shorewall-docs2/images/basics.png rename to docs/images/basics.png diff --git a/Shorewall-docs2/images/basics.vdx b/docs/images/basics.vdx similarity index 100% rename from Shorewall-docs2/images/basics.vdx rename to docs/images/basics.vdx diff --git a/Shorewall-docs2/images/basics.vsd b/docs/images/basics.vsd similarity index 100% rename from Shorewall-docs2/images/basics.vsd rename to docs/images/basics.vsd diff --git a/Shorewall-docs2/images/basics1.png b/docs/images/basics1.png similarity index 100% rename from Shorewall-docs2/images/basics1.png rename to docs/images/basics1.png diff --git a/Shorewall-docs2/images/basics1.vdx b/docs/images/basics1.vdx similarity index 100% rename from Shorewall-docs2/images/basics1.vdx rename to docs/images/basics1.vdx diff --git a/Shorewall-docs2/images/basics1.vsd b/docs/images/basics1.vsd similarity index 100% rename from Shorewall-docs2/images/basics1.vsd rename to docs/images/basics1.vsd diff --git a/Shorewall-docs2/images/basics2.png b/docs/images/basics2.png similarity index 100% rename from Shorewall-docs2/images/basics2.png rename to docs/images/basics2.png diff --git a/Shorewall-docs2/images/basics2.vdx b/docs/images/basics2.vdx similarity index 100% rename from Shorewall-docs2/images/basics2.vdx rename to docs/images/basics2.vdx diff --git a/Shorewall-docs2/images/bridge.png b/docs/images/bridge.png similarity index 100% rename from Shorewall-docs2/images/bridge.png rename to docs/images/bridge.png diff --git a/Shorewall-docs2/images/bridge.vdx b/docs/images/bridge.vdx similarity index 100% rename from Shorewall-docs2/images/bridge.vdx rename to docs/images/bridge.vdx diff --git a/Shorewall-docs2/images/bridge2.png b/docs/images/bridge2.png similarity index 100% rename from Shorewall-docs2/images/bridge2.png rename to docs/images/bridge2.png diff --git a/Shorewall-docs2/images/bridge2.vdx b/docs/images/bridge2.vdx similarity index 100% rename from Shorewall-docs2/images/bridge2.vdx rename to docs/images/bridge2.vdx diff --git a/Shorewall-docs2/images/bridge3.png b/docs/images/bridge3.png similarity index 100% rename from Shorewall-docs2/images/bridge3.png rename to docs/images/bridge3.png diff --git a/Shorewall-docs2/images/bridge3.vdx b/docs/images/bridge3.vdx similarity index 100% rename from Shorewall-docs2/images/bridge3.vdx rename to docs/images/bridge3.vdx diff --git a/Shorewall-docs2/images/but3.png b/docs/images/but3.png similarity index 100% rename from Shorewall-docs2/images/but3.png rename to docs/images/but3.png diff --git a/Shorewall-docs2/images/cache_now.gif b/docs/images/cache_now.gif similarity index 100% rename from Shorewall-docs2/images/cache_now.gif rename to docs/images/cache_now.gif diff --git a/Shorewall-docs2/images/clamav-logo.png b/docs/images/clamav-logo.png similarity index 100% rename from Shorewall-docs2/images/clamav-logo.png rename to docs/images/clamav-logo.png diff --git a/Shorewall-docs2/images/compaq.gif b/docs/images/compaq.gif similarity index 100% rename from Shorewall-docs2/images/compaq.gif rename to docs/images/compaq.gif diff --git a/Shorewall-docs2/images/courier-imap.png b/docs/images/courier-imap.png similarity index 100% rename from Shorewall-docs2/images/courier-imap.png rename to docs/images/courier-imap.png diff --git a/Shorewall-docs2/images/debian.jpg b/docs/images/debian.jpg similarity index 100% rename from Shorewall-docs2/images/debian.jpg rename to docs/images/debian.jpg diff --git a/Shorewall-docs2/images/dmz1.png b/docs/images/dmz1.png similarity index 100% rename from Shorewall-docs2/images/dmz1.png rename to docs/images/dmz1.png diff --git a/Shorewall-docs2/images/dmz1.vdx b/docs/images/dmz1.vdx similarity index 100% rename from Shorewall-docs2/images/dmz1.vdx rename to docs/images/dmz1.vdx diff --git a/Shorewall-docs2/images/dmz1.vsd b/docs/images/dmz1.vsd similarity index 100% rename from Shorewall-docs2/images/dmz1.vsd rename to docs/images/dmz1.vsd diff --git a/Shorewall-docs2/images/dmz2.png b/docs/images/dmz2.png similarity index 100% rename from Shorewall-docs2/images/dmz2.png rename to docs/images/dmz2.png diff --git a/Shorewall-docs2/images/dmz2.vdx b/docs/images/dmz2.vdx similarity index 100% rename from Shorewall-docs2/images/dmz2.vdx rename to docs/images/dmz2.vdx diff --git a/Shorewall-docs2/images/dmz2.vsd b/docs/images/dmz2.vsd similarity index 100% rename from Shorewall-docs2/images/dmz2.vsd rename to docs/images/dmz2.vsd diff --git a/Shorewall-docs2/images/dmz3.png b/docs/images/dmz3.png similarity index 100% rename from Shorewall-docs2/images/dmz3.png rename to docs/images/dmz3.png diff --git a/Shorewall-docs2/images/dmz3.vdx b/docs/images/dmz3.vdx similarity index 100% rename from Shorewall-docs2/images/dmz3.vdx rename to docs/images/dmz3.vdx diff --git a/Shorewall-docs2/images/dmz3.vsd b/docs/images/dmz3.vsd similarity index 100% rename from Shorewall-docs2/images/dmz3.vsd rename to docs/images/dmz3.vsd diff --git a/Shorewall-docs2/images/dmz4.png b/docs/images/dmz4.png similarity index 100% rename from Shorewall-docs2/images/dmz4.png rename to docs/images/dmz4.png diff --git a/Shorewall-docs2/images/dmz4.vdx b/docs/images/dmz4.vdx similarity index 100% rename from Shorewall-docs2/images/dmz4.vdx rename to docs/images/dmz4.vdx diff --git a/Shorewall-docs2/images/dmz4.vsd b/docs/images/dmz4.vsd similarity index 100% rename from Shorewall-docs2/images/dmz4.vsd rename to docs/images/dmz4.vsd diff --git a/Shorewall-docs2/images/dmz5.png b/docs/images/dmz5.png similarity index 100% rename from Shorewall-docs2/images/dmz5.png rename to docs/images/dmz5.png diff --git a/Shorewall-docs2/images/dmz5.vdx b/docs/images/dmz5.vdx similarity index 100% rename from Shorewall-docs2/images/dmz5.vdx rename to docs/images/dmz5.vdx diff --git a/Shorewall-docs2/images/dmz5.vsd b/docs/images/dmz5.vsd similarity index 100% rename from Shorewall-docs2/images/dmz5.vsd rename to docs/images/dmz5.vsd diff --git a/Shorewall-docs2/images/dmz6.png b/docs/images/dmz6.png similarity index 100% rename from Shorewall-docs2/images/dmz6.png rename to docs/images/dmz6.png diff --git a/Shorewall-docs2/images/dmz6.vdx b/docs/images/dmz6.vdx similarity index 100% rename from Shorewall-docs2/images/dmz6.vdx rename to docs/images/dmz6.vdx diff --git a/Shorewall-docs2/images/dmz6.vsd b/docs/images/dmz6.vsd similarity index 100% rename from Shorewall-docs2/images/dmz6.vsd rename to docs/images/dmz6.vsd diff --git a/Shorewall-docs2/images/dyndns_anim2.gif b/docs/images/dyndns_anim2.gif similarity index 100% rename from Shorewall-docs2/images/dyndns_anim2.gif rename to docs/images/dyndns_anim2.gif diff --git a/Shorewall-docs2/images/j0213519.gif b/docs/images/j0213519.gif similarity index 100% rename from Shorewall-docs2/images/j0213519.gif rename to docs/images/j0213519.gif diff --git a/Shorewall-docs2/images/j0233056.gif b/docs/images/j0233056.gif similarity index 100% rename from Shorewall-docs2/images/j0233056.gif rename to docs/images/j0233056.gif diff --git a/Shorewall-docs2/images/leaflogo.gif b/docs/images/leaflogo.gif similarity index 100% rename from Shorewall-docs2/images/leaflogo.gif rename to docs/images/leaflogo.gif diff --git a/Shorewall-docs2/images/leaflogo.jpg b/docs/images/leaflogo.jpg similarity index 100% rename from Shorewall-docs2/images/leaflogo.jpg rename to docs/images/leaflogo.jpg diff --git a/Shorewall-docs2/images/linux_powered.gif b/docs/images/linux_powered.gif similarity index 100% rename from Shorewall-docs2/images/linux_powered.gif rename to docs/images/linux_powered.gif diff --git a/Shorewall-docs2/images/logo-sm.jpg b/docs/images/logo-sm.jpg similarity index 100% rename from Shorewall-docs2/images/logo-sm.jpg rename to docs/images/logo-sm.jpg diff --git a/Shorewall-docs2/images/logo2.png b/docs/images/logo2.png similarity index 100% rename from Shorewall-docs2/images/logo2.png rename to docs/images/logo2.png diff --git a/Shorewall-docs2/images/medbutton.png b/docs/images/medbutton.png similarity index 100% rename from Shorewall-docs2/images/medbutton.png rename to docs/images/medbutton.png diff --git a/Shorewall-docs2/images/menuconfig.jpg b/docs/images/menuconfig.jpg similarity index 100% rename from Shorewall-docs2/images/menuconfig.jpg rename to docs/images/menuconfig.jpg diff --git a/Shorewall-docs2/images/menuconfig1.jpg b/docs/images/menuconfig1.jpg similarity index 100% rename from Shorewall-docs2/images/menuconfig1.jpg rename to docs/images/menuconfig1.jpg diff --git a/Shorewall-docs2/images/netfilter2.6.png b/docs/images/netfilter2.6.png similarity index 100% rename from Shorewall-docs2/images/netfilter2.6.png rename to docs/images/netfilter2.6.png diff --git a/Shorewall-docs2/images/netfilterconf.png b/docs/images/netfilterconf.png similarity index 100% rename from Shorewall-docs2/images/netfilterconf.png rename to docs/images/netfilterconf.png diff --git a/Shorewall-docs2/images/netfilterlogo.png b/docs/images/netfilterlogo.png similarity index 100% rename from Shorewall-docs2/images/netfilterlogo.png rename to docs/images/netfilterlogo.png diff --git a/Shorewall-docs2/images/netmap.png b/docs/images/netmap.png similarity index 100% rename from Shorewall-docs2/images/netmap.png rename to docs/images/netmap.png diff --git a/Shorewall-docs2/images/netmap.vdx b/docs/images/netmap.vdx similarity index 100% rename from Shorewall-docs2/images/netmap.vdx rename to docs/images/netmap.vdx diff --git a/Shorewall-docs2/images/netopts.jpg b/docs/images/netopts.jpg similarity index 100% rename from Shorewall-docs2/images/netopts.jpg rename to docs/images/netopts.jpg diff --git a/Shorewall-docs2/images/network.png b/docs/images/network.png similarity index 100% rename from Shorewall-docs2/images/network.png rename to docs/images/network.png diff --git a/Shorewall-docs2/images/network.vdx b/docs/images/network.vdx similarity index 100% rename from Shorewall-docs2/images/network.vdx rename to docs/images/network.vdx diff --git a/Shorewall-docs2/images/network.vsd b/docs/images/network.vsd similarity index 100% rename from Shorewall-docs2/images/network.vsd rename to docs/images/network.vsd diff --git a/Shorewall-docs2/images/network.xpm b/docs/images/network.xpm similarity index 100% rename from Shorewall-docs2/images/network.xpm rename to docs/images/network.xpm diff --git a/Shorewall-docs2/images/network1.png b/docs/images/network1.png similarity index 100% rename from Shorewall-docs2/images/network1.png rename to docs/images/network1.png diff --git a/Shorewall-docs2/images/network1.vdx b/docs/images/network1.vdx similarity index 100% rename from Shorewall-docs2/images/network1.vdx rename to docs/images/network1.vdx diff --git a/Shorewall-docs2/images/network2.png b/docs/images/network2.png similarity index 100% rename from Shorewall-docs2/images/network2.png rename to docs/images/network2.png diff --git a/Shorewall-docs2/images/network2.vdx b/docs/images/network2.vdx similarity index 100% rename from Shorewall-docs2/images/network2.vdx rename to docs/images/network2.vdx diff --git a/Shorewall-docs2/images/network3.png b/docs/images/network3.png similarity index 100% rename from Shorewall-docs2/images/network3.png rename to docs/images/network3.png diff --git a/Shorewall-docs2/images/network3.vdx b/docs/images/network3.vdx similarity index 100% rename from Shorewall-docs2/images/network3.vdx rename to docs/images/network3.vdx diff --git a/Shorewall-docs2/images/network4.png b/docs/images/network4.png similarity index 100% rename from Shorewall-docs2/images/network4.png rename to docs/images/network4.png diff --git a/Shorewall-docs2/images/network4.vdx b/docs/images/network4.vdx similarity index 100% rename from Shorewall-docs2/images/network4.vdx rename to docs/images/network4.vdx diff --git a/Shorewall-docs2/images/new10.gif b/docs/images/new10.gif similarity index 100% rename from Shorewall-docs2/images/new10.gif rename to docs/images/new10.gif diff --git a/Shorewall-docs2/images/newlog.gif b/docs/images/newlog.gif similarity index 100% rename from Shorewall-docs2/images/newlog.gif rename to docs/images/newlog.gif diff --git a/Shorewall-docs2/images/ninjalogo.png b/docs/images/ninjalogo.png similarity index 100% rename from Shorewall-docs2/images/ninjalogo.png rename to docs/images/ninjalogo.png diff --git a/Shorewall-docs2/images/obrasinf.gif b/docs/images/obrasinf.gif similarity index 100% rename from Shorewall-docs2/images/obrasinf.gif rename to docs/images/obrasinf.gif diff --git a/Shorewall-docs2/images/ol600_01mic.png b/docs/images/ol600_01mic.png similarity index 100% rename from Shorewall-docs2/images/ol600_01mic.png rename to docs/images/ol600_01mic.png diff --git a/Shorewall-docs2/images/openlogo-nd-50.png b/docs/images/openlogo-nd-50.png similarity index 100% rename from Shorewall-docs2/images/openlogo-nd-50.png rename to docs/images/openlogo-nd-50.png diff --git a/Shorewall-docs2/images/openwrt.png b/docs/images/openwrt.png similarity index 100% rename from Shorewall-docs2/images/openwrt.png rename to docs/images/openwrt.png diff --git a/Shorewall-docs2/images/opera.png b/docs/images/opera.png similarity index 100% rename from Shorewall-docs2/images/opera.png rename to docs/images/opera.png diff --git a/Shorewall-docs2/images/penguin_in_red_compaq_racer.gif b/docs/images/penguin_in_red_compaq_racer.gif similarity index 100% rename from Shorewall-docs2/images/penguin_in_red_compaq_racer.gif rename to docs/images/penguin_in_red_compaq_racer.gif diff --git a/Shorewall-docs2/images/penquin_in_blue_racer_sm2.gif b/docs/images/penquin_in_blue_racer_sm2.gif similarity index 100% rename from Shorewall-docs2/images/penquin_in_blue_racer_sm2.gif rename to docs/images/penquin_in_blue_racer_sm2.gif diff --git a/Shorewall-docs2/images/postfix-white.gif b/docs/images/postfix-white.gif similarity index 100% rename from Shorewall-docs2/images/postfix-white.gif rename to docs/images/postfix-white.gif diff --git a/Shorewall-docs2/images/poweredby.png b/docs/images/poweredby.png similarity index 100% rename from Shorewall-docs2/images/poweredby.png rename to docs/images/poweredby.png diff --git a/Shorewall-docs2/images/poweredbycompaqlog0.gif b/docs/images/poweredbycompaqlog0.gif similarity index 100% rename from Shorewall-docs2/images/poweredbycompaqlog0.gif rename to docs/images/poweredbycompaqlog0.gif diff --git a/Shorewall-docs2/images/ppp.jpg b/docs/images/ppp.jpg similarity index 100% rename from Shorewall-docs2/images/ppp.jpg rename to docs/images/ppp.jpg diff --git a/Shorewall-docs2/images/proxyarp.png b/docs/images/proxyarp.png similarity index 100% rename from Shorewall-docs2/images/proxyarp.png rename to docs/images/proxyarp.png diff --git a/Shorewall-docs2/images/proxyarp.vdx b/docs/images/proxyarp.vdx similarity index 100% rename from Shorewall-docs2/images/proxyarp.vdx rename to docs/images/proxyarp.vdx diff --git a/Shorewall-docs2/images/proxyarp.vsd b/docs/images/proxyarp.vsd similarity index 100% rename from Shorewall-docs2/images/proxyarp.vsd rename to docs/images/proxyarp.vsd diff --git a/Shorewall-docs2/images/proxyarp1.png b/docs/images/proxyarp1.png similarity index 100% rename from Shorewall-docs2/images/proxyarp1.png rename to docs/images/proxyarp1.png diff --git a/Shorewall-docs2/images/proxyarp1.vdx b/docs/images/proxyarp1.vdx similarity index 100% rename from Shorewall-docs2/images/proxyarp1.vdx rename to docs/images/proxyarp1.vdx diff --git a/Shorewall-docs2/images/publish b/docs/images/publish similarity index 100% rename from Shorewall-docs2/images/publish rename to docs/images/publish diff --git a/Shorewall-docs2/images/pure.jpg b/docs/images/pure.jpg similarity index 100% rename from Shorewall-docs2/images/pure.jpg rename to docs/images/pure.jpg diff --git a/Shorewall-docs2/images/pureftp-d.jpg b/docs/images/pureftp-d.jpg similarity index 100% rename from Shorewall-docs2/images/pureftp-d.jpg rename to docs/images/pureftp-d.jpg diff --git a/Shorewall-docs2/images/razor.gif b/docs/images/razor.gif similarity index 100% rename from Shorewall-docs2/images/razor.gif rename to docs/images/razor.gif diff --git a/Shorewall-docs2/images/sf_logo_metal2.jpg b/docs/images/sf_logo_metal2.jpg similarity index 100% rename from Shorewall-docs2/images/sf_logo_metal2.jpg rename to docs/images/sf_logo_metal2.jpg diff --git a/Shorewall-docs2/images/sflogo.png b/docs/images/sflogo.png similarity index 100% rename from Shorewall-docs2/images/sflogo.png rename to docs/images/sflogo.png diff --git a/Shorewall-docs2/images/shorewall.jpg b/docs/images/shorewall.jpg similarity index 100% rename from Shorewall-docs2/images/shorewall.jpg rename to docs/images/shorewall.jpg diff --git a/Shorewall-docs2/images/small-picture.gif b/docs/images/small-picture.gif similarity index 100% rename from Shorewall-docs2/images/small-picture.gif rename to docs/images/small-picture.gif diff --git a/Shorewall-docs2/images/squidnow.gif b/docs/images/squidnow.gif similarity index 100% rename from Shorewall-docs2/images/squidnow.gif rename to docs/images/squidnow.gif diff --git a/Shorewall-docs2/images/staticnat.png b/docs/images/staticnat.png similarity index 100% rename from Shorewall-docs2/images/staticnat.png rename to docs/images/staticnat.png diff --git a/Shorewall-docs2/images/staticnat.vdx b/docs/images/staticnat.vdx similarity index 100% rename from Shorewall-docs2/images/staticnat.vdx rename to docs/images/staticnat.vdx diff --git a/Shorewall-docs2/images/staticnat.vsd b/docs/images/staticnat.vsd similarity index 100% rename from Shorewall-docs2/images/staticnat.vsd rename to docs/images/staticnat.vsd diff --git a/Shorewall-docs2/images/updated.gif b/docs/images/updated.gif similarity index 100% rename from Shorewall-docs2/images/updated.gif rename to docs/images/updated.gif diff --git a/Shorewall-docs2/images/washington.jpg b/docs/images/washington.jpg similarity index 100% rename from Shorewall-docs2/images/washington.jpg rename to docs/images/washington.jpg diff --git a/Shorewall-docs2/images/~$$network.~vdx b/docs/images/~$$network.~vdx similarity index 100% rename from Shorewall-docs2/images/~$$network.~vdx rename to docs/images/~$$network.~vdx diff --git a/Shorewall-docs2/images/~$$proxyarp1.~vdx b/docs/images/~$$proxyarp1.~vdx similarity index 100% rename from Shorewall-docs2/images/~$$proxyarp1.~vdx rename to docs/images/~$$proxyarp1.~vdx diff --git a/Shorewall-docs2/images/~$$state_diagram.~vdx b/docs/images/~$$state_diagram.~vdx similarity index 100% rename from Shorewall-docs2/images/~$$state_diagram.~vdx rename to docs/images/~$$state_diagram.~vdx diff --git a/Shorewall-docs2/ipsets.xml b/docs/ipsets.xml similarity index 100% rename from Shorewall-docs2/ipsets.xml rename to docs/ipsets.xml diff --git a/Shorewall-docs2/kernel.xml b/docs/kernel.xml similarity index 100% rename from Shorewall-docs2/kernel.xml rename to docs/kernel.xml diff --git a/Shorewall-docs2/myfiles.xml b/docs/myfiles.xml similarity index 100% rename from Shorewall-docs2/myfiles.xml rename to docs/myfiles.xml diff --git a/Shorewall-docs2/netmap.xml b/docs/netmap.xml similarity index 100% rename from Shorewall-docs2/netmap.xml rename to docs/netmap.xml diff --git a/Shorewall-docs2/ping.xml b/docs/ping.xml similarity index 100% rename from Shorewall-docs2/ping.xml rename to docs/ping.xml diff --git a/Shorewall-docs2/ports.xml b/docs/ports.xml similarity index 100% rename from Shorewall-docs2/ports.xml rename to docs/ports.xml diff --git a/Shorewall-docs2/quotes.xml b/docs/quotes.xml similarity index 100% rename from Shorewall-docs2/quotes.xml rename to docs/quotes.xml diff --git a/Shorewall-docs2/samba.xml b/docs/samba.xml similarity index 100% rename from Shorewall-docs2/samba.xml rename to docs/samba.xml diff --git a/Shorewall-docs2/shorewall_extension_scripts.xml b/docs/shorewall_extension_scripts.xml similarity index 100% rename from Shorewall-docs2/shorewall_extension_scripts.xml rename to docs/shorewall_extension_scripts.xml diff --git a/Shorewall-docs2/shorewall_features.xml b/docs/shorewall_features.xml similarity index 100% rename from Shorewall-docs2/shorewall_features.xml rename to docs/shorewall_features.xml diff --git a/Shorewall-docs2/shorewall_logging.xml b/docs/shorewall_logging.xml similarity index 100% rename from Shorewall-docs2/shorewall_logging.xml rename to docs/shorewall_logging.xml diff --git a/Shorewall-docs2/shorewall_prerequisites.xml b/docs/shorewall_prerequisites.xml similarity index 100% rename from Shorewall-docs2/shorewall_prerequisites.xml rename to docs/shorewall_prerequisites.xml diff --git a/Shorewall-docs2/shorewall_quickstart_guide.xml b/docs/shorewall_quickstart_guide.xml similarity index 100% rename from Shorewall-docs2/shorewall_quickstart_guide.xml rename to docs/shorewall_quickstart_guide.xml diff --git a/Shorewall-docs2/shorewall_setup_guide.xml b/docs/shorewall_setup_guide.xml similarity index 100% rename from Shorewall-docs2/shorewall_setup_guide.xml rename to docs/shorewall_setup_guide.xml diff --git a/Shorewall-docs2/shorewall_setup_guide_fr.xml b/docs/shorewall_setup_guide_fr.xml similarity index 100% rename from Shorewall-docs2/shorewall_setup_guide_fr.xml rename to docs/shorewall_setup_guide_fr.xml diff --git a/Shorewall-docs2/standalone.xml b/docs/standalone.xml similarity index 100% rename from Shorewall-docs2/standalone.xml rename to docs/standalone.xml diff --git a/Shorewall-docs2/standalone_fr.xml b/docs/standalone_fr.xml similarity index 100% rename from Shorewall-docs2/standalone_fr.xml rename to docs/standalone_fr.xml diff --git a/Shorewall-docs2/standalone_ru.xml b/docs/standalone_ru.xml similarity index 100% rename from Shorewall-docs2/standalone_ru.xml rename to docs/standalone_ru.xml diff --git a/Shorewall-docs2/starting_and_stopping_shorewall.xml b/docs/starting_and_stopping_shorewall.xml similarity index 100% rename from Shorewall-docs2/starting_and_stopping_shorewall.xml rename to docs/starting_and_stopping_shorewall.xml diff --git a/Shorewall-docs2/support.xml b/docs/support.xml similarity index 100% rename from Shorewall-docs2/support.xml rename to docs/support.xml diff --git a/Shorewall-docs2/template.xml b/docs/template.xml similarity index 100% rename from Shorewall-docs2/template.xml rename to docs/template.xml diff --git a/Shorewall-docs2/three-interface.xml b/docs/three-interface.xml similarity index 100% rename from Shorewall-docs2/three-interface.xml rename to docs/three-interface.xml diff --git a/Shorewall-docs2/three-interface_fr.xml b/docs/three-interface_fr.xml similarity index 100% rename from Shorewall-docs2/three-interface_fr.xml rename to docs/three-interface_fr.xml diff --git a/Shorewall-docs2/three-interface_ru.xml b/docs/three-interface_ru.xml similarity index 100% rename from Shorewall-docs2/three-interface_ru.xml rename to docs/three-interface_ru.xml diff --git a/Shorewall-docs2/traffic_shaping.xml b/docs/traffic_shaping.xml similarity index 100% rename from Shorewall-docs2/traffic_shaping.xml rename to docs/traffic_shaping.xml diff --git a/Shorewall-docs2/troubleshoot.xml b/docs/troubleshoot.xml similarity index 100% rename from Shorewall-docs2/troubleshoot.xml rename to docs/troubleshoot.xml diff --git a/Shorewall-docs2/two-interface.xml b/docs/two-interface.xml similarity index 100% rename from Shorewall-docs2/two-interface.xml rename to docs/two-interface.xml diff --git a/Shorewall-docs2/two-interface_fr.xml b/docs/two-interface_fr.xml similarity index 100% rename from Shorewall-docs2/two-interface_fr.xml rename to docs/two-interface_fr.xml diff --git a/Shorewall-docs2/two-interface_ru.xml b/docs/two-interface_ru.xml similarity index 100% rename from Shorewall-docs2/two-interface_ru.xml rename to docs/two-interface_ru.xml diff --git a/Shorewall-docs2/upgrade_issues.xml b/docs/upgrade_issues.xml similarity index 100% rename from Shorewall-docs2/upgrade_issues.xml rename to docs/upgrade_issues.xml diff --git a/Shorewall-docs2/useful_links.xml b/docs/useful_links.xml similarity index 100% rename from Shorewall-docs2/useful_links.xml rename to docs/useful_links.xml diff --git a/Shorewall-docs2/whitelisting_under_shorewall.xml b/docs/whitelisting_under_shorewall.xml similarity index 100% rename from Shorewall-docs2/whitelisting_under_shorewall.xml rename to docs/whitelisting_under_shorewall.xml