Merge changes for release

.gitignore

@@ -94,3 +94,6 @@ TestResult.xml
 # test harness
 test-harness/packages/
 node_modules/
+
+#include output docs
+!docs/Output/

CHANGELOG.md

@@ -14,6 +14,12 @@ Features in Experimental are subject to change and removal without being conside
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [2.8.2] - 2016-08-18
+
+### Fixed
+
+* Handle Encoding or Opposite Slash in Feature Paths ([358](https://github.com/picklesdoc/pickles/pull/362)) (by [@ocsurfnut](https://github.com/ocsurfnut)).
+
 ## [2.8.1] - 2016-07-29
 
 ### Fixed

CNAME

@@ -0,0 +1 @@
+www.picklesdoc.com

DeployArtifacts.cmd

@@ -1,4 +1,3 @@
 @ECHO OFF
-call DeployOutput.cmd %1
 call DeployToChocolatey.cmd %1
 call DeployToNuget.cmd %1

DeployOutput.cmd

@@ -1,11 +1,10 @@
 @ECHO OFF
 
-cd ..\picklesdoc.github.com
+cd docs
 rmdir Output /s /q
-echo D | xcopy ..\pickles\Output Output /e
+echo D | xcopy ..\Output Output /e
 powershell -Command "(gc index_template.html) -replace 'VERSION_PLACEHOLDER', '%1' | Out-File -encoding ASCII index.html"
 
 git add -A
 git commit -m "Version %1"
-git push origin master
-cd ..\pickles
+cd ..

build.bat

@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.8.1"
+set "picklesVersion=2.8.2"
 
 cls
 
@@ -21,6 +21,7 @@ call %%A.cmd %picklesVersion%
 if errorlevel 1 goto handleerror1orhigher
 )
 
+call DeployOutput.cmd %picklesVersion%
 
 @ECHO all fine
 goto end

docs/.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

docs/.gitignore

@@ -0,0 +1,3 @@
+.vs/config/applicationhost.config
+packages/
+.vs/picklesdoc.github.com/v14/.suo

docs/CNAME

@@ -0,0 +1 @@
+www.picklesdoc.com