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.

Sign up for GitHub

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

Jump to bottom

Chapter3 fixes #29

Closed
wants to merge 2 commits into from
Closed

Chapter3 fixes #29

wants to merge 2 commits into from

Conversation

davidhassell
Copy link
Contributor

Hi Richard and Mark,

More minor typesettting ideas for chapter 3.

All the best,

David

rhattersley
rhattersley reviewed Oct 26, 2015
View reviewed changes
ch03.adoc
@@ -295,7 +295,7 @@ The attributes **`flag_values`**,

The **`flag_values`** and **`flag_meanings`**
attributes describe a status flag consisting of mutually exclusive coded values. The **`flag_values`** attribute is the same type as the variable to which it is attached, and contains a list of the possible flag values. The **`flag_meanings`** attribute is a string whose value is a blank separated list of descriptive words or phrases, one for each flag value. Each word or phrase should consist of characters from the alphanumeric
set and the following five: '_', '-', '.', '+', '@'. If multi-word phrases are used to describe the flag values, then the words within a phrase should be connected with underscores. The following example illustrates
set and the following five: "_","-", ".","+", "@". If multi-word phrases are used to describe the flag values, then the words within a phrase should be connected with underscores. The following example illustrates
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this line needs changing.

  1. Both the HTML and PDF versions use a single quote character.
  2. You've lost a couple of the spaces between items.

Copy link
Member

Choose a reason for hiding this comment

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

single quotes in asciidoc give emphasised text with no quotes

As of asciidoctor 1.5 (as used by the automated build) this is no longer true. You can see this at http://cf-metadata.github.io/#flags. So the simplest thing to do here is nothing.

If you're stuck with an earlier version then perhaps the back-tick - forward-tick technique (as described for "Single quoted text") would allow it to work in both versions.

@rhattersley
Copy link
Member

Chapter 2 fixes

You've accidentally included the changes from #28.

@rhattersley rhattersley mentioned this pull request Oct 26, 2015
Closed
20 tasks
@davidhassell
Copy link
Contributor Author

Hi Richard,

No problem! The double quotes ("+", "-", ...) were a compromise: The existing 1.6 has single quotes as you say, but the single quotes in asciidoc give emphasised text with no quotes. Some sort quotes are needed (so the commas are not in the list!) - can quotes be escaped?

David

@davidhassell
Copy link
Contributor Author

Re. including previous chapter's changes - oops, sorry. I probably did that with chapters 4 and 5, too. Won't happen again (touch wood).

David

@rhattersley
Copy link
Member

To get rid of the extraneous commit you need to rebase. Assuming you have upstream pointing at this repo, origin pointing at your fork, and a clean checkout in your local repo:

$ git checkout chapter3_fixes
$ git fetch upstream
$ git rebase upstream/master
$ git push origin +chapter3_fixes

@rhattersley rhattersley mentioned this pull request Nov 21, 2015
Merged
@rhattersley rhattersley modified the milestone: 1.6 Nov 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.6
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@davidhassell @rhattersley