You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2017/08/26 22:21:20 UTC

[1/7] commons-csv git commit: Update version for Commons Csv release 1.5

Repository: commons-csv
Updated Branches:
  refs/heads/release [created] 74d18a474


Update version for Commons Csv release 1.5


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/615cf139
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/615cf139
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/615cf139

Branch: refs/heads/release
Commit: 615cf1395bc327fcdcd1e1d9fa1736eab302442f
Parents: f7d7d63
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 19:58:02 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 19:58:02 2017 +1200

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/615cf139/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2af9ee1..b2ca39c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <version>42</version>
   </parent>
   <artifactId>commons-csv</artifactId>
-  <version>1.5-SNAPSHOT</version>
+  <version>1.5</version>
   <name>Apache Commons CSV</name>
   <url>http://commons.apache.org/proper/commons-csv/</url>
   <description>

[5/7] commons-csv git commit: Updated README.md for release 1.5

Posted by ki...@apache.org.
Updated README.md for release 1.5


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/2be15499
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/2be15499
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/2be15499

Branch: refs/heads/release
Commit: 2be15499b7fedf442ca00c6624277a385d60ede3
Parents: 211ef31
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 20:21:48 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 20:21:48 2017 +1200

----------------------------------------------------------------------
 README.md | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/2be15499/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2f6e6e7..87f1c60 100644
--- a/README.md
+++ b/README.md
@@ -43,18 +43,18 @@
 Apache Commons CSV
 ===================
 
