Fix typo: _REENTERANT -> _REENTRANT

[openssl.git] / CONTRIBUTING

diff --git a/CONTRIBUTING b/CONTRIBUTING
index a04dbea90cfa2a707c1e563bf2891e0471332eab..9d63d8abb67252974e5a1267b2e38b67c1ad0a06 100644 (file)
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -7,9 +7,9 @@ would like to submit a patch, send it to rt@openssl.org with
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
 
-You can also make GitHub pull requests. If you do this, please also send mail to
-rt@openssl.org with a brief description and a link to the PR so that we can more
-easily keep track of it.
+You can also make GitHub pull requests. If you do this, please also send
+mail to rt@openssl.org with a brief description and a link to the PR so
+that we can more easily keep track of it.
 
 If you are unsure as to whether a feature will be useful for the general
 OpenSSL community please discuss it on the openssl-dev mailing list first.
@@ -19,22 +19,17 @@ reason as to why that feature isn't implemented.
 Patches should be as up to date as possible, preferably relative to the
 current Git or the last snapshot. They should follow our coding style
 (see https://www.openssl.org/policies/codingstyle.html) and compile without
-warnings using the --strict-warnings flag.  OpenSSL compiles on many
-varied platforms: try to ensure you only use portable features.
-
-Note: For legal reasons, contributions from the US can be accepted only
-if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
-(formerly BXA) with a copy to the ENC Encryption Request Coordinator;
-please take some time to look at
-http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
-and
-http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e))
-for the details. If "your encryption source code is too large to serve as
-an email attachment", they are glad to receive it by fax instead; hope you
-have a cheap long-distance plan.
-
-Our preferred format for changes is "diff -u" output. You might
-generate it like this:
+warnings using the --strict-warnings flag.  OpenSSL compiles on many varied
+platforms: try to ensure you only use portable features.
+
+Our preferred format for patch files is "git format-patch" output. For example
+to provide a patch file containing the last commit in your local git repository
+use the following command:
+
+# git format-patch --stdout HEAD^ >mydiffs.patch
+
+Another method of creating an acceptable patch file without using git is as
+follows:
 
 # cd openssl-work
 # [your changes]