Skip to content

Commit 2681404

Browse files
committed
merge master
2 parents c75100a + c1a77a2 commit 2681404

File tree

127 files changed

+44450
-16701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+44450
-16701
lines changed

.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
PLATFORM_API_TOKEN=look for me in chamber
1+
PLATFORM_API_TOKEN=look for me in chamber
2+
PAPI_TOKEN=get one from a papi-enabled workspace

Gemfile.lock

100644100755
File mode changed.

Makefile

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,30 @@ package: build
4949
serve: package
5050
@docker run -p 4000:80 segment-docs:latest
5151

52+
# gives us user-transparent way to swap between two different systems
5253
.PHONY: catalog
53-
catalog: vendor/bundle
54-
@node scripts/catalog.js
54+
catalog: catalog-papi
55+
56+
# uses the old configapi
57+
.PHONY: capi
58+
capi: vendor/bundle
59+
@node scripts/catalog-capi.js
60+
61+
# shorter alias
62+
.PHONY: catalog-capi
63+
catalog-capi: vendor/bundle
64+
@node scripts/catalog-capi.js
65+
66+
# uses the new public api
67+
.PHONY: catalog-papi
68+
catalog-papi: vendor/bundle
69+
@node scripts/catalog_papi.js
70+
71+
# shorter alias
72+
.PHONY: papi
73+
papi: vendor/bundle
74+
@node scripts/catalog_papi.js
75+
5576

5677
.PHONY: changelog
5778
changelog: vendor/bundle

README.md

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ See the [Contributor Guide](contributors.md) for more info.
6464

6565
If you're planning substantial changes to the docs, follow this process for great success! 🏆
6666