-The Apache Commons CSV library provides a simple interface for reading and writing
-CSV files of various types.
-
 [![Build Status](https://travis-ci.org/apache/commons-csv.svg?branch=master)](https://travis-ci.org/apache/commons-csv)
-[![Coverage Status](https://coveralls.io/repos/github/apache/commons-csv/badge.svg?branch=master)](https://coveralls.io/github/apache/commons-csv?branch=master)
+[![Coverage Status](https://coveralls.io/repos/apache/commons-csv/badge.svg?branch=master)](https://coveralls.io/r/apache/commons-csv)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-csv/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-csv/)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
+The Apache Commons CSV library provides a simple interface for reading and writing
+CSV files of various types.
+
 Documentation
 -------------
 
-More information can be found on the [homepage](https://commons.apache.org/proper/commons-csv).
+More information can be found on the [Apache Commons CSV homepage](https://commons.apache.org/proper/commons-csv).
 The [JavaDoc](https://commons.apache.org/proper/commons-csv/javadocs/api-release) can be browsed.
 Questions related to the usage of Apache Commons CSV should be posted to the [user mailing list][ml].
 
@@ -68,14 +68,14 @@ Alternatively you can pull it from the central Maven repositories:
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-csv</artifactId>
-  <version>1.4</version>
+  <version>1.5</version>
 </dependency>
 ```
 
 Contributing
 ------------
 
-We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
+We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors.
 There are some guidelines which will make applying PRs easier for us:
 + No tabs! Please use spaces for indentation.
 + Respect the code style.
@@ -87,7 +87,9 @@ You can learn more about contributing via GitHub in our [contribution guidelines
 
 License
 -------
-Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
+This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0).
+
+See the `NOTICE.txt` file for required notices and attributions.
 
 Donations
 ---------
@@ -97,8 +99,8 @@ Additional Resources
 --------------------
 
 + [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/CSV)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.org`
 
 [ml]:https://commons.apache.org/mail-lists.html

[3/7] commons-csv git commit: Update change log for release 1.5

Posted by ki...@apache.org.
Update change log for release 1.5


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/27b2995e
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/27b2995e
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/27b2995e

Branch: refs/heads/release
Commit: 27b2995e0ad3bfc3823e3d195a2913bb5f3032ce
Parents: 87698c0
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 20:02:13 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 20:02:13 2017 +1200

----------------------------------------------------------------------
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/27b2995e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 744ffc8..62fe6c2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -38,7 +38,7 @@
     <title>Release Notes</title>
   </properties>
   <body>
-    <release version="1.5" date="2017-MM-DD" description="Bug fix release">
+    <release version="1.5" date="2017-08-26" description="Feature and bug fix release">
       <action issue="CSV-203" type="fix" dev="ggregory" due-to="Richard Wheeldon, Kai Paroth">withNullString value is printed without quotes when QuoteMode.ALL is specified; add QuoteMode.ALL_NON_NULL. PR #17.</action>
       <action issue="CSV-194" type="fix" dev="ggregory" due-to="Marc Prud'hommeaux">Fix outdated comments about FileReader in CSVParser #13</action>
       <action issue="CSV-193" type="fix" dev="ggregory" due-to="Matthias Wiehl">Fix incorrect method name 'withFirstRowAsHeader' in user guide.</action>

[7/7] commons-csv git commit: Updated RELEASE-NOTES.txt in preparation for 1.5 release

Posted by ki...@apache.org.
Updated RELEASE-NOTES.txt in preparation for 1.5 release


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/74d18a47
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/74d18a47
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/74d18a47

Branch: refs/heads/release
Commit: 74d18a474e08793980c54b615d558366f49db539
Parents: 926b01b
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 20:36:45 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 20:36:45 2017 +1200

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/74d18a47/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e44042b..cf7c853 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,4 +1,61 @@
                         Apache Commons CSV
+                            Version 1.5
+                           Release Notes
+
+
+INTRODUCTION:
+
+This document contains the release notes for the 1.5 version of Apache Commons CSV.
+Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
+
+CSV requires at least Java 7.
+
+The Apache Commons CSV library provides a simple interface for reading and writing
+CSV files of various types.
+
+Feature and bug fix release
+
+Changes in this version include:
+
+NEW FEATURES
+==============
+
+o CSV-189:  CSVParser: Add factory method accepting InputStream. Thanks to Peter Holzwarth, Gary Gregory.
+o CSV-190:  Add convenience API CSVFormat.print(File, Charset). Thanks to Gary Gregory.
+o CSV-191:  Add convenience API CSVFormat.print(Path, Charset). Thanks to Gary Gregory.
+o CSV-192:  Add convenience API CSVParser.parse(Path, Charset, CSVFormat). Thanks to Gary Gregory.
+o CSV-205:  Add convenience API CSVFormat#printer() to print to System.out. Thanks to Gary Gregory.
+o CSV-207:  Provide a CSV Format for printing PostgreSQL CSV and Text formats. Thanks to Gary Gregory.
+o CSV-214:  Adding a placeholder in the Lexer and CSV parser to store the end-of-line string. Thanks to Nitin Mahendru, Gary Gregory.
+
+FIXED BUGS
+============
+
+o CSV-203:  withNullString value is printed without quotes when QuoteMode.ALL is specified; add QuoteMode.ALL_NON_NULL. PR #17. Thanks to Richard Wheeldon, Kai Paroth.
+o CSV-194:  Fix outdated comments about FileReader in CSVParser #13. Thanks to Marc Prud'hommeaux.
+o CSV-193:  Fix incorrect method name 'withFirstRowAsHeader' in user guide. Thanks to Matthias Wiehl.
+o CSV-171:  Negative numeric values in the first column are always quoted in minimal mode. Thanks to Gary Gregory, Michael Graessle, Adrian Bridgett.
+
+CHANGES
+=========
+
+o CSV-187: Update platform requirement from Java 6 to 7. Thanks to Gary Gregory.
+o CSV-201: Do not use RuntimeException in CSVParser.iterator().new Iterator() {...}.getNextRecord(). Thanks to Benedikt Ritter, Gary Gregory.
+
+
+Historical list of changes: http://commons.apache.org/proper/commons-csv/changes-report.html
+
+For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+
+http://commons.apache.org/proper/commons-csv/
+
+Have fun!
+-Apache Commons CSV team
+
+------------------------------------------------------------------------------
+
+                        Apache Commons CSV
                             Version 1.4
                            Release Notes

[4/7] commons-csv git commit: Update NOTICE.txt copyright year for 1.5 release

Posted by ki...@apache.org.
Update NOTICE.txt copyright year for 1.5 release


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/211ef31b
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/211ef31b
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/211ef31b

Branch: refs/heads/release
Commit: 211ef31ba44f317fd9a1d4fc8acd40d2f89194ad
Parents: 27b2995
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 20:06:18 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 20:06:24 2017 +1200

----------------------------------------------------------------------
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/211ef31b/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 9eac639..14c9397 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons CSV
-Copyright 2005-2016 The Apache Software Foundation
+Copyright 2005-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[2/7] commons-csv git commit: Update download page in preparation for 1.5 release

Posted by ki...@apache.org.
Update download page in preparation for 1.5 release


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/87698c0b
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/87698c0b
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/87698c0b

Branch: refs/heads/release
Commit: 87698c0b9fdcd770a49b4ce881cf48b175cba60e
Parents: 615cf13
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 19:58:54 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 19:58:54 2017 +1200

----------------------------------------------------------------------
 src/site/xdoc/download_csv.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/87698c0b/src/site/xdoc/download_csv.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_csv.xml b/src/site/xdoc/download_csv.xml
index 9f6425c..ab02d63 100644
--- a/src/site/xdoc/download_csv.xml
+++ b/src/site/xdoc/download_csv.xml
@@ -111,32 +111,32 @@ limitations under the License.
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons CSV 1.4 (Java 6.0+)">
+    <section name="Apache Commons CSV 1.5 (Java 7+)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.4-bin.tar.gz">commons-csv-1.4-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.4-bin.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.4-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.5-bin.tar.gz">commons-csv-1.5-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.5-bin.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.5-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.4-bin.zip">commons-csv-1.4-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.4-bin.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.4-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.5-bin.zip">commons-csv-1.5-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.5-bin.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.5-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/csv/source/commons-csv-1.4-src.tar.gz">commons-csv-1.4-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.4-src.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.4-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/source/commons-csv-1.5-src.tar.gz">commons-csv-1.5-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.5-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.5-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/csv/source/commons-csv-1.4-src.zip">commons-csv-1.4-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.4-src.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.4-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/source/commons-csv-1.5-src.zip">commons-csv-1.5-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.5-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.5-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>

[6/7] commons-csv git commit: Update CONTRIBUTING.md for 1.5 release

Posted by ki...@apache.org.
Update CONTRIBUTING.md for 1.5 release


Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/926b01bf
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/926b01bf
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/926b01bf

Branch: refs/heads/release
Commit: 926b01bf5b8e11928f1d7a8d14c00052cce9fd3d
Parents: 2be1549
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sat Aug 26 20:24:06 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sat Aug 26 20:24:06 2017 +1200

----------------------------------------------------------------------
 CONTRIBUTING.md | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/926b01bf/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 121e39f..a259af1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,47 +51,65 @@ Getting Started
 + Make sure you have a [JIRA account](https://issues.apache.org/jira/).
 + Make sure you have a [GitHub account](https://github.com/signup/free).
 + If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons CSV's scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
   + Clearly describe the issue including steps to reproduce when it is a bug.
   + Make sure you fill in the earliest version that you know has the issue.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
 
 Making Changes
 --------------
 
-+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Create a _topic branch_ for your isolated work.
+  * Usually you should base your branch on the `master` or `trunk` branch.
+  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `CSV-123-InputStream`.
+  * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
 + Make commits of logical units.
+  * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
+  * e.g. `CSV-123: Close input stream earlier`
 + Respect the original code style:
   + Only use spaces for indentation.
-  + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
-  + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
+  + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
+  + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
 + Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
 
 Making Trivial Changes
 ----------------------
 
+The JIRA tickets are used to generate the changelog for the next release.
+
 For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
 In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
 
+
 Submitting Changes
 ------------------
 
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+  * Note that small patches & typical bug fixes do not require a CLA as
+    clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+    covers them.
 + Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+  * Verify _Files Changed_ shows only your intended changes and does not
+  include additional files like `target/*.class`
 + Update your JIRA ticket and include a link to the pull request in the ticket.
 
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
 Additional Resources
 --------------------
 
 + [Contributing patches](https://commons.apache.org/patches.html)
-+ [Apache Commons CSV JIRA project page](https://issues.apache.org/jira/browse/CSV)
++ [Apache Commons CSV JIRA project page][jira]
 + [Contributor License Agreement][cla]
 + [General GitHub documentation](https://help.github.com/)
 + [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
 
 [cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/CSV