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

Fix wrong caption for the image #203

Closed
wants to merge 1 commit into from

Conversation

harupong
Copy link
Member

@harupong harupong commented Dec 9, 2014

Replaced the wrong caption with the caption from the first edition.

closes progit/progit2-ja#30

Replaced the wrong caption with the caption from the first edition
@ben
Copy link
Member

ben commented Dec 9, 2014

Can you share your rationale as to why this is incorrect? It seems to mesh well with the text that comes just before it (emphasis mine):

If you have a more important project, you might want to use a two-phase merge cycle. In this scenario, you have two long-running branches, master and develop, in which you determine that master is updated only when a very stable release is cut and all new code is integrated into the develop branch. You regularly push both of these branches to the public repository. Each time you have a new topic branch to merge in (Figure 5-22), you merge it into develop (Figure 5-23); then, when you tag a release, you fast-forward master to wherever the now-stable develop branch is (Figure 5-24).

@harupong
Copy link
Member Author

"Is it acceptable that the caption and the alt text for an image are different?" was what I was thinking when I made this pull request. Like you said, the original phrase makes perfect sense. I chose to stick to the first edition as I was not sure whether the caption and the alt text were differed intentionally.

Listed are what we can do:

  1. close this pull request and leave this part of the section as is
  2. keep the original phrase and update the alt text to "After a project release"
  3. merge this pull request

Option 2 is the right way to go, I suppose? And if so, is it OK to add another commit to this pull request for that?

Sorry for the confusing commit messege, it should've been something like "Make the caption and the alt text same".

@ben
Copy link
Member

ben commented Dec 19, 2014

Ah, I see what the problem is now. Yes, please continue with option 2; replace the alt-text with the figure caption text. I'll leave it up to you whether it comes in as one commit or two. Thanks for this!

@harupong harupong closed this Feb 1, 2016
@harupong harupong deleted the wrong-image-caption branch February 1, 2016 14:44
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.

merging-workflows-5.pngのキャプションと代替テキストが違う
2 participants