From 5e92073ea35480eaa6b0f09f6af2b721bb743e8d Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 07:58:06 +0800 Subject: [PATCH 01/13] Fixed #4434 - Changed "Scancode" to "ScanCode" Signed-off-by: Chin Yeung Li --- docs/source/reference/available_package_parsers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/reference/available_package_parsers.rst b/docs/source/reference/available_package_parsers.rst index bdeacf4924..3fe2cbe706 100644 --- a/docs/source/reference/available_package_parsers.rst +++ b/docs/source/reference/available_package_parsers.rst @@ -5,7 +5,7 @@ Supported package manifests and package datafiles ------------------------------------------------- -Scancode supports a wide variety of package manifests, lockfiles +ScanCode supports a wide variety of package manifests, lockfiles and other package datafiles containing package and dependency information. From 763c60155c279e4b2286943c4d920febbd05cf74 Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 10:34:17 +0800 Subject: [PATCH 02/13] Fixed #4446 - Corrected non-clickable link Signed-off-by: Chin Yeung Li --- docs/source/getting-started/newcomer.rst | 2 +- docs/source/rst_snippets/extract.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/getting-started/newcomer.rst b/docs/source/getting-started/newcomer.rst index ffd1b9d70b..3f988e97c7 100644 --- a/docs/source/getting-started/newcomer.rst +++ b/docs/source/getting-started/newcomer.rst @@ -90,7 +90,7 @@ Once you are all set up with ScanCode-Toolkit, i.e. Running ``scancode -h`` show #. Refer :ref:`synopsis_quickstart` for commonly used scan commands, and commonly used :ref:`synopsis_output`. (The recommended output format is ``JSON``) -#. Refer `this section `_ for Extractcode Options. +#. Refer :ref:`extractcpde_options` for the use of ExtractCode. #. :ref:`how_to_run_a_scan` is a sample tutorial for absolute beginners, to walk them through the process of running a scan. Follow this tutorial and perform a scan on the ``sample`` folder diff --git a/docs/source/rst_snippets/extract.rst b/docs/source/rst_snippets/extract.rst index 59d3b337ab..ef3fdedde2 100644 --- a/docs/source/rst_snippets/extract.rst +++ b/docs/source/rst_snippets/extract.rst @@ -1,3 +1,5 @@ +.. _extractcpde_options: + All Extractcode Options ----------------------- From 0c435c9ef128c59c94914a6c6133e651dd32657c Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 10:42:49 +0800 Subject: [PATCH 03/13] Fixed #4444 - Remove the duplicated installation content This section can be removed, as the installation guide is already covered in getting-started/install.html. Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/synopsis.rst | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index c3845f1095..de625dd829 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -7,26 +7,11 @@ ScanCode detects licenses, copyrights, package manifests and direct dependencies in source code and binary files, by scanning the files. This page introduces you to the ScanCode Toolkit Command Line Interface in the following sections: -- Installation - Quickstart - Type of Options - Output Formats - Other Important Documentation -.. _syn_install: - -Installation ------------- - -Scancode-Toolkit installation can be done by downloading ScanCode as an application, which -is recommended generally. For users who wish to use ScanCode as a library, it can be -installed via ``pip``, the default Python Package Manager. Refer the following sections for -detailed Instructions on the each of the Installation Methods. - -- :ref:`app_install` -- :ref:`pip_install` -- :ref:`source_code_install` - .. _synopsis_quickstart: From cd4574f77c2a0275c3ff631e2b7bf0109642df09 Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 11:05:57 +0800 Subject: [PATCH 04/13] Fixed #4445 - Added reference links to the TOC and the Scan Output Options page within the 'Output Formats' section. Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/synopsis.rst | 16 ++++++++++------ .../rst_snippets/output_format_options.rst | 2 ++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index de625dd829..8174a7ad1e 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -7,10 +7,10 @@ ScanCode detects licenses, copyrights, package manifests and direct dependencies in source code and binary files, by scanning the files. This page introduces you to the ScanCode Toolkit Command Line Interface in the following sections: -- Quickstart -- Type of Options -- Output Formats -- Other Important Documentation +- :ref:`synopsis_quickstart` +- :ref:`scancode_cli_options` +- :ref:`synopsis_output` +- :ref:`other_imp_doc` .. _synopsis_quickstart: @@ -79,8 +79,10 @@ Line Options listed under each section. Output Formats -------------- -The output file format is set by using the various output options. The recommended output format -is JSON. If ``--json`` is used, the entire file being in one line, without whitespace characters. +The output file format is set by using the various output options. See +:ref:`scan_output_options`. The recommended output format is JSON. If +``--json`` is used, the entire file being in one line, without whitespace +characters. The following example scans will show you how to run a scan with each of the result formats. For the scans, we will use the ``samples`` directory provided with the ScanCode Toolkit. @@ -286,4 +288,6 @@ file. When the scan is done, open ``samples.html`` in your web browser. .. image:: data/scancode-toolkit-static-html1.png .. image:: data/scancode-toolkit-static-html2.png +.. _other_imp_doc: + .. include:: /rst_snippets/other_imp_doc.rst diff --git a/docs/source/rst_snippets/output_format_options.rst b/docs/source/rst_snippets/output_format_options.rst index 859a7608f6..85c85a503a 100644 --- a/docs/source/rst_snippets/output_format_options.rst +++ b/docs/source/rst_snippets/output_format_options.rst @@ -1,3 +1,5 @@ +.. _scan_output_options: + All Scan Output Options ----------------------- From 2cb09ae5fd8ef552cf4b946555fa6c665e1baaad Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 11:35:23 +0800 Subject: [PATCH 05/13] Fixed #4443 - Added wording to clarify the differences between `--json` and `--json-pp` Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/synopsis.rst | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index 8174a7ad1e..31d7865512 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -80,12 +80,18 @@ Output Formats -------------- The output file format is set by using the various output options. See -:ref:`scan_output_options`. The recommended output format is JSON. If -``--json`` is used, the entire file being in one line, without whitespace -characters. +:ref:`scan_output_options`. The recommended output format is JSON. + +If ``--json`` is used, the entire file being in one line, without +whitespace characters. If ``--json-pp`` is used, the output is in a +pretty-printed JSON format—structured with indentation and line breaks to +make it more human-readable, rather than compressed into a single line. + +The following example scans will show you how to run a scan with each of +the result formats. For the scans, we will use the ``samples`` directory +provided with the ScanCode-Toolkit, along with the ``--json-pp`` output +option. -The following example scans will show you how to run a scan with each of the result formats. For -the scans, we will use the ``samples`` directory provided with the ScanCode Toolkit. .. include:: /rst_snippets/tip_snippets/stdout.rst From 114468c07d60d8fb1766e5006dd647e5747de20e Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 12:56:40 +0800 Subject: [PATCH 06/13] Fixed #4440 - Added reference for "Git" under the "Installation via Docker" section Signed-off-by: Chin Yeung Li --- docs/source/getting-started/install.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/getting-started/install.rst b/docs/source/getting-started/install.rst index ed6ff44861..30e6a8547c 100644 --- a/docs/source/getting-started/install.rst +++ b/docs/source/getting-started/install.rst @@ -274,8 +274,9 @@ The prerequisite is a working `docker installation `_ installed:: + + git clone https://github.com/aboutcode-org/scancode-toolkit.git Build the Docker image From a0576b52e07272b201d0ce0026dbbe613b94e66b Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 13:41:35 +0800 Subject: [PATCH 07/13] Update "ScanCode Toolkit" to "ScanCode-Toolkit" Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/output-format.rst | 2 +- docs/source/cli-reference/scan-options-post.rst | 2 +- docs/source/cli-reference/synopsis.rst | 2 +- docs/source/getting-started/home.rst | 2 +- docs/source/getting-started/install.rst | 6 +++--- docs/source/getting-started/newcomer.rst | 14 +++++++------- .../how-to-guides/install_new_license_plugin.rst | 4 ++-- docs/source/index.rst | 8 ++++---- docs/source/misc/support.rst | 2 +- docs/source/tutorials/how_to_extract_archives.rst | 2 +- .../how_to_set_what_will_be_detected_in_a_scan.rst | 2 +- .../tutorials/how_to_visualize_scan_results.rst | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/source/cli-reference/output-format.rst b/docs/source/cli-reference/output-format.rst index 753d45aa52..bda76e4554 100644 --- a/docs/source/cli-reference/output-format.rst +++ b/docs/source/cli-reference/output-format.rst @@ -199,7 +199,7 @@ following options. "scan_errors": [] }, - This is the recommended Output option for ScanCode Toolkit. + This is the recommended Output option for ScanCode-Toolkit. ---- diff --git a/docs/source/cli-reference/scan-options-post.rst b/docs/source/cli-reference/scan-options-post.rst index 195ce5bdac..fdca3ccdd0 100644 --- a/docs/source/cli-reference/scan-options-post.rst +++ b/docs/source/cli-reference/scan-options-post.rst @@ -53,7 +53,7 @@ To see all plugins available via command line help, use ``--plugins``. .. note:: The ``--consolidate`` option will be deprecated in a future version of - ScanCode Toolkit as top level packages, dependencies and licenses + ScanCode-Toolkit as top level packages, dependencies and licenses now provide improved consolidated data. The JSON file containing scan results after using the ``--consolidate`` Plugin is structured as diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index 31d7865512..a0faf26aae 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -62,7 +62,7 @@ throughout the documentation. Type of Options --------------- -ScanCode Toolkit Command Line options can be divided into these major sections: +ScanCode-Toolkit Command Line options can be divided into these major sections: - :ref:`cli_basic` - :ref:`Extractcode Options ` diff --git a/docs/source/getting-started/home.rst b/docs/source/getting-started/home.rst index c32b697928..23813d9a62 100644 --- a/docs/source/getting-started/home.rst +++ b/docs/source/getting-started/home.rst @@ -41,7 +41,7 @@ most advanced open source and commercial tools available today for Software Composition Analysis. -What does ScanCode Toolkit do? +What does ScanCode-Toolkit do? ------------------------------ ScanCode detects and normalizes origin, dependencies, licensing and other diff --git a/docs/source/getting-started/install.rst b/docs/source/getting-started/install.rst index 30e6a8547c..25b33168a9 100644 --- a/docs/source/getting-started/install.rst +++ b/docs/source/getting-started/install.rst @@ -125,7 +125,7 @@ ScanCode needs a Python 3.9+ interpreter; We support all Python versions from Installation as an Application: Downloading Releases ----------------------------------------------------- -Get the ScanCode Toolkit tarball archive of a specific version and your +Get the ScanCode-Toolkit tarball archive of a specific version and your operating system by going to the `project releases page `_ For example, Version 30.0.1 archive can be obtained from @@ -267,7 +267,7 @@ Un-installation Installation via Docker: ------------------------ -You can install ScanCode Toolkit by building a Docker image from the included Dockerfile. +You can install ScanCode-Toolkit by building a Docker image from the included Dockerfile. The prerequisite is a working `docker installation `_. @@ -318,7 +318,7 @@ those after will be forwarded to scancode. Installation from Source Code: Git Clone ----------------------------------------- -You can download the ScanCode Toolkit Source Code and build from it yourself. +You can download the ScanCode-Toolkit Source Code and build from it yourself. This is what you would want to do it if: - You are developing ScanCode or adding new patches or want to run tests. diff --git a/docs/source/getting-started/newcomer.rst b/docs/source/getting-started/newcomer.rst index 3f988e97c7..a937abb375 100644 --- a/docs/source/getting-started/newcomer.rst +++ b/docs/source/getting-started/newcomer.rst @@ -38,10 +38,10 @@ Table of Contents .. _newcomer_try_scancode: -Try ScanCode Toolkit +Try ScanCode-Toolkit -------------------- -This section is about using the ScanCode Toolkit, i.e. Performing a scan on a codebase/files to +This section is about using the ScanCode-Toolkit, i.e. Performing a scan on a codebase/files to determine their license, copyrights and other information, according to your requirements. #. The :ref:`newcomer_scan_codebase` section helps you with configuring your virtual environment, @@ -142,7 +142,7 @@ ScanCode Versions .. _newcomer_learn_scancode: -Learn more about ScanCode Toolkit +Learn more about ScanCode-Toolkit --------------------------------- Here we give an introduction on the ScanCode-Toolkit Documentation Sections that can help you to @@ -153,7 +153,7 @@ learn more about ScanCode-Toolkit. CLI Reference ^^^^^^^^^^^^^ -This section contains a complete guide to ScanCode Toolkit Command Line options, i.e. What the +This section contains a complete guide to ScanCode-Toolkit Command Line options, i.e. What the command-line options are, how different options affect the scan and outputs, how to use these options and examples of their use cases. @@ -179,7 +179,7 @@ This section has documentation on :ref:`explain_how_scancode_works`. Plugins ^^^^^^^ -Plugins are an integral part of ScanCode Toolkit in the sense they are used to easily extend +Plugins are an integral part of ScanCode-Toolkit in the sense they are used to easily extend ScanCode capabilities, and developers can code their own plugins according to their requirements. This section has documentation on: @@ -215,7 +215,7 @@ If you haven't contributed to ScanCode-Toolkit refer :ref:`newcomer_good_first_i To determine where to contribute, you can refer: -#. ScanCode Toolkit tracks issues via the `GitHub Issue tracker `_ +#. ScanCode-Toolkit tracks issues via the `GitHub Issue tracker `_ #. Broad `milestones `_ for upcoming versions are also maintained. And documentation related to contributing code can be referred at :ref:`contrib_code_dev`. @@ -266,7 +266,7 @@ You can contribute to the following Open Issues on documentation. #. `First Timers Only Issues List `_ #. `Documentation Inconsistencies Tracker `_ -#. `ScanCode Toolkit Documentation Roadmap `_ +#. `ScanCode-Toolkit Documentation Roadmap `_ #. `Issues with label Documentation `_ .. note:: diff --git a/docs/source/how-to-guides/install_new_license_plugin.rst b/docs/source/how-to-guides/install_new_license_plugin.rst index 59bfc9a726..1fc7201771 100644 --- a/docs/source/how-to-guides/install_new_license_plugin.rst +++ b/docs/source/how-to-guides/install_new_license_plugin.rst @@ -40,7 +40,7 @@ Entry points definition in ``setup.py`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ First, in ``setup.py``, you must provide an entry point called ``scancode_location_provider``. -This allows ScanCode Toolkit to discover the plugin and use it in license detection. +This allows ScanCode-Toolkit to discover the plugin and use it in license detection. Here is the definition of ``entry_points`` in ``setup.py``:: entry_points={ @@ -51,7 +51,7 @@ Here is the definition of ``entry_points`` in ``setup.py``:: The ``scancode_location_provider`` entry point maps to a list with information about the plugin. The variable ``licenses_to_install1`` is the name of the entry point. All entry point names -**must** start with the prefix ``licenses``, or else ScanCode Toolkit will not use them in +**must** start with the prefix ``licenses``, or else ScanCode-Toolkit will not use them in license detection. Directory structure diff --git a/docs/source/index.rst b/docs/source/index.rst index 81c474f0fc..0527a2c2ee 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,9 +1,9 @@ -ScanCode Toolkit Documentation +ScanCode-Toolkit Documentation ============================== -Welcome to ScanCode Toolkit Documentation! +Welcome to ScanCode-Toolkit Documentation! -If you are new to ScanCode Toolkit, start here: +If you are new to ScanCode-Toolkit, start here: .. toctree:: :maxdepth: 2 @@ -100,7 +100,7 @@ Reference Documents -------------------- Reference documents provide reference pages for technical reference information -about ScanCode Toolkit, including how it works and supported features. +about ScanCode-Toolkit, including how it works and supported features. .. toctree:: :maxdepth: 2 diff --git a/docs/source/misc/support.rst b/docs/source/misc/support.rst index 40dee1ba0e..e1781f1b71 100644 --- a/docs/source/misc/support.rst +++ b/docs/source/misc/support.rst @@ -24,5 +24,5 @@ Join the conversation Join our `general chatroom `_ to chat with aboutcode community members, and if you want to talk to users and developers of -ScanCode Toolkit, use `scancode room `_ +ScanCode-Toolkit, use `scancode room `_ diff --git a/docs/source/tutorials/how_to_extract_archives.rst b/docs/source/tutorials/how_to_extract_archives.rst index 244a2eeead..2cf1a2f3b6 100644 --- a/docs/source/tutorials/how_to_extract_archives.rst +++ b/docs/source/tutorials/how_to_extract_archives.rst @@ -3,7 +3,7 @@ How To Extract Archives ======================= -ScanCode Toolkit provides archive extraction. This command can be used before running a scan over +ScanCode-Toolkit provides archive extraction. This command can be used before running a scan over a codebase in order to ensure all archives are extracted. Archives found inside an extracted archive are extracted recursively. Extraction is done in-place in a directory and named after the archive with ``'-extract'`` appended. diff --git a/docs/source/tutorials/how_to_set_what_will_be_detected_in_a_scan.rst b/docs/source/tutorials/how_to_set_what_will_be_detected_in_a_scan.rst index c4a73f6856..4c572f04e3 100644 --- a/docs/source/tutorials/how_to_set_what_will_be_detected_in_a_scan.rst +++ b/docs/source/tutorials/how_to_set_what_will_be_detected_in_a_scan.rst @@ -5,7 +5,7 @@ How to set what will be detected in Scan ScanCode allows you to scan a codebase for license, copyright and other interesting information that can be discovered in files. The following options are available for detection when using -ScanCode Toolkit: +ScanCode-Toolkit: .. include:: /rst_snippets/basic_options.rst diff --git a/docs/source/tutorials/how_to_visualize_scan_results.rst b/docs/source/tutorials/how_to_visualize_scan_results.rst index b5b57841f8..97cf774e37 100644 --- a/docs/source/tutorials/how_to_visualize_scan_results.rst +++ b/docs/source/tutorials/how_to_visualize_scan_results.rst @@ -9,7 +9,7 @@ Detailed Installation and Usage guide can be found here - :ref:`scancode-workbe .. WARNING:: - This tutorial uses the 32.x version of ScanCode-Toolkit, and ScanCode Workbench 4.0.x (This version of ScanCode Workbench is compatible with scans from any ScanCode Toolkit develop + This tutorial uses the 32.x version of ScanCode-Toolkit, and ScanCode Workbench 4.0.x (This version of ScanCode Workbench is compatible with scans from any ScanCode-Toolkit develop version/branch at or after v32.x). If you are using an older version of ScanCode-Toolkit, check respective versions of this documentation. Also refer the ScanCode Workbench `release highlights `_. From 855c5288a35113ce232baccd2ece1dcd7b151ef3 Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Thu, 26 Jun 2025 15:29:57 +0800 Subject: [PATCH 08/13] Corrected typo Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/synopsis.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index a0faf26aae..c8f490db4f 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -98,7 +98,7 @@ option. JSON file output ^^^^^^^^^^^^^^^^ -Scan the ``samples`` directory and save the scan to a JSON file (pretty-printed)::: +Scan the ``samples`` directory and save the scan to a JSON file (pretty-printed):: scancode -clpieu --json-pp output.json samples From 9014a1206a4b26b294124f4235c88d325c21d9f1 Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Fri, 27 Jun 2025 07:38:20 +0800 Subject: [PATCH 09/13] Fixed #4437 - Remove the needed for virtualenv Signed-off-by: Chin Yeung Li --- docs/source/getting-started/newcomer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/getting-started/newcomer.rst b/docs/source/getting-started/newcomer.rst index a937abb375..db169c74c7 100644 --- a/docs/source/getting-started/newcomer.rst +++ b/docs/source/getting-started/newcomer.rst @@ -58,8 +58,8 @@ determine their license, copyrights and other information, according to your req Before you start using ScanCode ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#. You need to make sure :ref:`install_prerequisites` are installed, and a `virtualenv `_ - is created. There are a few different ways to install ScanCode: +#. You need to make sure :ref:`install_prerequisites` are installed. There + are a few different ways to install ScanCode: - :ref:`app_install` [Recommended for newcomers] - :ref:`docker_install` From 95111107ddef8b7fe8ef3e25f08df1f0f78213bf Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Fri, 27 Jun 2025 15:19:51 +0800 Subject: [PATCH 10/13] Fixed #2485 - Fixed the format in the integration section. Signed-off-by: Chin Yeung Li --- docs/source/misc/faq.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/misc/faq.rst b/docs/source/misc/faq.rst index ba6606deb9..7c3c396619 100644 --- a/docs/source/misc/faq.rst +++ b/docs/source/misc/faq.rst @@ -56,12 +56,12 @@ integration with my system to trigger the license check and to use the result? In terms of API, there are two stable entry points: -#. The JSON output when you use it as a command line tool from any language or -when you call the scancode.cli.scancode function from a Python script. +- The JSON output when you use it as a command line tool from any language + or when you call the scancode.cli.scancode function from a Python script. -#. Otherwise the scancode.cli.api module provides a simple function if you are -only interested in calling a certain service on a given file (such as license -detection or copyright detection) +- Otherwise the scancode.cli.api module provides a simple function if you + are only interested in calling a certain service on a given file (such as + license detection or copyright detection) Can I install ScanCode in a Unicode path? From 553a26b8b6b8f2783d93e0c5b6a68d89cdab1f28 Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Fri, 27 Jun 2025 17:33:09 +0800 Subject: [PATCH 11/13] Correct CI Documentation check Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/synopsis.rst | 3 ++- docs/source/getting-started/newcomer.rst | 2 +- docs/source/rst_snippets/extract.rst | 2 -- docs/source/rst_snippets/output_format_options.rst | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index c8f490db4f..494251be54 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -80,7 +80,8 @@ Output Formats -------------- The output file format is set by using the various output options. See -:ref:`scan_output_options`. The recommended output format is JSON. +:doc:`../rst_snippets/output_format_options` . The recommended output +format is JSON. If ``--json`` is used, the entire file being in one line, without whitespace characters. If ``--json-pp`` is used, the output is in a diff --git a/docs/source/getting-started/newcomer.rst b/docs/source/getting-started/newcomer.rst index db169c74c7..3c20cb2d0f 100644 --- a/docs/source/getting-started/newcomer.rst +++ b/docs/source/getting-started/newcomer.rst @@ -90,7 +90,7 @@ Once you are all set up with ScanCode-Toolkit, i.e. Running ``scancode -h`` show #. Refer :ref:`synopsis_quickstart` for commonly used scan commands, and commonly used :ref:`synopsis_output`. (The recommended output format is ``JSON``) -#. Refer :ref:`extractcpde_options` for the use of ExtractCode. +#. Refer :doc:`../rst_snippets/extract` for the use of ExtractCode. #. :ref:`how_to_run_a_scan` is a sample tutorial for absolute beginners, to walk them through the process of running a scan. Follow this tutorial and perform a scan on the ``sample`` folder diff --git a/docs/source/rst_snippets/extract.rst b/docs/source/rst_snippets/extract.rst index ef3fdedde2..59d3b337ab 100644 --- a/docs/source/rst_snippets/extract.rst +++ b/docs/source/rst_snippets/extract.rst @@ -1,5 +1,3 @@ -.. _extractcpde_options: - All Extractcode Options ----------------------- diff --git a/docs/source/rst_snippets/output_format_options.rst b/docs/source/rst_snippets/output_format_options.rst index 85c85a503a..859a7608f6 100644 --- a/docs/source/rst_snippets/output_format_options.rst +++ b/docs/source/rst_snippets/output_format_options.rst @@ -1,5 +1,3 @@ -.. _scan_output_options: - All Scan Output Options ----------------------- From 5c53e7be2171596d549f27d0fd25b3d3fd699a4f Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Wed, 2 Jul 2025 15:08:06 +0800 Subject: [PATCH 12/13] Fixed #1330 - Update doc to reference `--license-text` is not compatiable with `--csv` output Signed-off-by: Chin Yeung Li --- docs/source/cli-reference/basic-options.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/source/cli-reference/basic-options.rst b/docs/source/cli-reference/basic-options.rst index 313e888558..961dff7021 100644 --- a/docs/source/cli-reference/basic-options.rst +++ b/docs/source/cli-reference/basic-options.rst @@ -538,6 +538,12 @@ The option ``--license-text-diagnostics`` is a sub-option of ``--license-text``. + .. admonition:: Attention + + The option ``--license-text`` will not work with the ``--csv`` + output as outputting full license texts in a CSV file doesn't serve + a practical purpose. + With the ``--license-text`` option, the scan results attribute "matched text" includes the matched text for the detected license. From 32672dcac93152761affab79cefe09c82788d4bd Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Fri, 4 Jul 2025 20:04:30 +0530 Subject: [PATCH 13/13] Restore install references to synopsis Signed-off-by: Ayan Sinha Mahapatra --- docs/source/cli-reference/synopsis.rst | 16 ++++++++++++++++ docs/source/getting-started/newcomer.rst | 1 + 2 files changed, 17 insertions(+) diff --git a/docs/source/cli-reference/synopsis.rst b/docs/source/cli-reference/synopsis.rst index 494251be54..ea211e966a 100644 --- a/docs/source/cli-reference/synopsis.rst +++ b/docs/source/cli-reference/synopsis.rst @@ -7,11 +7,27 @@ ScanCode detects licenses, copyrights, package manifests and direct dependencies in source code and binary files, by scanning the files. This page introduces you to the ScanCode Toolkit Command Line Interface in the following sections: +- :ref:`syn_install` - :ref:`synopsis_quickstart` - :ref:`scancode_cli_options` - :ref:`synopsis_output` - :ref:`other_imp_doc` +.. _syn_install: + +Installation +------------ + +Scancode-Toolkit installation can be done by downloading ScanCode as an application, which +is recommended generally. For users who wish to use ScanCode as a library, it can be +installed via ``pip``, the default Python Package Manager. Refer the following sections for +detailed Instructions on the each of the Installation Methods. + +- :ref:`app_install` +- :ref:`pip_install` +- :ref:`source_code_install` +- :ref:`docker_install` +- :ref:`fedora_install` .. _synopsis_quickstart: diff --git a/docs/source/getting-started/newcomer.rst b/docs/source/getting-started/newcomer.rst index 3c20cb2d0f..b62d242bae 100644 --- a/docs/source/getting-started/newcomer.rst +++ b/docs/source/getting-started/newcomer.rst @@ -65,6 +65,7 @@ Before you start using ScanCode - :ref:`docker_install` - :ref:`pip_install` - :ref:`source_code_install` +- :ref:`fedora_install` #. Run ``scancode -h`` to make sure ScanCode was installed properly.