Skip to content

Commit 9070f0f

Browse files
Address feedback and comments
Adds updates and fixes wrt. feedback and comments provided by @johnmhoran Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent f491f1a commit 9070f0f

29 files changed

+172
-167
lines changed

README.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Check out the code at https://github.com/nexB/scancode-toolkit
1313
Discover also:
1414

1515
- The ScanCode.io server project here: https://scancodeio.readthedocs.io
16-
- The scancode-workbench project for visualization of scancode results data:
16+
- The ScanCode Workbench project for visualization of scancode results data:
1717
https://github.com/nexB/scancode-workbench
1818
- Other companion SCA projects for code origin, license and security analysis
1919
here: https://aboutcode.org
@@ -70,8 +70,8 @@ Why use ScanCode?
7070
companion `ScanCode.io web app <https://github.com/nexB/scancode.io>`_
7171
to organize and store multiple scan projects including scripted scanning pipelines.
7272

73-
- Scancode output data can be easily visualized and analysed using the
74-
`scancode-workbench <https://github.com/nexB/scancode-workbench >`_ desktop app.
73+
- ScanCode output data can be easily visualized and analysed using the
74+
`ScanCode Workbench <https://github.com/nexB/scancode-workbench>`_ desktop app.
7575

7676
- ScanCode is **actively maintained**, has a **growing users and contributors
7777
community**.
@@ -107,11 +107,11 @@ Documentation
107107
The ScanCode documentation is hosted at
108108
`scancode-toolkit.readthedocs.io <https://scancode-toolkit.readthedocs.io/en/latest/>`_.
109109

110-
If you are new to Scancode, start with our
110+
If you are new to visualization of scancode results data, start with our
111111
`newcomer <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/newcomer.html>`_ page.
112112

113-
If you want to compare output changes between different versions of Scancode,
114-
or want to look at scans generated by Scancode, review our
113+
If you want to compare output changes between different versions of ScanCode,
114+
or want to look at scans generated by ScanCode, review our
115115
`reference scans <https://github.com/nexB/scancode-toolkit-reference-scans>`_.
116116

117117
Other Important Documentation Pages:
@@ -165,13 +165,13 @@ There are a few common ways to `install ScanCode <https://scancode-toolkit.readt
165165
Quick Start
166166
===========
167167

168-
After scancode is installed successfully you can run an example scan printed on screen as JSON::
168+
After ScanCode is installed successfully you can run an example scan printed on screen as JSON::
169169

170170
scancode -clip --json-pp - samples
171171

172172
Follow the `How to Run a Scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_run_a_scan.html>`_
173173
tutorial to perform a basic scan on the ``samples`` directory distributed by
174-
default with Scancode.
174+
default with ScanCode.
175175

176176
See more command examples::
177177

@@ -215,7 +215,7 @@ For discussions and chats, we have:
215215
* an official Gitter channel for `web-based chats
216216
<https://matrix.to/#/#aboutcode-org_discuss:gitter.im>`_.
217217
Gitter is now accessible through `Element <https://element.io/download>`_
218-
or an `IRC bridge <https://irc.gitter.im/>`_.
218+
or an `IRC bridge <https://matrix-org.github.io/matrix-appservice-irc/latest/usage.html>`_.
219219
There are other AboutCode project-specific channels available there too.
220220

221221
* The discussion channel for `scancode <https://matrix.to/#/#aboutcode-org_scancode:gitter.im>`_

docs/source/cli-reference/basic-options.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787
License: Apache-2.0
8888

89-
If we run license detection (with --license-text) on the above text we get the following
89+
If we run license detection (with ``--license-text``) on the above text we get the following
9090
result for the resource attributes added by the license detection::
9191

9292
{
@@ -121,7 +121,7 @@
121121
}
122122

123123
We also have top level unique license detections with the same identifier
124-
referencing all occurances of this license detection and counts::
124+
referencing all occurrences of this license detection and counts::
125125

