Merge branch '1.0.0-beta8' into 1.0.0-rc1

aspnet/conceptual-overview/understanding-aspnet5-apps.rst

@@ -70,7 +70,7 @@ The **frameworks** section designates which targeted frameworks will be built, a
 
 .. TODO Update this section
 
-The **exclude** section is used to identify files and folders that should be excluded from builds. Likewise, **bundleExclude** is used to identify content portions of the project that should be excluded when bundling the site (for example, in production).
+The **exclude** section is used to identify files and folders that should be excluded from builds. Likewise, **publishExclude** is used to identify content portions of the project that should be excluded when publishing the site (for example, in production).
 
 .. image:: understanding-aspnet5-apps/_static/excludes.png
 

aspnet/dnx/projects.rst

@@ -427,7 +427,7 @@ List of include/exclude properties
 +---------------------+--------------------------------------+-----------------------------------+
 | sharedExclude       |                                      |                                   |
 +---------------------+--------------------------------------+-----------------------------------+
-| bundleExclude       | ``bin/**;obj/**;**/.*/**``           |                                   |
+| publishExclude      | ``bin/**;obj/**;**/.*/**``           |                                   |
 +---------------------+--------------------------------------+-----------------------------------+
 | exclude             |                                      |                                   |
 +---------------------+--------------------------------------+-----------------------------------+
@@ -503,8 +503,8 @@ The following describes the exact lists that are built up with the following not
       -ResourcesList
       +contentFiles
     
-    BundleExcludeList =
-      +Glob ( +bundleExclude )
+    PublishExcludeList =
+      +Glob ( +publishExclude )
 
 Sharing files
 ^^^^^^^^^^^^^