Adapt several comments to contrib rep move

CHANGELOG

@@ -6,6 +6,9 @@ HISTORY
 
   * [Enter new changes just after this line - do not remove this line]
 
+  2018-10-02: Dirk Ziegelmeier
+  * Integrate contrib repository into main lwIP rep, tag STABLE-2_1_0_RELEASE
+
 (STABLE-2.1.0):
 
   ++ New features:

contrib/Filelists.cmake

@@ -1,7 +1,7 @@
 # This file is indended to be included in end-user CMakeLists.txt
 # include(/path/to/Filelists.cmake)
 # It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the
-# root path of lwIP contrib sources.
+# root path of lwIP/contrib sources.
 #
 # This file is NOT designed (on purpose) to be used as cmake
 # subdir via add_subdirectory()

contrib/ports/Common.allports.mk

@@ -55,7 +55,7 @@ CONTRIBDIR?=../../..
 ARFLAGS?=rs
 
 #Set this to where you have the lwip core module checked out from git
-#default assumes it's a dir named lwip at the same level as the contrib module
+#default assumes it's a dir above the contrib module
 LWIPDIR?=$(CONTRIBDIR)/..
 
 CFLAGS+=-I. \

contrib/ports/unix/Filelists.cmake

@@ -1,7 +1,7 @@
 # This file is indended to be included in end-user CMakeLists.txt
 # include(/path/to/Filelists.cmake)
 # It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the
-# root path of lwIP contrib sources.
+# root path of lwIP/contrib sources.
 #
 # This file is NOT designed (on purpose) to be used as cmake
 # subdir via add_subdirectory()

contrib/ports/unix/check/README

@@ -2,7 +2,7 @@
 Helper files to run lwIP unit tests on unix-like systems.
 
 1. Install the check library, through a package manager or from http://check.sourceforge.net/
-2. Put the lwip code in a directory called 'lwip' in the same directory as lwip-contrib is
+2. Put the lwip code in a directory called 'lwip'
 3. Run `make check`
 4. Make sure all tests pass
 

contrib/ports/win32/Filelists.cmake

@@ -1,7 +1,7 @@
 # This file is indended to be included in end-user CMakeLists.txt
 # include(/path/to/Filelists.cmake)
 # It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the
-# root path of lwIP contrib sources.
+# root path of lwIP/contrib sources.
 #
 # This file is NOT designed (on purpose) to be used as cmake
 # subdir via add_subdirectory()

doc/contrib.txt

@@ -55,4 +55,4 @@ features of Savannah help us not lose users' input.
 
 1. If you have ported lwIP to a platform (an OS, a uC/processor or a combination of these) and
    you think it could benefit others[1] you might want discuss this on the mailing list. You
-   can also ask for Git access to submit and maintain your port in the contrib Git module.
+   can also ask for Git access to submit and maintain your port in the lwIP/contrib subdir.

doc/doxygen/main_page.h

@@ -354,7 +354,7 @@ Call these functions in the order of appearance:
  * several places where a check for a correct thread context is
  * implemented which greatly helps the user to get threading done right.
  * See the example sys_arch.c files in unix and Win32 port 
- * in the contrib repository.
+ * in the lwIP/contrib subdirectory.
  * 
  * In short: Copy the functions sys_mark_tcpip_thread() and 
  * sys_check_core_locking() to your port and modify them to work with your OS.

src/apps/snmp/snmp_core.c

@@ -37,8 +37,8 @@
  * @defgroup snmp SNMPv2c/v3 agent
  * @ingroup apps
  * SNMPv2c and SNMPv3 compatible agent\n
- * There is also a MIB compiler and a MIB viewer in lwIP contrib repository
- * (lwip-contrib/apps/LwipMibCompiler).\n
+ * There is also a MIB compiler and a MIB viewer in lwIP/contrib subdir
+ * (lwip/contrib/apps/LwipMibCompiler).\n
  * The agent implements the most important MIB2 MIBs including IPv6 support
  * (interfaces, UDP, TCP, SNMP, ICMP, SYSTEM). IP MIB is an older version
  * without IPv6 statistics (TODO).\n

src/include/lwip/arch.h

@@ -360,7 +360,7 @@ extern "C" {
  * The file included BEFORE the struct is "arch/bpstruct.h".\n
  * The file included AFTER the struct is "arch/epstruct.h".\n
  * This can be used to implement struct packing on MS Visual C compilers, see
- * the Win32 port in the lwIP contrib repository for reference.
+ * the Win32 port in the lwIP/contrib subdir for reference.
  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
  */