[nl] Chapter 02. Review, include new command output and add header. #675

Merged
merged 10 commits into from Feb 15, 2014

Conversation

Projects
None yet
2 participants
Contributor

Cpt-xx commented Feb 14, 2014

Reviewed translations and made them more consistent and in line with
the recommendations of the Dutch language institute.
Added a header to that effect to the file.
Included the new modified command output.

Cpt-xx and others added some commits Feb 14, 2014

[nl] Chapter 02. Review, include new command output and add header.
   Reviewed translations and made them more consistent and in line with
   the recommendations of the Dutch language institute.
   Added a header to that effect to the file.
   Included the new modified command output.
Merge pull request #676 from JLuc/master
accord avec "la plupart"
Member

jnavila commented Feb 14, 2014

The integration test fails. Please fix the text.

Contributor

Cpt-xx commented Feb 15, 2014

Hi, could you please inform me about this test? I would then like to test my texts before pushing them (and I've got no idea what these integration tests consist of).

Cpt-xx added some commits Feb 14, 2014

[nl] Chapter 02. Review, include new command output and add header.
   Reviewed translations and made them more consistent and in line with
   the recommendations of the Dutch language institute.
   Added a header to that effect to the file.
   Included the new modified command output.
[nl] Chapter 02. More commands straightened
     On second viewing there were more commands to be corrected.
Merge branch 'chapter02' of github.com:Cpt-xx/progit into chapter02
Conflicts:
	nl/02-git-basics/01-chapter2.markdown
[nl] Chapter 02 Move the comment after first text.
    Aparently the Maruku test checks whether there is any HTML
    comment at the start (which is equally formed as the comment
    given in the English text concerning keeping the tabs unmodified.

    At this point it is not clear to me what this Maruku check consists
    of.
Contributor

Cpt-xx commented Feb 15, 2014

Okay, so by trial and error I found out what was failing (allthough in none of the available documentation surrounding the GitHub Flavored Markdown, nor in the Markdown basic I could find something about comments having to have a new line surrounding them. Especially the start of the comment is very sensitive for not having a new line preceeding. This surprised me: I had a comment in chapter02 and the test failed chapter01, as that didn't end with a new line. This seems a "feature" of the Maruku test if you ask me.

Member

jnavila commented Feb 15, 2014

This seems a "feature" of the Maruku test if you ask me.

No, it isn't. This a a "feature" of my integration tests. It concatenates the text of all the chapters and performs a compilation with Maruku. This differs from the latex compilation where the file contents are joined with "\n\n". Sorry for the false positive.

jnavila added a commit that referenced this pull request Feb 15, 2014

Merge pull request #675 from Cpt-xx/chapter02
[nl] Chapter 02. Review, include new command output and add header.

@jnavila jnavila merged commit 803fb36 into progit:master Feb 15, 2014

1 check passed

default The Travis CI build passed
Details

@Cpt-xx Cpt-xx deleted the Cpt-xx:chapter02 branch Feb 17, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment