Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-corinthia
diff --git a/.gitignore b/.gitignore
index 292b673..f128ee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# .gitignore 0.06 UTF-8 2015-08-09
+# .gitignore 0.07 UTF-8 2015-08-09
#
# CORINTHIA/ROOT
# ==============
@@ -20,25 +20,20 @@
# Finder directory status files (OS X)
.DS_Store
-## ELIMINATION OF VISUAL STUDIO SOLUTIONS
-## --------------------------------------
-# Do not include working solutions in the repository tree. For Corinthia,
-# these will be built/extracted dynamically into the build/ folder as needed
-# and will not appear directly in the source tree.
-*.sln
-*.vcxproj
-*.vcxproj.filters
+## KEEP BUILD ARTIFACTS IN THE BUILD/ FOLDER AND OUT OUT OF THE REPOSITORY
+## -----------------------------------------------------------------------
-## KEEP BUILDS IN THE BUILD/ FOLDER
-## --------------------------------
build*/
-# If all build operations are carried out in either the build/ folder or
+# If all build operations are confined to the build/ folder or are conducted
# outside of the repository folder, they will be automatically excluded from
-# the repository.
+# the repository. Nothing produced by editors, IDEs, or build tools should
+# be placed anywhere else in the repository but build/.
+# 0.07 2015-08-09T11:12 Replace explicit ignore of Visual Studio artifacts
+# with a generic warning.
# 0.06 2015-08-09T10:17 Removed now-obsolete use of external/ as part of
# build usage.
# 0.05 2015-08-09T09:00 Add additional build exclusions based on recommended
diff --git a/iconv.txt b/iconv.txt
deleted file mode 100644
index f3ec07e..0000000
--- a/iconv.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-*** (orcmid). I did a grep to find all of the places that have an iconv.h
-*** dependency. These are what I found. Note that inconv.h shows up as an
-*** optional dependency of some externals and there are ways to exclude it.
-
-./DocFormats/platform/3rdparty/w3c-tidy-html5/src/iconvtc.c:#include <iconv.h>
-
-Binary file ./external/download/iconv-1.9.2.win32.zip matches
-
-./external/download/include/iconv.h:/* When installed, this file is called
- "iconv.h". */
-
-./external/download/include/iconv.h: errors because some other system header
- file includes /usr/include/iconv.h
-
-./external/download/include/iconv.h: But gcc's #include_next is not
- portable. Thus, once libiconv's iconv.h
-
-./external/download/include/iconv.h: include the original
- /usr/include/iconv.h. We simply have to get away
-
-./external/download/include/iconv.h: #include "iconv.h" or #include_next
- "iconv.h"
-
-./external/download/include/iconv.h: is small. They all do #include
- <iconv.h>.
-
-./external/download/include/libxml/encoding.h:#include <iconv.h>
-
-./external/download/include/SDL_stdinc.h:# include <iconv.h>