126126
{
127127
"license_detections": [
@@ -670,7 +670,7 @@
670670
[`MIT`](https://opensource.org/licenses/MIT).
671671

672672
If we run a license scan with the ``--license-diagnostics`` option enabled,
673-
we have to following license detection results::
673+
we have the following license detection results::
674674

675675
{
676676
"path": "README.md",
@@ -746,7 +746,7 @@
746746
}
747747

748748
Here from the ``"detection_log": ["unknown-intro-followed-by-match"]`` added diagnostics
749-
information we get to know that there was a unknown intro license match, followed by
750-
proper detections, so we concluded the unknown intro to be a introduction to the
751-
following license and hence concluded the license from the license matches after the
749+
information we learn that there was an unknown intro license match, followed by
750+
proper detections, so we conclude the unknown intro to be an introduction to the
751+
following license and hence conclude the license from the license matches after the
752752
unknown detection.

docs/source/cli-reference/help-text-options.rst

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ To see the help text from the Terminal, execute the following command::
2424

2525
$ scancode --help
2626

27-
The Following Help Text is displayed, i.e. This is the help text for Scancode Version 32.0.0::
27+
The Following Help Text is displayed, i.e. This is the help text for Scancode Version 32.0.0:
28+
29+
.. code-block:: none
2830
2931
Usage: scancode [OPTIONS] <OUTPUT FORMAT OPTION(s)> <input>...
3032
@@ -49,25 +51,25 @@ The Following Help Text is displayed, i.e. This is the help text for Scancode Ve
4951
-u, --url Scan <input> for urls.
5052
5153
scan options:
52-
--license-diagnostics In license detections, include diagnostic details
54+
--license-diagnostics In license detections, include diagnostic details
5355
to figure out the license detection post
5456
processing steps applied.
55-
--license-score INTEGER Do not return license matches with a score lower
57+
--license-score INTEGER Do not return license matches with a score lower
5658
than this score. A number between 0 and 100.
5759
[default: 0]
58-
--license-text Include the detected licenses matched text.
59-
--license-text-diagnostics In the matched license text, include diagnostic
60+
--license-text Include the detected licenses matched text.
61+
--license-text-diagnostics In the matched license text, include diagnostic
6062
highlights surrounding with square brackets []
6163
words that are not matched.
62-
--license-url-template TEXT Set the template URL used for the license
64+
--license-url-template TEXT Set the template URL used for the license
6365
reference URLs. Curly braces ({}) are replaced by
6466
the license key. [default: https://scancode-
6567
licensedb.aboutcode.org/{}]
66-
--max-email INT Report only up to INT emails found in a file. Use
68+
--max-email INT Report only up to INT emails found in a file. Use
6769
0 for no limit. [default: 50]
68-
--max-url INT Report only up to INT urls found in a file. Use 0
70+
--max-url INT Report only up to INT urls found in a file. Use 0
6971
for no limit. [default: 50]
70-
--unknown-licenses [EXPERIMENTAL] Detect unknown licenses.
72+
--unknown-licenses [EXPERIMENTAL] Detect unknown licenses.
7173
7274
output formats:
7375
--json FILE Write scan output as compact JSON to FILE.
@@ -89,25 +91,24 @@ The Following Help Text is displayed, i.e. This is the help text for Scancode Ve
8991
--cyclonedx-xml FILE Write scan output in CycloneDX XML format to FILE.
9092
--spdx-rdf FILE Write scan output as SPDX RDF to FILE.
9193
--spdx-tv FILE Write scan output as SPDX Tag/Value to FILE.
92-
--html-app FILE (DEPRECATED: use the ScanCode Workbench app instead )
94+
--html-app FILE (DEPRECATED: use the ScanCode Workbench app instead)
9395
Write scan output as a mini HTML application to FILE.
9496
9597
output filters:
96-
--ignore-author <pattern> Ignore a file (and all its findings) if an
97-
author contains a match to the <pattern>
98-
regular expression. Note that this will ignore
99-
a file even if it has other findings such as a
100-
license or errors.
101-
--ignore-copyright-holder <pattern>
102-
Ignore a file (and all its findings) if a
103-
copyright holder contains a match to the
104-
<pattern> regular expression. Note that this
105-
will ignore a file even if it has other
106-
scanned data such as a license or errors.
107-
--only-findings Only return files or directories with findings
108-
for the requested scans. Files and directories
109-
without findings are omitted (file information
110-
is not treated as findings).
98+
--ignore-author <pattern> Ignore a file (and all its findings) if an
99+
author contains a match to the <pattern>
100+
regular expression. Note that this will ignore
101+
a file even if it has other findings such as a
102+
license or errors.
103+
--ignore-copyright-holder <pattern> Ignore a file (and all its findings) if a
104+
copyright holder contains a match to the
105+
<pattern> regular expression. Note that this
106+
will ignore a file even if it has other
107+
scanned data such as a license or errors.
108+
--only-findings Only return files or directories with findings
109+
for the requested scans. Files and directories
110+
without findings are omitted (file information
111+
is not treated as findings).
111112
112113
output control:
113114
--full-root Report full, absolute paths.
@@ -118,65 +119,65 @@ The Following Help Text is displayed, i.e. This is the help text for Scancode Ve
118119
pre-scan:
119120
--ignore <pattern> Ignore files matching <pattern>.
120121
--include <pattern> Include files matching <pattern>.
121-
--classify Classify files with flags telling if the file is a
122-
legal, or readme or test file, etc.
122+
--classify Classify files with flags indicating whether the file is a
123+
legal, readme, test or similar file.
123124
--facet <facet>=<pattern> Add the <facet> to files with a path matching
124-
<pattern>.
125+
<pattern>.
125126
126127
post-scan:
127128
--consolidate Group resources by Packages or license and copyright
128-
holder and return those groupings as a list of
129-
consolidated packages and a list of consolidated
130-
components. This requires the scan to have/be run
131-
with the copyright, license, and package options
132-
active
129+
holder and return those groupings as a list of
130+
consolidated packages and a list of consolidated
131+
components. This requires the scan to have/be run
132+
with the copyright, license, and package options
133+
active
133134
--filter-clues Filter redundant duplicated clues already contained
134-
in detected license and copyright texts and notices.
135+
in detected license and copyright texts and notices.
135136
--license-clarity-score Compute a summary license clarity score at the
136-
codebase level.
137+
codebase level.
137138
--license-policy FILE Load a License Policy file and apply it to the scan
138-
at the Resource level.
139+
at the Resource level.
139140
--license-references Return reference data for all licenses and license
140-
rulespresent in detections.
141+
rules present in detections.
141142
--mark-source Set the "is_source" to true for directories that
142-
contain over 90% of source files as children and
143-
descendants. Count the number of source files in a
144-
directory as a new source_file_counts attribute
143+
contain over 90% of source files as children and
144+
descendants. Count the number of source files in a
145+
directory as a new source_file_counts attribute
145146
--summary Summarize scans by providing declared origin
146-
information and other detected origin info at the
147-
codebase attribute level.
147+
information and other detected origin info at the
148+
codebase attribute level.
148149
--tallies Compute tallies for license, copyright and other
149-
scans at the codebase level.
150+
scans at the codebase level.
150151
--tallies-by-facet Compute tallies for license, copyright and other
151-
scans and group the results by facet.
152+
scans and group the results by facet.
152153
--tallies-key-files Compute tallies for license, copyright and other
153-
scans for key, top-level files. Key files are top-
154-
level codebase files such as COPYING, README and
155-
package manifests as reported by the --classify
156-
option "is_legal", "is_readme", "is_manifest" and
157-
"is_top_level" flags.
154+
scans for key, top-level files. Key files are top-
155+
level codebase files such as COPYING, README and
156+
package manifests as reported by the --classify
157+
option "is_legal", "is_readme", "is_manifest" and
158+
"is_top_level" flags.
158159
--tallies-with-details Compute tallies of license, copyright and other scans
159-
at the codebase level, keeping intermediate details
160-
at the file and directory level.
160+
at the codebase level, keeping intermediate details
161+
at the file and directory level.
161162
162163
core:
163-
--timeout <seconds> Stop an unfinished file scan after a timeout in
164+
--timeout <seconds> Stop an unfinished file scan after a timeout in
164165
seconds. [default: 120 seconds]
165-
-n, --processes INT Set the number of parallel processes to use. Disable
166+
-n, --processes INT Set the number of parallel processes to use. Disable
166167
parallel processing if 0. Also disable threading if
167168
-1. [default: 1]
168-
-q, --quiet Do not print summary or progress.
169-
-v, --verbose Print progress as file-by-file path instead of a
169+
-q, --quiet Do not print summary or progress.
170+
-v, --verbose Print progress as file-by-file path instead of a
170171
progress bar. Print verbose scan counters.
171-
--from-json Load codebase from one or more <input> JSON scan
172+
--from-json Load codebase from one or more <input> JSON scan
172173
file(s).
173-
--max-in-memory INTEGER Maximum number of files and directories scan details
174+
--max-in-memory INTEGER Maximum number of files and directories scan details
174175
kept in memory during a scan. Additional files and
175176
directories scan details above this number are cached
176177
on-disk rather than in memory. Use 0 to use unlimited
177178
memory and disable on-disk caching. Use -1 to use
178179
only on-disk caching. [default: 10000]
179-
--max-depth INTEGER Maximum nesting depth of subdirectories to scan.
180+
--max-depth INTEGER Maximum nesting depth of subdirectories to scan.
180181
Descend at most INTEGER levels of directories below
181182
and including the starting directory. Use 0 for no
182183
scan depth limit.
@@ -203,7 +204,7 @@ The Following Help Text is displayed, i.e. This is the help text for Scancode Ve
203204
204205
scancode --json-pp - --license --package samples
205206
206-
Note: when you run scancode, a progress bar is displayed with a counter of the
207+
Note: when you run ScanCode, a progress bar is displayed with a counter of the
207208
number of files processed. Use --verbose to display file-by-file progress.
208209
209210
.. _cli_examples_text:
@@ -383,7 +384,8 @@ The Following Text is displayed, i.e. This is the available plugins for Scancode
383384
required_plugins:
384385
options:
385386
help_group: output formats, name: html_app: --html-app
386-
help: (DEPRECATED: use the ScanCode Workbench app instead ) Write scan output as a mini HTML application to FILE.
387+
help: (DEPRECATED: use the ScanCode Workbench app instead)
388+
Write scan output as a mini HTML application to FILE.
387389
doc:
388390
Write scan output as a mini HTML application.
389391

0 commit comments

Comments
 (0)