Silence misleading test_abort stderr output

[openssl.git] / CONTRIBUTING

diff --git a/CONTRIBUTING b/CONTRIBUTING
index d826e8805f5542b06f146cbdf34758d0bfc4394f..07115e5a7588692cdb2beea9d6b4af8c78eb175e 100644 (file)
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -57,8 +57,8 @@ the acceptance and review process faster:
 
     3.  Patches should be as current as possible.  When using GitHub, please
     expect to have to rebase and update often. Note that we do not accept merge
-    commits, so please avoid these in any pull request. You will be asked to
-    remove them before a patch is considered acceptable.
+    commits. You will be asked to remove them before a patch is considered
+    acceptable.
 
     4.  Patches should follow our coding style (see
     https://www.openssl.org/policies/codingstyle.html) and compile without
@@ -69,3 +69,7 @@ the acceptance and review process faster:
     5.  When at all possible, patches should include tests. These can either be
     added to an existing test, or completely new.  Please see test/README
     for information on the test framework.
+
+    6.  New features or changed functionality must include documentation. Please
+    look at the "pod" files in doc/apps, doc/crypto and doc/ssl for examples of
+    our style.