Merge branch 'dev' of feistymeow.org:feisty_meow into dev

oops, somehow was hosing this up.  should be best of both versions now.

diff --git a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html
index 883179042f6431ac276a20a3cbaad29c29cfa8e7..2b285a6d0a402023742d41316f884aee6cb0b7ec 100644 (file)
--- a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html
+++ b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html
@@ -271,7 +271,7 @@ href="http://mapsdemo.cakelampvm.com">http://mapsdemo.cakelampvm.com</a></pre>
     <h4>Setting up DNS on Windows<a id="#windoze-dns" name="#windoze-dns"></a></h4>
     <p>The ipconfig tool will provide helpful information about your current
       networking and DNS configuration:</p>
-    <pre>&gt; ipconfig --all</pre>
+    <pre>&gt; ipconfig /all</pre>
     <p>The DNS configuration on Windows is somewhat byzantine.&nbsp; The pipe
       characters ('|') below are used to separate the menus or tabs or dialogs
       to traverse.&nbsp; Follow this path to get to the DNS config:</p>

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index b1757c44ac1cb73574d4639613978c6417615027..239a7f1435cc95044e7086fab96449350791f00e 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -137,7 +137,7 @@ fi
 ##############
 
 # fix up the apache site so that HSTS is disabled.  otherwise we can't view
-# https site once the domain name switch has occurred.
+# the https site for cakelampvm.com once the domain name switch has occurred.
 
 # we operate only on our own specialized tls conf file.  hopefully no one has messed with it besides revamp.
 # note the use of the character class :blank: below to match spaces or tabs.
@@ -173,9 +173,6 @@ restart_bind
 ##############
 
 
-
-
-
 ##############
 ##############