Misc: Revert all references to libusb/libusb.info

7 files changed, 35 insertions, 35 deletions

diff --git a/.private/README.txt b/.private/README.txt
index 9894138..7f63479 100644
--- a/.private/README.txt
+++ b/.private/README.txt
@@ -1,4 +1,4 @@
-This directory contains private internal scripts used by the libusbx
+This directory contains private internal scripts used by the libusb
 project maintainers.
 
 These scripts are not intended for general usage and will not be
diff --git a/.private/bm.sh b/.private/bm.sh
index 217baf8..520c3a5 100644
--- a/.private/bm.sh
+++ b/.private/bm.sh
@@ -6,9 +6,9 @@ PWD=`pwd`
 cd ..
 date=`date +%Y.%m.%d`
 target=e:/dailies/$date
-mkdir -p $target/include/libusbx-1.0
+mkdir -p $target/include/libusb-1.0
 cp -v libusb/libusb-1.0.def $target
-cp -v libusb/libusb.h $target/include/libusbx-1.0
+cp -v libusb/libusb.h $target/include/libusb-1.0
 
 #
 # 32 bit binaries
diff --git a/.private/bwince.cmd b/.private/bwince.cmd
index 91a0b2f..0cc7477 100755
--- a/.private/bwince.cmd
+++ b/.private/bwince.cmd
@@ -12,7 +12,7 @@ set WINCE_TARGET_DIR=%WINCE_TARGET_DIR_BASE%\%DATE:/=-%
 set MSBUILD_CMD=msbuild.exe
 set MSBUILD_TARGET=Rebuild
 set MSBUILD_CONFIGURATION=Release
-set WINCE_SLN=msvc\libusbx_wince.sln
+set WINCE_SLN=msvc\libusb_wince.sln
 set PLATFORM_PREFIX=STANDARDSDK_500 (
 set PLATFORM_POSTFIX=)
 
@@ -21,9 +21,9 @@ set PWD=%~dp0
 cd ..
 
 mkdir %WINCE_TARGET_DIR%
-mkdir %WINCE_TARGET_DIR%\include\libusbx-1.0
+mkdir %WINCE_TARGET_DIR%\include\libusb-1.0
 copy libusb\libusb-1.0.def %WINCE_TARGET_DIR%
-copy libusb\libusb.h %WINCE_TARGET_DIR%\include\libusbx-1.0
+copy libusb\libusb.h %WINCE_TARGET_DIR%\include\libusb-1.0
 for %%A in (%WINCE_TARGET_ARCHES%) do mkdir %WINCE_TARGET_DIR%\%%A
 for %%A in (%WINCE_TARGET_ARCHES%) do mkdir %WINCE_TARGET_DIR%\%%A\static
 for %%A in (%WINCE_TARGET_ARCHES%) do mkdir %WINCE_TARGET_DIR%\%%A\dll
diff --git a/.private/post-rewrite.sh b/.private/post-rewrite.sh
index b5fff07..0ac4847 100755
--- a/.private/post-rewrite.sh
+++ b/.private/post-rewrite.sh
@@ -10,7 +10,7 @@
 # fi
 #
 # NOTE: These versioning hooks are intended to be used *INTERNALLY* by the
-# libusbx development team and are NOT intended to solve versioning for any
+# libusb development team and are NOT intended to solve versioning for any
 # derivative branch, such as one you would create for private development.
 #
 
diff --git a/.private/pre-commit.sh b/.private/pre-commit.sh
index 7c95674..c495e33 100755
--- a/.private/pre-commit.sh
+++ b/.private/pre-commit.sh
@@ -12,12 +12,12 @@
 # fi
 #
 # NOTE: These versioning hooks are intended to be used *INTERNALLY* by the
-# libusbx development team and are NOT intended to solve versioning for any
+# libusb development team and are NOT intended to solve versioning for any
 # derivative branch, such as one you would create for private development.
 #
 # Should you wish to reuse these scripts for your own versioning, in your own
 # private branch, we kindly ask you to first set BRANCH_OFFSET to 60000, or
-# higher, as any offset below below 60000 is *RESERVED* for libusbx official
+# higher, as any offset below below 60000 is *RESERVED* for libusb official
 # usage.
 
 ################################################################################
diff --git a/.private/wbs.txt b/.private/wbs.txt
index 2e2d9d8..2ad8395 100644
--- a/.private/wbs.txt
+++ b/.private/wbs.txt
@@ -1,13 +1,13 @@
-              libusbx 1.0 Windows binary snapshot - README
+              libusb 1.0 Windows binary snapshot - README
 
    *********************************************************************
    *  The latest version of this snapshot can always be downloaded at: *
-   *         https://sourceforge.net/projects/libusbx/files/           *
+   *         https://sourceforge.net/projects/libusb/files/           *
    *********************************************************************
 
 o Visual Studio:
   - Open existing or create a new project for your application
-  - Copy libusb.h, from the include\libusbx-1.0\ directory, into your project and
+  - Copy libusb.h, from the include\libusb-1.0\ directory, into your project and
     make sure that the location where the file reside appears in the 'Additional
     Include Directories' section (Configuration Properties -> C/C++ -> General).
   - Copy the relevant .lib file from MS32\ or MS64\ and add 'libusb-1.0.lib' to
@@ -15,18 +15,18 @@ o Visual Studio:
     Also make sure that the directory where libusb-1.0.lib resides is added to
     'Additional Library Directories' (Configuration Properties -> Linker
     -> General)
-  - If you use the static version of the libusbx library, make sure that
+  - If you use the static version of the libusb library, make sure that
     'Runtime Library' is set to 'Multi-threaded DLL (/MD)' (Configuration
     Properties -> C/C++ -> Code Generation).
     NB: If your application requires /MT (Multi-threaded/libCMT), you need to