67-
1. 📞 Contact the docs team* during the planning phase. This way, we can help with logistics and information architecture, and alert you to any gotchas in your content area.
67+
1. 📞 Contact the docs team ( @segmentio/segment-doc-team ) during the planning phase. This way, we can help with logistics and information architecture, and alert you to any gotchas in your content area.
6868
2. 📝 Unless previously booked, we don't need to be involved in the writing - go for it! (We're happy to consult if you get stuck or need someone to bounce ideas off.)
6969
3. 👀 When you've got a draft at least 70% ready for review, tag a member of the docs team, who'll do an initial review. (This can be either in Paper/Gdocs, or in a Github [Draft PR](#draft-prs) with markdown changes if you're comfortable with that.) They'll do a copy edit pass, and ask clarifying questions.
7070
4. ❓The doc author/owner should answer the questions asked in the review phase. Either the doc author, or the docs team member can resolve comments as they are clarified in the doc text.👍
@@ -76,8 +76,6 @@ If you're planning substantial changes to the docs, follow this process for grea
7676

7777
Once the PR is merged, the docs site rebuilds and the changes are live!
7878

79-
(* The docs team is just Laura right now.)
80-
8179

8280
### The Docs Process for direct contributors
8381

@@ -88,17 +86,16 @@ Once the PR is merged, the docs site rebuilds and the changes are live!
8886
3. Commit your changes.
8987
3. Push the branch to `segment-docs` and make a PR to master.
9088
- Include any context you can in the PR: links to ZD tickets, Jira tickets, Paper docs or wiki pages about the project. (If you include a Jira ticket number, Jira can often link directly to the PR.)
91-
3. [Check if you need a review](#most-frequently-asked-question-do-i-need-a-review) and tag @sanscontext (or another member of the docs team). (Github also tags the CODEOWNERS for the path you're editing.)
89+
3. [Check if you need a review](#most-frequently-asked-question-do-i-need-a-review) and tag a member of the docs team. (Github also tags the CODEOWNERS for the path you're editing.)
9290
5. If the reviewers ask for clarifications or edits:
9391
- make the changes
9492
- push the new commits to the branch
9593
5. Once you get an approving review and the checks pass, merge your PR.
96-
6. Once you've merged the branch, _delete it_!
97-
7. Once merged, you can track build and deploy process in [buildkite/segment-docs](https://buildkite.com/segment/segment-docs).
94+
7. Once merged, Netlify builds the changes to `master` and redeploys the docs site.
9895

9996
### Draft PRs
10097

101-
If you're doing a substantial change and you're going to want to spend a few weeks on it, use [Github's Draft PRs feature](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests), or add `WIP` to the title of your PR. This lets us know to ignore the PR until you're ready (otherwise Laura will ping you weekly about it!).
98+
If you're doing a substantial change and you're going to want to spend a few weeks on it, use [Github's Draft PRs feature](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests), or add `DRAFT` or `WIP` to the title of your PR. This lets us know to ignore the PR until you're ready (otherwise we might ping you weekly about it!).
10299

103100

104101
## How the docs build works
@@ -111,10 +108,10 @@ When you run `make dev` (or `make docs`) on your laptop, Jekyll runs the same pr
111108

112109
Some of these files include Liquid script, which allows them to load reusable content ("includes"), render fancy HTML styling, and run simple code processes to build programmatic content. As long as the Jekyll process is running on your laptop, you can edit the content of a page in markdown and save it, and Jekyll will detect the change and rebuild that page so you can view it locally. However, this doesn't work if you're editing the page layouts or stylesheets, which are assumed to be static at build time.
113110

114-
When you merge a PR to master, our build system runs the Jekyll program, and automatically publishes the rebuilt HTML files to our web server. (Which is why we *require* that the Buildkite build passes before you merge!)
111+
When you merge a PR to master, the Netlify build system runs the Jekyll program, and automatically publishes the rebuilt HTML files.
115112

116113
## Formatting and Prettifying
117-
Some important tips are in the [styleguide](styleguide.md). We also have a (rendering)[Formatting guide](/src/utils/formatguide.md) available so you can see how different formatting looks when rendered.
114+
Some important tips are in the [styleguide](styleguide.md). We also have a (rendering) [Formatting guide](/src/utils/formatguide.md) available so you can see how different formatting looks when rendered.
118115

119116
## Repo structure
120117

@@ -147,15 +144,13 @@ A few possibilities/suggestions:
147144
- **Name images to describe a process flow**. For example `checkout-1-add-to-cart.png`, `checkout-2-est-shipping.png` and so on.
148145

149146

150-
### Diagram Library
151-
152-
We have a diagram library in Sketch, which you can use to build pretty, on-brand architecture diagrams, etc. There's a [readme file in that directory](diagram-library/readme.md) with instructions on how to use it.
153-
154147
### Content structure
155148

156149
There are folders for each of the top level products, and those folders might also contain topics that are related to that product area (for example the Privacy Portal section also contains GDPR/CCPA docs).
157150

158-
For the Connections product, the section is divided into the Spec, then Sources, Destinations, and Warehouses, with general accessory topics at the folder root. (More specific accessory topics are in each sub directory.) Each also contains a `catalog` directory, which contains all the directories with information about specific integrations. The top-level of this folder (the `index.md`) is a pretty "catalog" page which gives a tile-like view by category, suitable for browsing. It pulls the logo for these tiles from the path for the integration in the metadata service.
151+
For the Connections product, the section is divided into the Spec, then Sources, Destinations, and Storage Destinations (formerly called "Warehouses"), with general accessory topics at the folder root. (More specific accessory topics are in each sub directory.)
152+
153+
Each also contains a `catalog` directory, which contains all the directories with information about specific integrations. The top-level of this `catalog` folder (the `index.md`) is a pretty "catalog" page which gives a tile-like view by category, suitable for browsing. It pulls the logo for these tiles from the path for the integration in the metadata, either in `destinations.yml`, `sources.yml`, or `warehouses.yml`.
159154

160155

161156
### Programmatic content
@@ -166,7 +161,7 @@ Programmatic content is built using information in the files in `/src/_data/cata
166161

167162
Most of the programmatic content is built into the `_layouts` templates that each page uses. Sources, Destinations, and Warehouses use the `integration.html` template, which uses some Liquid logic, and calls an `include` depending on the integration type. Most of logic for the actual content must live in the include file itself, however logic controlling *if* the include is built can live in the `layout`.
168163

169-
Destination pages include the `integration_foot.md` content which uses Liquid scripting and pulls from the catalog metadata.
164+
Destination pages include the `destination-dossier.html` and `destination_footer.md` content, which use Liquid scripting and pulls from the catalog metadata.
170165

171166
Sources pages check if the source is a cloud-app, then include information about if the source is an object or event source, based on the `type` data from the ConfigAPI.
172167

@@ -223,14 +218,10 @@ We have two neat icons that you can add to a bottom-level menu item to mark it w
223218
- `dev`: runs `jekyll serve` locally with incremental builds. Useful when updating CSS, JS, or content and you don't want to rebuild every time.
224219
- `docs`: same as `make dev`, but for Laura's convenience.
225220
- `build`: Builds the site docs. Used by CI to publish the docs to staging and production
226-
- `catalog`: Pulls in the latest catalog data from the Platform API and saves it in the respective data files. Requires an API key to be passed in env via PLATFORM_API_TOKEN. [Instructions here](#bring-your-own-token).
221+
- `catalog`: Pulls in the latest catalog data from the Platform API and saves it in the respective data files. Requires an API key to be passed in env via PLATFORM_API_TOKEN. [Instructions here](https://github.com/segmentio/segment-docs/blob/master/contributors.md#refresh-the-segment-catalog).
227222
- `sidenav`: Builds the side navs for 'main', 'legal', 'api', 'partners' and stores the output in `/src/_data/sidenav-auto/`. This output isn't used for the actual build.
228223
- `typewriter`: pulls in the current state of the Docs tracking plan for implementing Segment tracking
229224
- `seed`: copies all example data files out of the `_templates` directory and puts them in the `_data` directory. Useful if you don't have a way to set up an API key.
230225
- `clean`: removes all build artifacts
231226
- `clean-deps`: removes all downloaded `gems` and `node_modules`
232227
- `deps`: installs the required `gems` and `node_modules`
233-
234-
235-
- docker-build: runs `make build` on a docker host.
236-
- docker-dev: runs `make dev` on a docker host.

_config.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ defaults:
4040

4141
collections:
4242
release_notes:
43-
output: false
43+
output: true
44+
permalink: /:collection/:name
4445

4546
plugins_dir: ./_plugins
4647
plugins:
@@ -55,4 +56,16 @@ algolia:
5556
index_name: segment-docs
5657
files_to_exclude:
5758
- _release_notes/*
59+
- utils/*
5860
nodes_to_index: 'p, table#limit'
61+
settings:
62+
customRanking:
63+
- desc(title)
64+
- desc(custom_ranking.heading)
65+
- asc(custom_ranking.position)
66+
attributesForFaceting:
67+
- searchable(categories)
68+
- searchable(hidden)
69+
- searchable(tags)
70+
- searchable(title)
71+
- type

0 commit comments

Comments
 (0)