Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converges titles to imperative-form, front-matter based, and sentence-case #438

Merged
merged 8 commits into from
Nov 4, 2016

Conversation

johndmulhausen
Copy link

Changes _layouts/docs.html to use {{ page.title }} from front-page matter, and makes the front-matter the authoritative source for page titles. Work done here:

  • Title casing converted to sentence casing
  • Gerunds in titles converted to imperative form
  • Disambiguation where page titles would be duplicated ("FAQ" for multiple products, etc) or otherwise vague in global contexts
  • title: replaced with text from first # H1 Title in cases of divergence
  • Some 80-column text wrapping (using Atom's CMD+ALT+Q command) when long lines were egregious enough to bug me

@@ -2,8 +2,6 @@
title: Documentation Archive
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be "Documentation archive"?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@@ -2,11 +2,9 @@
description: Installation and using Docker via Ansible
keywords:
- ansible, installation, usage, docker, documentation
title: Using Ansible
title: Use ansible
Copy link
Contributor

@joaofnfernandes joaofnfernandes Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ansible is a product, so it should be capitalized (at least according to their site)

Copy link
Contributor

@joaofnfernandes joaofnfernandes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the tiny nitpicks, LGTM

weight: -55
title: Docker Security Scanning
- Docker, docker, scan, scanning, security, registry, plans, Docker Cloud, docs, documentation, trusted, builds, trusted builds, automated builds
title: Docker security scanning
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Security Scanning is a product name and should remain capitalized.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

notoc: true
title: Builds and Images Overview
title: Build and images overview
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should remain plural because you can have multiple builds. Also, as a landing/index page, it feels weird to decap Overview for some reason. 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really like sentence capitalization so "overview" doesn't look strange to me.
But you can always change the sentence to "Overview of build and images"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'll probably do that for all of the landing pages.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done (pluralization) :)

parent: builds
weight: -60
title: Link to a source code repository
title: Link Docker Cloud to a source code provider
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the long form, right? The shorter version appears nested in context in the left nav menu?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly; in-page = longform, toc.yaml = shortform

parent: docker-cloud
weight: 50
title: Known Issues in Docker Cloud
title: Known Docker Engine issues in Docker Cloud
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not all Engine specific errors (often it's just a collision), so it doesn't make sense to have "Docker Engine" in the title.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

parent: docker-cloud
weight: -99
title: Docker ID and Settings
title: Your Docker ID and Docker Cloud account
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your Docker ID is your Docker Cloud account, so this isn't quite right. "Docker ID and Cloud Settings" is more correct.
(Again) this isn't reflected in the left nav, right?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, it's not in the left-nav. Changed "account" to "settings"

main:
parent: infrastructure
title: Link to Packet hosts
title: Link your Packet account
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/your/to a
(same as ^ )

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

main:
parent: infrastructure
title: Link to SoftLayer hosts
title: Link your SoftLayer account
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/your/to a
(you probably get the picture by now ;) )

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

main:
parent: docker-cloud
title: Docker Cloud notifications in Slack
title: Receive Docker Cloud notifications in Slack
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably more like "configure" or "set up", since receiving is sort of a passive thing that only happens once you've done that bit...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done (went with "Set up")

parent: mn_pubhub
weight: -80
title: Teams & Organizations
title: Organizations and teams
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're specifying "in Docker Cloud" we might as well be specific on this one too and add "Docker Hub".

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

main:
parent: mn_pubhub
weight: -90
- Docker, docker, trusted, sign-up, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
title: Your Docker ID
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Docker ID and Docker Hub account"
(Same comment as in several others - I know the original title isn't great, so let's improve it.)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@sanscontext
Copy link
Contributor

Some nits on titles. Should be quick changes, sorry for the large number of them.

@joaofnfernandes
Copy link
Contributor

I don't see any changes to _data/toc.yaml file. Probably you also need to check it to be consistent in terms of capitalization.

@johndmulhausen
Copy link
Author

johndmulhausen commented Nov 3, 2016

@sanscontext - No worries on the # of comments, thanks so much for taking a look. :)
@joaofnfernandes Re: toc.yaml -- Yep, I'm thinking I want to be sure everyone signs off on the titles before I duplicate the changes over there.

Thanks for the feedback guys, digging into it now.

Copy link

@mdlinville mdlinville left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed commits to change non-controversial titles for Engine. Had a few comments / questions along the way.

@@ -185,6 +185,7 @@
</div>
<div {% if page.notoc %} class="col-xs-12 col-sm-9 col-md-10" {% else %} class="col-xs-12 col-sm-9 col-md-8 col-xl-9" {% endif %} >
<section class="section" id="DocumentationText">
<h1>{{ page.title }}</h1>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do any kind of smart fall-back for if there is no title: in the frontmatter? Can we default to using the first header encountered in the file?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrapped in an "if" so that this only happens if there is a title. Which should be always, but yes, that will make it so we default to first header (which happens just through natural content rendering)

main:
parent: engine_admin
weight: 15
- Examples, Usage, links, docker, documentation, examples, names, name, container naming
title: Link via an ambassador container

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, do I ever hate "via"? And what are we linking? This is OK for now I guess but we need to revisit this topic.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed on anti-"via". (i18n PTSD)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack; sucky page title, I can't even discern what use case it's trying to document, honestly, and it uses Sven's personal Docker repo

weight: "-60"
title: On cloud providers
- Docker install
title: Install Engine in the cloud

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"in a public cloud" maybe? Or are you going for the "in the cloud" hype on purpose?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switched to "on cloud hosts" which I see in other topics in this branch of the TOC

menu:
main:
parent: install_cloud
weight: -3
title: Choose how to install

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hate this title. Maybe "Docker installation choices"? or "Choose your installation method"?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Choose an installation method" (eschewing "your" for consistency, see upthread) sounds good - let's go with that

menu:
main:
parent: engine_remoteapi
weight: 90
title: docker.io accounts API

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 'docker.io Accounts API'? Not sure what the proper noun is, and it's awkward to start with a lowercase word.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hey, this looks like Docker ID stuff, too.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switched to: Accounts API for docker.io

main:
parent: smn_hub_ref
title: The Docker Hub and the Registry v1
title: Docker Hub and Registry V1

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think maybe it should still be 'v1' with a lowercase 'v'

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@johndmulhausen johndmulhausen merged commit 558314b into master Nov 4, 2016
@johndmulhausen johndmulhausen deleted the metadatascrub branch November 8, 2016 00:33
joaofnfernandes pushed a commit to joaofnfernandes/docker.github.io that referenced this pull request Nov 11, 2016
- Close docker#194 and fix
- Fix and close docker#425
- Fix and close docker#417
- Fix and close docker#420
- Fix and close docker#422
- Adding in documentation build scripts
- Fix and close docker#431
- Fix and close docker#438, and Fix and close docker#429
- Work on 441
- Adding in commands reference
- Updating all the options to tables
- Updating per Vivek docker#498
- Adding vivek's last suggestions

Signed-off-by: Mary Anthony <mary@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants