summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2022-06-08 14:50:29 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2022-06-09 08:39:24 +0200
commit9ef5c9a2ff2e841a7e14e060cf826fd6f50734e2 (patch)
tree3634fadd0c65da3c14651dfe071967c0819b9a2a
parentif_ffec: Allow PHY that is connected to other FFEC (diff)
downloadrtems-libbsd-9ef5c9a2ff2e841a7e14e060cf826fd6f50734e2.tar.bz2
CONTRIBUTING.rst: Warn about white space changes
-rw-r--r--CONTRIBUTING.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 8cf42dff..f28f02e1 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -279,6 +279,12 @@ original FreeBSD code.
Rules for Modifying FreeBSD Source
==================================
+Do not reformat original FreeBSD code. Do not perform white space changes even
+if you get git commit warnings. **Check your editor settings so that it does
+not perform white space changes automatically**, for example adding a newline
+to the end of the file. White space changes may result in conflicts during
+updates, especially changes at the end of a file.
+
Changes in FreeBSD files must be done using ``__rtems__`` C pre-processor guards.
This makes synchronization with the FreeBSD upstream easier and is very
important. Patches which do not follow these rules will be rejected. Only add
@@ -380,12 +386,6 @@ In general, provide empty header files and do not guard includes.
For new code use
`STYLE(9) <http://www.freebsd.org/cgi/man.cgi?query=style&apropos=0&sektion=9>`_.
-Do not format original FreeBSD code. Do not perform white space changes even
-if you get git commit warnings. Check your editor settings so that it doesn't
-perform white space changes automatically, for example adding a newline to the
-end of the file. White space changes may result in conflicts during updates,
-especially changes at the end of a file.
-
Automatically Generated FreeBSD Files
=====================================