Skip to content

Commit a5723bc

Browse files
Merge pull request #583 from fredericDelaporte/ContribDocImprovement
Improvement for reducing JIRA number mismatches, and some typos fixed.
2 parents bad8b20 + 8ae097b commit a5723bc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ Ensure that your e-mail address and name are configured appropriately in Git.
7272

7373
Create a feature branch so it's easy to keep it separate from other improvements. Having a pull request accepted might involve further commits based on community feedback, so having the feature branch provides a tidy place to work from. Using the issue number as the branch name is good practice.
7474

75-
When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to link to automatically link your commits to the issue. For example: NH-1234
75+
When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to automatically link your commits to the issue. By example: *NH-1234 - test case for blah trouble*. Make sure you do not put any non whitespace character adjacent to the issue number, as this would prevent JIRA to match it. (Avoid *NH-1234: test case for blah trouble*.)
7676

7777
## Implementing the Bug Fix or Improvement
7878

79-
Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is. While this may seem daunting at first, feel free to give it a go. It's just code afterall. :)
79+
Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is. While this may seem daunting at first, feel free to give it a go. It's just code after all. :)
8080

8181
### Ensure All Tests Pass
8282

@@ -88,7 +88,7 @@ Please note that some tests assume a case insensitive accent sensitive database
8888

8989
Be sure to link to the JIRA issue in your GitHub pull request. Also, go back to your JIRA issue and link to the pull request.
9090

91-
We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode. It is recomended you install editorconfig from the Visual Studio Extension Manager.
91+
We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode. It is recommended you install editorconfig from the Visual Studio Extension Manager.
9292

9393
## Further Discussion
9494

Contributor Guide.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ <h2>Commit your Test Case</h2>
124124
</p>
125125

126126
<p>
127-
When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to link to automatically link your commits to the issue. For example: NH-1234
127+
When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to automatically link your commits to the issue. By example: <i>NH-1234 - test case for blah trouble</i>. Make sure you do not put any non whitespace character adjacent to the issue number, as this would prevent JIRA to match it. (Avoid <i>NH-1234: test case for blah trouble</i>.)
128128
</p>
129129

130130
<h2>Implementing the Bug Fix or Improvement</h2>
131131

132-
Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is. While this may seem daunting at first, feel free to give it a go. It's just code afterall. :)
132+
Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is. While this may seem daunting at first, feel free to give it a go. It's just code after all. :)
133133

134134
<h3>Ensure All Tests Pass</h3>
135135
<p>
@@ -146,7 +146,7 @@ <h2>Submit a Pull Request</h2>
146146
</p>
147147
<p>We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an
148148
<a href="http://www.editorconfig.org/">editorconfig</a> configuration file to switch Visual Studio automatically between
149-
tabs and spaces mode. It is recomended you install editorconfig from the Visual Studio Extension Manager.</p>
149+
tabs and spaces mode. It is recommended you install editorconfig from the Visual Studio Extension Manager.</p>
150150

151151
<h2>Further Discussion</h2>
152152

0 commit comments

Comments
 (0)