-    recompile a static libusbx 1.0 library from source.
+    recompile a static libusb 1.0 library from source.
   - Compile and run your application. If you use the DLL version of libusb-1.0,
     remember that you need to have a copy of the DLL either in the runtime
     directory or in system32
 
 o WDK/DDK:
   - The following is an example of a sources files that you can use to compile
-    a libusbx 1.0 based console application. In this sample ..\libusbx\ is the
+    a libusb 1.0 based console application. In this sample ..\libusb\ is the
     directory where you would have copied libusb.h as well as the relevant 
     libusb-1.0.lib
 
@@ -34,28 +34,28 @@ o WDK/DDK:
 	TARGETTYPE=PROGRAM
 	USE_MSVCRT=1
 	UMTYPE=console
-	INCLUDES=..\libusbx;$(DDK_INC_PATH)
-	TARGETLIBS=..\libusbx\libusb-1.0.lib
+	INCLUDES=..\libusb;$(DDK_INC_PATH)
+	TARGETLIBS=..\libusb\libusb-1.0.lib
 	SOURCES=your_app.c
 
   - Note that if you plan to use libCMT instead of MSVCRT (USE_LIBCMT=1 instead
-    of USE_MSVCRT=1), you will need to recompile libusbx to use libCMT. This can
+    of USE_MSVCRT=1), you will need to recompile libusb to use libCMT. This can
     easily be achieved, in the DDK environment, by running 'ddk_build /MT'
 
 o MinGW/cygwin
-  - Copy libusb.h, from include/libusbx-1.0/ to your default include directory,
+  - Copy libusb.h, from include/libusb-1.0/ to your default include directory,
     and copy the MinGW32/ or MinGW64/ .a files to your default library directory.
     Or, if you don't want to use the default locations, make sure that you feed
     the relevant -I and -L options to the compiler.
   - Add the '-lusb-1.0' linker option when compiling.
 
 o Additional information:
-  - The libusbx 1.0 API documentation can be accessed at:
-    http://api.libusbx.org
+  - The libusb 1.0 API documentation can be accessed at:
+    http://api.libusb.info
   - For some libusb samples (including source), please have a look in examples/
-  - For additional information on the libusbx 1.0 Windows backend please visit:
-    http://windows.libusbx.org
+  - For additional information on the libusb 1.0 Windows backend please visit:
+    http://windows.libusb.info
   - The MinGW and MS generated DLLs are fully interchangeable, provided that you
     use the import libs provided or generate one from the .def also provided.
-  - If you find any issue, please visit http://libusbx.org/ and check the
+  - If you find any issue, please visit http://libusb.info/ and check the
     Support section
diff --git a/.private/wbs_wince.txt b/.private/wbs_wince.txt
index ebd890d..5b5e3cb 100755
--- a/.private/wbs_wince.txt
+++ b/.private/wbs_wince.txt
@@ -1,8 +1,8 @@
-              libusbx 1.0 Windows CE binary snapshot - README
+              libusb 1.0 Windows CE binary snapshot - README
 
    *********************************************************************
    *  The latest version of this snapshot can always be downloaded at: *
-   *         https://sourceforge.net/projects/libusbx/files/           *
+   *         https://sourceforge.net/projects/libusb/files/           *
    *********************************************************************
 
 The binaries contained in this snapshot are licensed under the
@@ -12,7 +12,7 @@ is available for download at the same location as this binary snapshot.
 
 o Visual Studio:
   - Open existing or create a new project for your application
-  - Copy libusb.h, from the include\libusbx-1.0\ directory, into your project and
+  - Copy libusb.h, from the include\libusb-1.0\ directory, into your project and
     make sure that the location where the file reside appears in the 'Additional
     Include Directories' section (Configuration Properties -> C/C++ -> General).
   - Copy the relevant .lib file from ARMV4I, MIPSII, MIPSII_FP, MIPSIV, MIPSIV_FP,
@@ -20,23 +20,23 @@ o Visual Studio:
     (Configuration Properties -> Linker -> Input). Also make sure that the
     directory where libusb-1.0.lib resides is added to 'Additional Library
     Directories' (Configuration Properties -> Linker -> General)
-  - If you use the static version of the libusbx library, make sure that
+  - If you use the static version of the libusb library, make sure that
     'Runtime Library' is set to 'Multi-threaded DLL (/MD)' (Configuration
     Properties -> C/C++ -> Code Generation).
     NB: If your application requires /MT (Multi-threaded/libCMT), you need to
-    recompile a static libusbx 1.0 library from source.
+    recompile a static libusb 1.0 library from source.
   - Compile and run your application. If you use the DLL version of libusb-1.0,
     remember that you need to have a copy of the DLL either in the runtime
     directory or in system32
 
 o Additional information:
-  - The libusbx 1.0 API documentation can be accessed at:
-    http://api.libusbx.org
+  - The libusb 1.0 API documentation can be accessed at:
+    http://api.libusb.info
   - For some libusb samples (including source), please have a look in examples/
-  - For additional information on the libusbx 1.0 Windows backend please visit:
-    http://windows.libusbx.org
-  - It is necessary to install the CE USB Kernel Wrapper driver for libusbx to
+  - For additional information on the libusb 1.0 Windows backend please visit:
+    http://windows.libusb.info
+  - It is necessary to install the CE USB Kernel Wrapper driver for libusb to
     function on a device. This is obtainable from:
     https://github.com/RealVNC/CEUSBKWrapper
-  - If you find any issue, please visit http://libusbx.org/ and check the
+  - If you find any issue, please visit http://libusb.info/ and check the
     Support section