From a08ac00c6757c117f33c319f50388c869b730bfe Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Thu, 1 Oct 2020 00:10:39 +0200 Subject: [PATCH] ICU-21304 Update old userguide links to unicode-org.github.io --- docs/ide4c/vscode/README.md | 3 +- docs/userguide/icu4c-readme.md | 14 +++++----- icu4c/readme.html | 21 +++++++------- icu4c/source/common/putil.cpp | 2 +- icu4c/source/common/unicode/docmain.h | 8 +++--- icu4c/source/common/unicode/udata.h | 4 +-- icu4c/source/common/unicode/unistr.h | 4 +-- icu4c/source/common/unicode/utf.h | 2 +- icu4c/source/common/unicode/utf16.h | 2 +- icu4c/source/common/unicode/utf8.h | 2 +- icu4c/source/common/unicode/uvernum.h | 2 +- icu4c/source/config/icu-config-bottom | 2 +- icu4c/source/configure | 2 +- icu4c/source/configure.ac | 2 +- icu4c/source/data/mappings/gb18030.ucm | 2 +- icu4c/source/i18n/format.cpp | 2 +- icu4c/source/i18n/unicode/coll.h | 6 ++-- icu4c/source/i18n/unicode/msgfmt.h | 2 +- icu4c/source/i18n/unicode/numberformatter.h | 2 +- icu4c/source/i18n/unicode/numfmt.h | 2 +- icu4c/source/i18n/unicode/smpdtfmt.h | 2 +- icu4c/source/i18n/unicode/tblcoll.h | 8 +++--- icu4c/source/i18n/unicode/timezone.h | 4 +-- icu4c/source/i18n/unicode/ucal.h | 4 +-- icu4c/source/i18n/unicode/ucol.h | 18 ++++++------ icu4c/source/i18n/unicode/udat.h | 2 +- icu4c/source/i18n/unicode/unum.h | 2 +- icu4c/source/io/ucln_io.cpp | 3 +- .../source/layoutex/layout/ParagraphLayout.h | 2 +- icu4c/source/tools/gennorm2/gennorm2.cpp | 2 +- icu4c/source/tools/toolutil/toolutil.cpp | 2 +- .../icu/text/CollationElementIterator.java | 2 +- .../src/com/ibm/icu/text/CollationKey.java | 2 +- .../src/com/ibm/icu/text/Collator.java | 12 ++++---- .../com/ibm/icu/text/RuleBasedCollator.java | 14 +++++----- .../icu/number/NumberFormatterSettings.java | 2 +- .../src/com/ibm/icu/text/DecimalFormat.java | 8 +++--- .../src/com/ibm/icu/text/MessageFormat.java | 2 +- .../core/src/com/ibm/icu/util/TimeZone.java | 4 +-- .../src/com/ibm/icu/impl/javaspi/package.html | 2 +- icu4j/readme.html | 28 +++++++++---------- 41 files changed, 106 insertions(+), 105 deletions(-) diff --git a/docs/ide4c/vscode/README.md b/docs/ide4c/vscode/README.md index 671eaf9024d..c8478a590a5 100644 --- a/docs/ide4c/vscode/README.md +++ b/docs/ide4c/vscode/README.md @@ -18,5 +18,6 @@ initial bad system performance when a new build is launched. NOTE: -Run the [`./runConfigureICU` command](http://userguide.icu-project.org/icufaq) +Run the +[`./runConfigureICU` command](https://unicode-org.github.io/icu/userguide/icufaq) before building `icu4c` from VSCode. diff --git a/docs/userguide/icu4c-readme.md b/docs/userguide/icu4c-readme.md index e6748b2916a..31ed71c07c1 100644 --- a/docs/userguide/icu4c-readme.md +++ b/docs/userguide/icu4c-readme.md @@ -217,7 +217,7 @@ In the descriptions below, `` is the full path name of the ICU directory (t environment variable to the out/ or the out/build/ directories, but this is generally discouraged because most people set it incorrectly. You can view the ICU Data + "https://unicode-org.github.io/icu/userguide/icudata">ICU Data Management section of the ICU User's Guide for details.

@@ -396,7 +396,7 @@ Depending on the platform and the type of installation, we recommend a small num Note: The ICU test suites _can_ be compiled with this setting. * **.dat file:** By default, the ICU data is built into a shared library (DLL). This is convenient because it requires no install-time or runtime configuration, but the library is platform-specific and cannot be modified. A .dat package file makes the opposite trade-off: Platform-portable (except for endianness and charset family, which can be changed with the icupkg tool) and modifiable (also with the icupkg tool). If a path is set, then single data files (e.g., .res files) can be copied to that location to provide new locale data or conversion tables etc. The only drawback with a .dat package file is that the application needs to provide ICU with the file system path to the package file (e.g., by calling `u_setDataDirectory()`) or with a pointer to the data (`udata_setCommonData()`) before other ICU API calls. This is usually easy if ICU is used from an application where `main()` takes care of such initialization. It may be hard if ICU is shipped with another shared library (such as the Xerces-C++ XML parser) which does not control `main()`. - See the [User Guide ICU Data](http://userguide.icu-project.org/icudata) chapter for more details. + See the [User Guide ICU Data](https://unicode-org.github.io/icu/userguide/icudata) chapter for more details. If possible, we recommend building the .dat package. Specify `--with-data-packaging=archive` on the configure command line, as in `runConfigureICU Linux --with-data-packaging=archive` (Read the configure script's output for further instructions. On Windows, the Visual Studio build generates both the .dat package and the data DLL.) @@ -416,7 +416,7 @@ Depending on the platform and the type of installation, we recommend a small num #### ICU as a System-Level Library -If ICU is installed as a system-level library, there are further opportunities and restrictions to consider. For details, see the _Using ICU as an Operating System Level Library_ section of the [User Guide ICU Architectural Design](http://userguide.icu-project.org/design) chapter. +If ICU is installed as a system-level library, there are further opportunities and restrictions to consider. For details, see the _Using ICU as an Operating System Level Library_ section of the [User Guide ICU Architectural Design](https://unicode-org.github.io/icu/userguide/design) chapter. * **Data path:** For a system-level library, it is best to load ICU data from the .dat package file because the file system path to the .dat package file can be hardcoded. ICU will automatically set the path to the final install location using U_ICU_DATA_DEFAULT_DIR. Alternatively, you can set `-DICU_DATA_DIR=/path/to/icu/data` when building the ICU code. (Used by source/common/putil.c.) Consider also setting `-DICU_NO_USER_DATA_OVERRIDE` if you do not want the "ICU_DATA" environment variable to be used. (An application can still override the data path via `u_setDataDirectory()` or `udata_setCommonData()`. @@ -808,7 +808,7 @@ When changes have been made to the standard ICU distribution, it is recommended 1. Add a suffix name to the library names. This can be done with the --with-library-suffix configure option. 2. The installation script should install the ICU libraries into the application's directory. -Following these guidelines prevents other applications that use a standard ICU distribution from conflicting with any libraries that you need. On operating systems that do not have a standard C++ ABI (name mangling) for compilers, it is recommended to do this special packaging anyway. More details on customizing ICU are available in the [User's Guide](http://userguide.icu-project.org/). The [ICU Source Code Organization](#SourceCode) section of this readme.html gives a more complete description of the libraries. +Following these guidelines prevents other applications that use a standard ICU distribution from conflicting with any libraries that you need. On operating systems that do not have a standard C++ ABI (name mangling) for compilers, it is recommended to do this special packaging anyway. More details on customizing ICU are available in the [User's Guide](https://unicode-org.github.io/icu/userguide/). The [ICU Source Code Organization](#SourceCode) section of this readme.html gives a more complete description of the libraries. @@ -834,7 +834,7 @@ Following these guidelines prevents other applications that use a standard ICU d - + @@ -982,7 +982,7 @@ If you are using ICU's Makefiles to build ICU on a new platform, there are a few For some people, it may not be necessary for completely build ICU. Most of the makefiles and build targets are for tools that are used for building ICU's data, and an application's data (when an application uses ICU resource bundles for its data). -Data files can be built on a different platform when both platforms share the same endianness and the same charset family. This assertion does not include platform dependent DLLs/shared/static libraries. For details see the User Guide [ICU Data](http://userguide.icu-project.org/icudata) chapter. +Data files can be built on a different platform when both platforms share the same endianness and the same charset family. This assertion does not include platform dependent DLLs/shared/static libraries. For details see the User Guide [ICU Data](https://unicode-org.github.io/icu/userguide/icudata) chapter. ICU 3.6 removes the requirement that ICU be completely built in the native operating environment. It adds the icupkg tool which can be run on any platform to turn binary ICU data files from any one of the three formats into any one of the other data formats. This allows a application to use ICU data built anywhere to be used for any other target platform. @@ -1027,4 +1027,4 @@ The platform dependencies have been mostly isolated into the following files in * * * Copyright © 2016 and later: Unicode, Inc. and others. License & terms of use: [http://www.unicode.org/copyright.html](http://www.unicode.org/copyright.html) -Copyright © 1997-2016 International Business Machines Corporation and others. All Rights Reserved. \ No newline at end of file +Copyright © 1997-2016 International Business Machines Corporation and others. All Rights Reserved. diff --git a/icu4c/readme.html b/icu4c/readme.html index 222b11cb095..2b2c4ec07c3 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -185,20 +185,21 @@ + "https://unicode-org.github.io/icu/userguide/icufaq">https://unicode-org.github.io/icu/userguide/icufaq + "https://unicode-org.github.io/icu/userguide/">https://unicode-org.github.io/icu/userguide/ - + @@ -284,7 +285,7 @@

In the descriptions below, <ICU> is the full path name of the ICU directory (the top level directory from the distribution archives) in your file system. You can also view the ICU Architectural + "https://unicode-org.github.io/icu/userguide/design">ICU Architectural Design section of the User's Guide to see which libraries you need for your software product. You need at least the data ([lib]icudt) and the common ([lib]icuuc) libraries in order to use ICU.

@@ -443,7 +444,7 @@ environment variable to the out/ or the out/build/ directories, but this is generally discouraged because most people set it incorrectly. You can view the ICU Data + "https://unicode-org.github.io/icu/userguide/icudata">ICU Data Management section of the ICU User's Guide for details.

@@ -687,7 +688,7 @@ It may be hard if ICU is shipped with another shared library (such as the Xerces-C++ XML parser) which does not control main().
- See the User Guide ICU Data + See the User Guide ICU Data chapter for more details.
If possible, we recommend building the .dat package. Specify --with-data-packaging=archive @@ -723,7 +724,7 @@

If ICU is installed as a system-level library, there are further opportunities and restrictions to consider. For details, see the Using ICU as an Operating System Level Library - section of the User Guide ICU Architectural Design chapter.

+ section of the User Guide ICU Architectural Design chapter.

@@ -1790,7 +1791,7 @@ gnumake

Data files can be built on a different platform when both platforms share the same endianness and the same charset family. This assertion does not include platform dependent DLLs/shared/static libraries. For details see the - User Guide ICU + User Guide ICU Data chapter.

ICU 3.6 removes the requirement that ICU be completely built in the native diff --git a/icu4c/source/common/putil.cpp b/icu4c/source/common/putil.cpp index 9223c150d1d..3ed6a05d22d 100644 --- a/icu4c/source/common/putil.cpp +++ b/icu4c/source/common/putil.cpp @@ -81,7 +81,7 @@ #include #ifndef U_COMMON_IMPLEMENTATION -#error U_COMMON_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see http://userguide.icu-project.org/howtouseicu +#error U_COMMON_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see https://unicode-org.github.io/icu/userguide/howtouseicu #endif diff --git a/icu4c/source/common/unicode/docmain.h b/icu4c/source/common/unicode/docmain.h index 704139a85ed..ccf62d05377 100644 --- a/icu4c/source/common/unicode/docmain.h +++ b/icu4c/source/common/unicode/docmain.h @@ -53,10 +53,10 @@ * *

Architecture (User's Guide)

* * *
diff --git a/icu4c/source/common/unicode/udata.h b/icu4c/source/common/unicode/udata.h index bd8234731b7..6caa849c42f 100644 --- a/icu4c/source/common/unicode/udata.h +++ b/icu4c/source/common/unicode/udata.h @@ -306,7 +306,7 @@ udata_getInfo(UDataMemory *pData, UDataInfo *pInfo); * area in memory. * * ICU data must be at least 8-aligned, and should be 16-aligned. - * See http://userguide.icu-project.org/icudata + * See https://unicode-org.github.io/icu/userguide/icudata * * The format of this data is that of the icu common data file, as is * generated by the pkgdata tool with mode=common or mode=dll. @@ -353,7 +353,7 @@ udata_setCommonData(const void *data, UErrorCode *err); * pointer. * * ICU data must be at least 8-aligned, and should be 16-aligned. - * See http://userguide.icu-project.org/icudata + * See https://unicode-org.github.io/icu/userguide/icudata * * The format of this data is that of the icu common data file, like 'icudt26l.dat' * or the corresponding shared library (DLL) file. diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h index 0c9ffd72ee2..456389f265f 100644 --- a/icu4c/source/common/unicode/unistr.h +++ b/icu4c/source/common/unicode/unistr.h @@ -227,7 +227,7 @@ class UnicodeStringAppendable; // unicode/appendable.h * The UnicodeString class is not suitable for subclassing. * * For an overview of Unicode strings in C and C++ see the - * [User Guide Strings chapter](http://userguide.icu-project.org/strings#TOC-Strings-in-C-C-). + * [User Guide Strings chapter](https://unicode-org.github.io/icu/userguide/strings#strings-in-cc). * * In ICU, a Unicode string consists of 16-bit Unicode *code units*. * A Unicode character may be stored with either one code unit @@ -285,7 +285,7 @@ class UnicodeStringAppendable; // unicode/appendable.h * significant performance improvements. * Also, the internal buffer is accessible via special functions. * For details see the - * [User Guide Strings chapter](http://userguide.icu-project.org/strings#TOC-Maximizing-Performance-with-the-UnicodeString-Storage-Model). + * [User Guide Strings chapter](https://unicode-org.github.io/icu/userguide/strings#maximizing-performance-with-the-unicodestring-storage-model). * * @see utf.h * @see CharacterIterator diff --git a/icu4c/source/common/unicode/utf.h b/icu4c/source/common/unicode/utf.h index 36191bd35e6..c9d5f5785c5 100644 --- a/icu4c/source/common/unicode/utf.h +++ b/icu4c/source/common/unicode/utf.h @@ -103,7 +103,7 @@ * code point values (0..U+10ffff). They are indicated with negative values instead. * * For more information see the ICU User Guide Strings chapter - * (http://userguide.icu-project.org/strings). + * (https://unicode-org.github.io/icu/userguide/strings). * * Usage: * ICU coding guidelines for if() statements should be followed when using these macros. diff --git a/icu4c/source/common/unicode/utf16.h b/icu4c/source/common/unicode/utf16.h index 14910e237b9..3902c60e95e 100644 --- a/icu4c/source/common/unicode/utf16.h +++ b/icu4c/source/common/unicode/utf16.h @@ -23,7 +23,7 @@ * This file defines macros to deal with 16-bit Unicode (UTF-16) code units and strings. * * For more information see utf.h and the ICU User Guide Strings chapter - * (http://userguide.icu-project.org/strings). + * (https://unicode-org.github.io/icu/userguide/strings). * * Usage: * ICU coding guidelines for if() statements should be followed when using these macros. diff --git a/icu4c/source/common/unicode/utf8.h b/icu4c/source/common/unicode/utf8.h index 57e24a61091..5a07435fcf6 100644 --- a/icu4c/source/common/unicode/utf8.h +++ b/icu4c/source/common/unicode/utf8.h @@ -23,7 +23,7 @@ * This file defines macros to deal with 8-bit Unicode (UTF-8) code units (bytes) and strings. * * For more information see utf.h and the ICU User Guide Strings chapter - * (http://userguide.icu-project.org/strings). + * (https://unicode-org.github.io/icu/userguide/strings). * * Usage: * ICU coding guidelines for if() statements should be followed when using these macros. diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index b974b3a63b9..a4cbb9e0fe8 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -148,7 +148,7 @@ * Until ICU 4.8, this was the combination of the single-digit major and minor ICU version numbers * into one string without dots ("48"). * Since ICU 49, it is the double-digit major ICU version number. - * See http://userguide.icu-project.org/design#TOC-Version-Numbers-in-ICU + * See https://unicode-org.github.io/icu/userguide/design#version-numbers-in-icu * * @stable ICU 2.6 */ diff --git a/icu4c/source/config/icu-config-bottom b/icu4c/source/config/icu-config-bottom index ddba5b3f1fe..b0e55af6e85 100644 --- a/icu4c/source/config/icu-config-bottom +++ b/icu4c/source/config/icu-config-bottom @@ -98,7 +98,7 @@ usage() echo "Copyright (c) 2002-2013, International Business Machines Corporation and others. All Rights Reserved." echo echo "NOTE: Please consider using the pkg-config (.pc) files instead of icu-config." - echo " See: " + echo " See: " } ## Check the sanity of current variables diff --git a/icu4c/source/configure b/icu4c/source/configure index dac025a3f46..274dce68f73 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1477,7 +1477,7 @@ Optional Packages: library shared library (.dll/.so/etc.) static static library (.a/.lib/etc.) auto build shared if possible (default) - See http://userguide.icu-project.org/icudata for more info. + See https://unicode-org.github.io/icu/userguide/icudata for more info. --with-library-suffix=suffix tag a suffix to the library names default= Some influential environment variables: diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac index 531dee17d1b..1796ca07555 100644 --- a/icu4c/source/configure.ac +++ b/icu4c/source/configure.ac @@ -1152,7 +1152,7 @@ AC_ARG_WITH(data-packaging, library shared library (.dll/.so/etc.) static static library (.a/.lib/etc.) auto build shared if possible (default) - See http://userguide.icu-project.org/icudata for more info.], + See https://unicode-org.github.io/icu/userguide/icudata for more info.], [case "${withval}" in files|archive|library) datapackaging=$withval ;; auto) datapackaging=$withval ;; diff --git a/icu4c/source/data/mappings/gb18030.ucm b/icu4c/source/data/mappings/gb18030.ucm index 8f5eff63d7b..62b57a93fc2 100644 --- a/icu4c/source/data/mappings/gb18030.ucm +++ b/icu4c/source/data/mappings/gb18030.ucm @@ -16,7 +16,7 @@ # Note that the entire block for the supplementary Unicode planes is # marked unassigned because they are handled algorithmically. # Similarly, some of the BMP mappings are marked as unassigned for the same reason. -# See http://userguide.icu-project.org/conversion/data#TOC-State-table-syntax-in-.ucm-files +# See https://unicode-org.github.io/icu/userguide/conversion/data#state-table-syntax-in-ucm-files # States 0..2: # Mostly assigned sequences, with branches in the lead bytes diff --git a/icu4c/source/i18n/format.cpp b/icu4c/source/i18n/format.cpp index e5abbe9eb0f..a010defff93 100644 --- a/icu4c/source/i18n/format.cpp +++ b/icu4c/source/i18n/format.cpp @@ -26,7 +26,7 @@ #include "unicode/utypes.h" #ifndef U_I18N_IMPLEMENTATION -#error U_I18N_IMPLEMENTATION not set - must be set for all ICU source files in i18n/ - see http://userguide.icu-project.org/howtouseicu +#error U_I18N_IMPLEMENTATION not set - must be set for all ICU source files in i18n/ - see https://unicode-org.github.io/icu/userguide/howtouseicu #endif /* diff --git a/icu4c/source/i18n/unicode/coll.h b/icu4c/source/i18n/unicode/coll.h index e69853167fc..c750711fc15 100644 --- a/icu4c/source/i18n/unicode/coll.h +++ b/icu4c/source/i18n/unicode/coll.h @@ -304,7 +304,7 @@ public: * Starting with ICU 54, collation attributes can be specified via locale keywords as well, * in the old locale extension syntax ("el@colCaseFirst=upper") * or in language tag syntax ("el-u-kf-upper"). - * See User Guide: Collation API. + * See User Guide: Collation API. * * The UErrorCode& err parameter is used to return status information to the user. * To check whether the construction succeeded or not, you should check @@ -788,7 +788,7 @@ public: * applications who wish to cache collators, or otherwise reuse * collators when possible. The functional equivalent may change * over time. For more information, please see the + * href="https://unicode-org.github.io/icu/userguide/locale#locales-and-services"> * Locales and Services section of the ICU User Guide. * @param keyword a particular keyword as enumerated by * ucol_getKeywords. @@ -1139,7 +1139,7 @@ public: * This string will be normalized. * The structure and the syntax of the string is defined in the "Naming collators" * section of the users guide: - * http://userguide.icu-project.org/collation/concepts#TOC-Collator-naming-scheme + * https://unicode-org.github.io/icu/userguide/collation/concepts#collator-naming-scheme * This function supports preflighting. * * This is internal, and intended to be used with delegate converters. diff --git a/icu4c/source/i18n/unicode/msgfmt.h b/icu4c/source/i18n/unicode/msgfmt.h index 5f19d3ef73c..2d9bc8f2e2b 100644 --- a/icu4c/source/i18n/unicode/msgfmt.h +++ b/icu4c/source/i18n/unicode/msgfmt.h @@ -255,7 +255,7 @@ class NumberFormat; * or preformatted values, but not pattern strings or custom format objects.

* *

For more details, see the - * ICU User Guide.

+ * ICU User Guide.

* *

Usage Information

* diff --git a/icu4c/source/i18n/unicode/numberformatter.h b/icu4c/source/i18n/unicode/numberformatter.h index b2e89458642..5316d9aca0b 100644 --- a/icu4c/source/i18n/unicode/numberformatter.h +++ b/icu4c/source/i18n/unicode/numberformatter.h @@ -1771,7 +1771,7 @@ class U_I18N_API NumberFormatterSettings { * * The default is HALF_EVEN. For more information on rounding mode, see the ICU userguide here: * - * http://userguide.icu-project.org/formatparse/numbers/rounding-modes + * https://unicode-org.github.io/icu/userguide/format_parse/numbers/rounding-modes * * @param roundingMode The rounding mode to use. * @return The fluent chain. diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h index 9fcc689c7de..61fb59d2108 100644 --- a/icu4c/source/i18n/unicode/numfmt.h +++ b/icu4c/source/i18n/unicode/numfmt.h @@ -179,7 +179,7 @@ public: * *

* For more detail on rounding modes, see: - * http://userguide.icu-project.org/formatparse/numbers/rounding-modes + * https://unicode-org.github.io/icu/userguide/format_parse/numbers/rounding-modes * * @stable ICU 2.4 */ diff --git a/icu4c/source/i18n/unicode/smpdtfmt.h b/icu4c/source/i18n/unicode/smpdtfmt.h index 54512f17aa1..3296c6b3ab7 100644 --- a/icu4c/source/i18n/unicode/smpdtfmt.h +++ b/icu4c/source/i18n/unicode/smpdtfmt.h @@ -81,7 +81,7 @@ class LocalizedNumberFormatter; * the date and time formatting algorithm and pattern letters defined by * UTS#35 * Unicode Locale Data Markup Language (LDML) and further documented for ICU in the - * ICU + * ICU * User Guide. The following pattern letters are currently available (note that the actual * values depend on CLDR and may change from the examples shown here):

* diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h index acaaccdc122..a004dd6644c 100644 --- a/icu4c/source/i18n/unicode/tblcoll.h +++ b/icu4c/source/i18n/unicode/tblcoll.h @@ -99,14 +99,14 @@ class UVector64; * table-based collation. *

* For more information about the collation service see - * the User Guide. + * the User Guide. *

* Collation service provides correct sorting orders for most locales supported in ICU. * If specific data for a locale is not available, the orders eventually falls back * to the CLDR root sort order. *

* Sort ordering may be customized by providing your own set of rules. For more on - * this subject see the + * this subject see the * Collation Customization section of the User Guide. *

* Note, RuleBasedCollator is not to be subclassed. @@ -495,7 +495,7 @@ public: * just the tailoring. * * getRules(void) should normally be used instead. - * See http://userguide.icu-project.org/collation/customization#TOC-Building-on-Existing-Locales + * See https://unicode-org.github.io/icu/userguide/collation/customization#building-on-existing-locales * @param delta one of UCOL_TAILORING_ONLY, UCOL_FULL_RULES. * @param buffer UnicodeString to store the result rules * @stable ICU 2.2 @@ -702,7 +702,7 @@ public: * This string will be normalized. * The structure and the syntax of the string is defined in the "Naming collators" * section of the users guide: - * http://userguide.icu-project.org/collation/concepts#TOC-Collator-naming-scheme + * https://unicode-org.github.io/icu/userguide/collation/concepts#collator-naming-scheme * This function supports preflighting. * * This is internal, and intended to be used with delegate converters. diff --git a/icu4c/source/i18n/unicode/timezone.h b/icu4c/source/i18n/unicode/timezone.h index 155b09585f6..f718be02a9b 100644 --- a/icu4c/source/i18n/unicode/timezone.h +++ b/icu4c/source/i18n/unicode/timezone.h @@ -403,7 +403,7 @@ public: * *

This implementation utilizes * Zone-Tzid mapping data. The mapping data is updated time to time. To get the latest changes, - * please read the ICU user guide section + * please read the ICU user guide section * Updating the Time Zone Data. * * @param id A system time zone ID. @@ -431,7 +431,7 @@ public: * *

This implementation utilizes * Zone-Tzid mapping data. The mapping data is updated time to time. To get the latest changes, - * please read the ICU user guide section + * please read the ICU user guide section * Updating the Time Zone Data. * * @param winid A Windows time zone ID. diff --git a/icu4c/source/i18n/unicode/ucal.h b/icu4c/source/i18n/unicode/ucal.h index 40b9393c09a..89b16042437 100644 --- a/icu4c/source/i18n/unicode/ucal.h +++ b/icu4c/source/i18n/unicode/ucal.h @@ -1568,7 +1568,7 @@ ucal_getTimeZoneTransitionDate(const UCalendar* cal, UTimeZoneTransitionType typ * *

This implementation utilizes * Zone-Tzid mapping data. The mapping data is updated time to time. To get the latest changes, -* please read the ICU user guide section +* please read the ICU user guide section * Updating the Time Zone Data. * * @param id A system time zone ID. @@ -1599,7 +1599,7 @@ ucal_getWindowsTimeZoneID(const UChar* id, int32_t len, * *

This implementation utilizes * Zone-Tzid mapping data. The mapping data is updated time to time. To get the latest changes, -* please read the ICU user guide section +* please read the ICU user guide section * Updating the Time Zone Data. * * @param winid A Windows time zone ID. diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h index 7e78d269b88..a01d0ae9af8 100644 --- a/icu4c/source/i18n/unicode/ucol.h +++ b/icu4c/source/i18n/unicode/ucol.h @@ -35,14 +35,14 @@ * searching and sorting routines for natural language text. *

* For more information about the collation service see - * the User Guide. + * the User Guide. *

* Collation service provides correct sorting orders for most locales supported in ICU. * If specific data for a locale is not available, the orders eventually falls back * to the CLDR root sort order. *

* Sort ordering may be customized by providing your own set of rules. For more on - * this subject see the + * this subject see the * Collation Customization section of the User Guide. *

* @see UCollationResult @@ -370,7 +370,7 @@ typedef enum { * Retrieves the "UCA rules" concatenated with the tailoring rules. * The "UCA rules" are an approximation of the root collator's sort order. * They are almost never used or useful at runtime and can be removed from the data. - * See http://userguide.icu-project.org/collation/customization#TOC-Building-on-Existing-Locales + * See https://unicode-org.github.io/icu/userguide/collation/customization#building-on-existing-locales * @stable ICU 2.0 */ UCOL_FULL_RULES @@ -384,7 +384,7 @@ typedef enum { * Starting with ICU 54, collation attributes can be specified via locale keywords as well, * in the old locale extension syntax ("el@colCaseFirst=upper") * or in language tag syntax ("el-u-kf-upper"). - * See User Guide: Collation API. + * See User Guide: Collation API. * * The UCollator pointer is used in all the calls to the Collation * service. After finished, collator must be disposed of by calling @@ -442,7 +442,7 @@ ucol_openRules( const UChar *rules, * Open a collator defined by a short form string. * The structure and the syntax of the string is defined in the "Naming collators" * section of the users guide: - * http://userguide.icu-project.org/collation/concepts#TOC-Collator-naming-scheme + * https://unicode-org.github.io/icu/userguide/collation/concepts#collator-naming-scheme * Attributes are overriden by the subsequent attributes. So, for "S2_S3", final * strength will be 3. 3066bis locale overrides individual locale parts. * The call to this function is equivalent to a call to ucol_open, followed by a @@ -904,7 +904,7 @@ ucol_getKeywordValuesForLocale(const char* key, * applications who wish to cache collators, or otherwise reuse * collators when possible. The functional equivalent may change * over time. For more information, please see the + * href="https://unicode-org.github.io/icu/userguide/locale#locales-and-services"> * Locales and Services section of the ICU User Guide. * @param result fillin for the functionally equivalent result locale * @param resultCapacity capacity of the fillin buffer @@ -945,7 +945,7 @@ ucol_getRules( const UCollator *coll, * This string will be normalized. * The structure and the syntax of the string is defined in the "Naming collators" * section of the users guide: - * http://userguide.icu-project.org/collation/concepts#TOC-Collator-naming-scheme + * https://unicode-org.github.io/icu/userguide/collation/concepts#collator-naming-scheme * This API supports preflighting. * @param coll a collator * @param locale a locale that will appear as a collators locale in the resulting @@ -1158,7 +1158,7 @@ ucol_getUCAVersion(const UCollator* coll, UVersionInfo info); * Using strings with U+FFFE may yield shorter sort keys. * * For details about Sort Key Features see - * http://userguide.icu-project.org/collation/api#TOC-Sort-Key-Features + * https://unicode-org.github.io/icu/userguide/collation/api#sort-key-features * * It is possible to merge multiple sort keys by consecutively merging * another one with the intermediate result. @@ -1354,7 +1354,7 @@ ucol_safeClone(const UCollator *coll, * to store rules, will store up to available space. * * ucol_getRules() should normally be used instead. - * See http://userguide.icu-project.org/collation/customization#TOC-Building-on-Existing-Locales + * See https://unicode-org.github.io/icu/userguide/collation/customization#building-on-existing-locales * @param coll collator to get the rules from * @param delta one of UCOL_TAILORING_ONLY, UCOL_FULL_RULES. * @param buffer buffer to store the result in. If NULL, you'll get no rules. diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h index df4259e2d30..ec25eba8085 100644 --- a/icu4c/source/i18n/unicode/udat.h +++ b/icu4c/source/i18n/unicode/udat.h @@ -146,7 +146,7 @@ * the date and time formatting algorithm and pattern letters defined by * UTS#35 * Unicode Locale Data Markup Language (LDML) and further documented for ICU in the - * ICU + * ICU * User Guide.

*/ diff --git a/icu4c/source/i18n/unicode/unum.h b/icu4c/source/i18n/unicode/unum.h index 83609a7e155..68207a9bec1 100644 --- a/icu4c/source/i18n/unicode/unum.h +++ b/icu4c/source/i18n/unicode/unum.h @@ -275,7 +275,7 @@ typedef enum UNumberFormatStyle { * *

* For more detail on rounding modes, see: - * http://userguide.icu-project.org/formatparse/numbers/rounding-modes + * https://unicode-org.github.io/icu/userguide/format_parse/numbers/rounding-modes * * @stable ICU 2.0 */ diff --git a/icu4c/source/io/ucln_io.cpp b/icu4c/source/io/ucln_io.cpp index 5cd367cfadb..c1307b5d97f 100644 --- a/icu4c/source/io/ucln_io.cpp +++ b/icu4c/source/io/ucln_io.cpp @@ -23,7 +23,7 @@ #include "uassert.h" #ifndef U_IO_IMPLEMENTATION -#error U_IO_IMPLEMENTATION not set - must be set for all ICU source files in io/ - see http://userguide.icu-project.org/howtouseicu +#error U_IO_IMPLEMENTATION not set - must be set for all ICU source files in io/ - see https://unicode-org.github.io/icu/userguide/howtouseicu #endif @@ -69,4 +69,3 @@ void ucln_io_registerCleanup(ECleanupIOType type, ucln_registerAutomaticCleanup(); #endif } - diff --git a/icu4c/source/layoutex/layout/ParagraphLayout.h b/icu4c/source/layoutex/layout/ParagraphLayout.h index 1e0a5e75528..ce3f7e54114 100644 --- a/icu4c/source/layoutex/layout/ParagraphLayout.h +++ b/icu4c/source/layoutex/layout/ParagraphLayout.h @@ -46,7 +46,7 @@ U_NAMESPACE_BEGIN * You may use this class with the HarfBuzz icu-le-hb wrapper, * see http://www.freedesktop.org/wiki/Software/HarfBuzz/ * - * See http://userguide.icu-project.org/layoutengine for special build instructions. + * See https://unicode-org.github.io/icu/userguide/layoutengine for special build instructions. */ class U_LAYOUTEX_API ParagraphLayout : public UObject { diff --git a/icu4c/source/tools/gennorm2/gennorm2.cpp b/icu4c/source/tools/gennorm2/gennorm2.cpp index bce5336be62..723e912b916 100644 --- a/icu4c/source/tools/gennorm2/gennorm2.cpp +++ b/icu4c/source/tools/gennorm2/gennorm2.cpp @@ -104,7 +104,7 @@ main(int argc, char* argv[]) { "Reads the infiles with normalization data and\n" "creates a binary file, or a C source file (--csource), with the data,\n" "or writes a data file with the combined data (--combined).\n" - "See http://userguide.icu-project.org/transforms/normalization#TOC-Data-File-Syntax\n" + "See https://unicode-org.github.io/icu/userguide/transforms/normalization#data-file-syntax\n" "\n" "Alternate usage: %s [-options] a.txt b.txt minus p.txt q.txt -o outputfilename\n" "\n" diff --git a/icu4c/source/tools/toolutil/toolutil.cpp b/icu4c/source/tools/toolutil/toolutil.cpp index 95543c630f8..9a93528e0a5 100644 --- a/icu4c/source/tools/toolutil/toolutil.cpp +++ b/icu4c/source/tools/toolutil/toolutil.cpp @@ -33,7 +33,7 @@ #include "unicode/utypes.h" #ifndef U_TOOLUTIL_IMPLEMENTATION -#error U_TOOLUTIL_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see http://userguide.icu-project.org/howtouseicu +#error U_TOOLUTIL_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see https://unicode-org.github.io/icu/userguide/howtouseicu #endif #if U_PLATFORM_USES_ONLY_WIN32_API diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java index 56afd7fc09d..021e0c6db6b 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java @@ -55,7 +55,7 @@ import com.ibm.icu.impl.coll.UVector32; * can not be compared simply by using basic arithmetic operators, * e.g. <, == or >, further processing has to be done. Details * can be found in the ICU - * + * * User Guide. An example of using the CollationElementIterator * for collation ordering comparison is the class * {@link com.ibm.icu.text.StringSearch}. diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationKey.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationKey.java index 21304c496df..203706a77ec 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationKey.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationKey.java @@ -491,7 +491,7 @@ public final class CollationKey implements Comparable * Using strings with U+FFFE may yield shorter sort keys. * *

For details about Sort Key Features see - * http://userguide.icu-project.org/collation/api#TOC-Sort-Key-Features + * https://unicode-org.github.io/icu/userguide/collation/api#sort-key-features * *

It is possible to merge multiple sort keys by consecutively merging * another one with the intermediate result. diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java index 789d77b4d2e..47d4994b7be 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java @@ -64,7 +64,7 @@ import com.ibm.icu.util.VersionInfo; * difference between large and small Kana. A tertiary difference is ignored * when there is a primary or secondary difference anywhere in the strings. *

  • QUATERNARY strength: When punctuation is ignored -* (see +* (see * Ignoring Punctuations in the User Guide) at PRIMARY to TERTIARY * strength, an additional strength level can * be used to distinguish words with and without punctuation (for example, @@ -95,7 +95,7 @@ import com.ibm.icu.util.VersionInfo; * a comparison or before getting a CollationKey. * *

    For more information about the collation service see the -* User Guide. +* User Guide. * *

    Examples of use * 

    @@ -172,7 +172,7 @@ public abstract class Collator implements Comparator, Freezable
+     * (see 
      * Ignoring Punctuation in the User Guide) at PRIMARY to TERTIARY
      * strength, an additional strength level can
      * be used to distinguish words with and without punctuation.
@@ -807,7 +807,7 @@ public abstract class Collator implements Comparator, FreezableUser Guide: Collation API.
+     * See User Guide: Collation API.
      *
      * @param locale the desired locale.
      * @return Collator for the desired locale if it is created successfully.
@@ -841,7 +841,7 @@ public abstract class Collator implements Comparator, FreezableUser Guide: Collation API.
+     * See User Guide: Collation API.
      *
      * @param locale the desired locale.
      * @return Collator for the desired locale if it is created successfully.
@@ -1056,7 +1056,7 @@ public abstract class Collator implements Comparator, Freezable
+     * href="https://unicode-org.github.io/icu/userguide/locale#locales-and-services">
      * Locales and Services section of the ICU User Guide.
      * @param keyword a particular keyword as enumerated by
      * getKeywords.
diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
index a2b56519424..a8c0033d2cb 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
@@ -50,7 +50,7 @@ import com.ibm.icu.util.VersionInfo;
  * 
    A Collator is thread-safe only when frozen. See {{@link #isFrozen()} and {@link com.ibm.icu.util.Freezable}.
  *
  * 
    
- * Users are strongly encouraged to read the User
+ * Users are strongly encouraged to read the User
  * Guide for more information about the collation service before using this class.
  *
  * 
    
@@ -67,8 +67,8 @@ import com.ibm.icu.util.VersionInfo;
  *
  * 
    
  * For information about the collation rule syntax and details about customization, please refer to the Collation customization section of the
- * User Guide.
+ * href="https://unicode-org.github.io/icu/userguide/collation/customization">Collation customization
+ * section of the User Guide.
  *
  * 
    
  * Note that there are some differences between the Collation rule syntax used in Java and ICU4J:
@@ -193,7 +193,7 @@ public final class RuleBasedCollator extends Collator {
      * The collator will be based on the CLDR root collation, with the
      * attributes and re-ordering of the characters specified in the argument rules.
      * 
    
-     * See the User Guide's section on 
+     * See the User Guide's section on 
      * Collation Customization for details on the rule syntax.
      *
      * @param rules
@@ -570,7 +570,7 @@ public final class RuleBasedCollator extends Collator {
     /**
      * Sets the mode for the direction of SECONDARY weights to be used in French collation. The default value is false,
      * which treats SECONDARY weights in the order they appear. If set to true, the SECONDARY weights will be sorted
-     * backwards. See the section on 
+     * backwards. See the section on 
      * French collation for more information.
      *
      * @param flag
@@ -619,7 +619,7 @@ public final class RuleBasedCollator extends Collator {
      * first mode. A simple way to ignore accent differences in a string is to set the strength to PRIMARY and enable
      * case level.
      * 
    
-     * See the section on case
+     * See the section on case
      * level for more information.
      *
      * @param flag
@@ -963,7 +963,7 @@ public final class RuleBasedCollator extends Collator {
      *
      * 
    The root collation rules are an approximation of the root collator's sort order.
      * They are almost never used or useful at runtime and can be removed from the data.
-     * See User Guide:
+     * See User Guide:
      * Collation Customization, Building on Existing Locales
      *
      * 
    {@link #getRules()} should normally be used instead.
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
index 5f6c365f8e6..a5484cda95a 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
@@ -225,7 +225,7 @@ public abstract class NumberFormatterSettingsIt is also possible to specify the rounding mode to use. The default rounding mode is
  * "half even", which rounds numbers to their closest increment, with ties broken in favor of
  * trailing numbers being even. For more information, see {@link #setRoundingMode} and the ICU User
- * Guide.
+ * href="https://unicode-org.github.io/icu/userguide/format_parse/numbers/rounding-modes">the ICU
+ * User Guide.
  *
  * 
    Pattern Strings
    
  *
@@ -1272,8 +1272,8 @@ public class DecimalFormat extends NumberFormat {
    * number, and rounds to the closest even number if at the midpoint.
    *
    * 
    For more detail on rounding modes, see the ICU User
-   * Guide.
+   * href="https://unicode-org.github.io/icu/userguide/format_parse/numbers/rounding-modes">the ICU
+   * User Guide.
    *
    * 
    For backwards compatibility, the rounding mode is specified as an int argument, which can be
    * from either the constants in {@link BigDecimal} or the ordinal value of {@link RoundingMode}.
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
index aeb20ffafc7..925576a7cc6 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
@@ -280,7 +280,7 @@ import com.ibm.icu.util.ULocale.Category;
  * or preformatted values, but not pattern strings or custom format objects.
    
  *
  * 
    For more details, see the
- * ICU User Guide.
    
+ * ICU User Guide.
    
  *
  * 
    Usage Information
    
  *
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java
index 5300aabe6b4..5a46e22db81 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java
@@ -1205,7 +1205,7 @@ abstract public class TimeZone implements Serializable, Cloneable, FreezableThis implementation utilizes 
      * Zone-Tzid mapping data. The mapping data is updated time to time. To get the latest changes,
-     * please read the ICU user guide section 
+     * please read the ICU user guide section 
      * Updating the Time Zone Data.
      *
      * @param id A system time zone ID
@@ -1265,7 +1265,7 @@ abstract public class TimeZone implements Serializable, Cloneable, FreezableThis implementation utilizes 
      * Zone-Tzid mapping data. The mapping data is updated time to time. To get the latest changes,
-     * please read the ICU user guide section 
+     * please read the ICU user guide section 
      * Updating the Time Zone Data.
      *
      * @param winid A Windows time zone ID
diff --git a/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/package.html b/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/package.html
index 0a45d75d493..6e74908a1b5 100644
--- a/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/package.html
+++ b/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/package.html
@@ -10,7 +10,7 @@
 
    This package includes Java Locale Service Provider implementation.
 There are no public ICU4J consumer APIs provided in this package.
 See the ICU user guide section
-ICU4J Locale Service Provider
+ICU4J Locale Service Provider
 for the details.
 
    
 
diff --git a/icu4j/readme.html b/icu4j/readme.html
index 1e27c312e18..8144ea80623 100644
--- a/icu4j/readme.html
+++ b/icu4j/readme.html
@@ -76,60 +76,60 @@ internationalization API design.
    
 
    
 
@@ -440,7 +440,7 @@ ICU4J source archive is extracted.
    • Here is an example of libraries that are frequently packaged.
    libicudata.so._XY_._Z_Data required by the Common and I18n libraries. There are many ways to package and [customize this data](http://userguide.icu-project.org/icudata), but by default this is all you need.Data required by the Common and I18n libraries. There are many ways to package and [customize this data](https://unicode-org.github.io/icu/userguide/icudata), but by default this is all you need.
    FAQ - Frequently Asked Questions about ICU http://userguide.icu-project.org/icufaq
    ICU User's Guide http://userguide.icu-project.org/
    How To Use ICUhttp://userguide.icu-project.org/howtouseicuhttps://unicode-org.github.io/icu/userguide/howtouseicu
    Data required by the Common and I18n libraries. There are many ways to package and customize this + "https://unicode-org.github.io/icu/userguide/icudata">customize this data, but by default this is all you need.

    Where to get Documentation

    -

    The ICU user's +

    The ICU user's guide contains lots of general information about ICU, in its C, C++, and Java incarnations.

    The complete API documentation for ICU4J (javadoc) is available on @@ -692,7 +692,7 @@ to the appropriate java options.

    how to configure Eclipse to build and develop ICU4J on Eclipse IDE.

    Note: To install and configure ICU4J Locale Service Provider, please refer the user guide -page ICU4J Locale +page ICU4J Locale Service Provider.

    Trying Out ICU4J

    @@ -891,7 +891,7 @@ ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in icu4c/sourc However, time zone data is frequently updated in response to changes made by local governments around the world. If you need to update the time zone data, please refer the ICU user guide topic -Updating the Time Zone Data.

    +Updating the Time Zone Data.

    You can optionally configure ICU4J date and time service classes to use underlying JDK TimeZone implementation (see the ICU4J API reference TimeZone