Merge branch 'develop' into DOC-688

Author: forstisabella

.github/styles/Vocab/Docs/accept.txt

@@ -34,6 +34,8 @@ Automations
 aws
 background(?:ed|ing)
 Bento
+Bing
+Blackbaud
 Blitzllama
 blocklist
 Bluedot

CODEOWNERS

@@ -21,11 +21,11 @@ CODEOWNERS  @segmentio/segment-doc-team
 
 
 # Libraries owners
-/src/connections/catalog/libraries @stayseesong @markzegarelli
+/src/connections/catalog/libraries @stayseesong
 
 
 # Destinations owners
-# /src/connections/destinations  @stayseesong @markzegarelli
+# /src/connections/destinations  @stayseesong=
 
 # Stratconn
 ## Adobe
@@ -41,7 +41,7 @@ CODEOWNERS  @segmentio/segment-doc-team
 
 
 # Engage
-/src/engage/ @markzegarelli @pwseg @rchinn-segment
+/src/engage/ @pwseg @rchinn-segment
 
 # Unify
 /src/unify @rchinn-segment
@@ -50,4 +50,4 @@ CODEOWNERS  @segmentio/segment-doc-team
 /src/protocols @forstisabella
 
 # Storage owners
-/src/connections/storage @forstisabella
+/src/connections/storage @forstisabella

CONTRIBUTING.md

@@ -41,7 +41,7 @@ The most interesting ones are:
 
 **Save all images locally! No linking to third-party hosted images!** Images are published to our CDN from the build step, and this means they won't go missing if the hosting service dujour goes out of business.
 
-There are no _enforced_ naming conventions at this time. Files that start with an underscore are ignored by Jekyll. Anything you see with `asset` was dowloaded by a script to migrate it out of Contents.io.
+There are no _enforced_ naming conventions at this time. Files that start with an underscore are ignored by Jekyll. Anything you see with `asset` was downloaded by a script to migrate it out of Contents.io.
 
 In general, it's a good practice to name images with a description that helps you (& other docs maintainers) figure out where they should go within a page, or within a larger folder of images.
 
@@ -101,7 +101,7 @@ Front matter variables have unique functions, including the following:
 - `hide-personas-partial`: defaults to false. When true, hides the section of content from `destination-footer.md` that talks about being able to receive personas data.
 - `integration_type`: This is set in the `_config.yml` on three paths to add a noun (Source, Destination, or Warehouse) to the end of the title, and the end of the title tag in the html layout. It also controls the layout and icon for some of these.
 - `source-type`: These are only used to supplement when a Cloud App in the sources path doesn't appear in the Config API list, and needs its type explicitly set. It runs some logic in the `cloud-app-note.md` to explain which cloud-apps are object vs event sources.
-
+- `private`: Used to indicate that a destination is not publicly available (Private Beta or Pilot status), and is not available in the public catalog. When `private: true`, the build pulls integration metadata from `src/_data/catalog/destinations_private.yml`. To update the list of private destinations, use the `make private_destination` command, and enter the integration's ID when prompted.
 #### Utility front matter
 - `published`: defaults to true. Set this to "false" to prevent Jekyll from rendering an HTML page for this file. Good for when you're working on something in the repo but aren't ready to release it yet, and don't want to use a Draft PR.
 - `hidden`: omits the file from the `sitemap.xml`, adds a `<meta name="robots" content="noindex" />` to the top of the generated HTML file, and drops it from the convenience script for regenerating the nav.

Makefile

@@ -55,29 +55,8 @@ package: build
 serve: package
 	@docker run -p 4000:80 segment-docs:latest
 
-# gives us user-transparent way to swap between two different systems
-.PHONY: catalog
-catalog: catalog-papi
-
-# uses the old configapi
-.PHONY: capi
-capi: vendor/bundle
-	@node scripts/catalog_capi.js
-
-# shorter alias
-.PHONY: catalog-capi
-catalog-capi: vendor/bundle
-	@node scripts/catalog_capi.js
-
-# uses the new public api
-.PHONY: catalog-papi
-catalog-papi: vendor/bundle
-	@node scripts/catalog_papi.js
-
-# shorter alias
-.PHONY: papi
-papi: vendor/bundle
-	@node scripts/catalog_papi.js
+catalog:
+	@node scripts/catalog/index.js
 
 # make the list of beta connections
 .PHONY: beta
@@ -184,7 +163,7 @@ docker-build:
 
 .PHONY: private-destination
 private_destination:
-	@node scripts/private-destination.js
+	@node scripts/catalog/addPrivateDestination.js
 #.PHONY: docs
 #docs: node_modules
 #	$(BIN)/webpack --mode=production

branches.txt

@@ -1,38 +1,39 @@
 [build]
+  # This line defines the command that is run during production builds
+  # It first updated the Algolia index through the Algolia plugin for Jekyll
+  # then runs the standard build command. See package.json for more details 
+  # about the available build targets (develop, develop-inc, build)
   command = "jekyll algolia && yarn build"
-  # Ignore builds unless [netlify-build] is present in commit message
-  # ignore = "git log -1 --pretty=%B | ( ! grep -q '\[netlify\-build\]' )"
-  # Ignore if [netlify-ignore] is present
-
-  # Don't build if there are no changes to src/
-  ## ignore = "git diff --quiet HEAD^ HEAD src/"
 
 [context.deploy-preview]
+  # For deploy previews, use the testing Jekyll environment, the develop build target calls
   command = "yarn develop"
+  # Check this file to see if the site should build. ignore.sh checks for the presence of 
+  # [netlify-build] in the commit message
   ignore = "./scripts/ignore.sh"
 
 [context.branch-deploy]
   command = "yarn build"
-#  ignore = "./scripts/ignore.sh"
+  # ignore = "./scripts/ignore.sh"
 
 [context.develop]
   command = "yarn develop"
 
 [[redirects]]
+  # Don't touch these settings. They are required for the redirect to work, since the docs site
+  # is located at /docs and not the root of the site.
   from = "/docs/*"
   to = "/:splat"
   status = 200
 
 [[redirects]]
+  # Sam thing as above, but specifically for the js bundle
   from = "/docs/assets/docs.bundle.js"
   to = "/assets/docs.bundle.js"
   status = 200
 
 # [[plugins]]
-#   package = "netlify-plugin-jekyll-cache"
-
-# 	[plugins.inputs]
-#   	jekyllSource = "/src"
+# if we want to include plugins, this is where to ensure they run
 
 
 [[headers]]