Skip to content

Commit 85c6bd4

Browse files
authored
Merge pull request #1471 from digital-preservation/updateDocs
Update docs
2 parents 38c5bb3 + 31cba1c commit 85c6bd4

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# DROID (Digital Record Object Identification)
22

33
[![CI](https://github.com/digital-preservation/droid/workflows/CI/badge.svg)](https://github.com/digital-preservation/droid/actions?query=workflow%3ACI)
4-
[![Coverage Status](https://coveralls.io/repos/github/digital-preservation/droid/badge.svg?branch=master)](https://coveralls.io/github/digital-preservation/droid?branch=master)
5-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/uk.gov.nationalarchives/droid/badge.svg)](https://search.maven.org/search?q=g:uk.gov.nationalarchives)
4+
[![Coverage Status](https://coveralls.io/repos/github/digital-preservation/droid/badge.svg?branch=main)](https://coveralls.io/github/digital-preservation/droid?branch=main)
5+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/uk.gov.nationalarchives/droid/badge.svg)](https://central.sonatype.com/search?q=g%3Auk.gov.nationalarchives+droid)
66

77
## General Information
88

@@ -17,9 +17,9 @@ DROID is a platform-independent Java application. It can be invoked from two int
1717

1818
DROID allows files and folders to be selected from a file system for identification. This file list can be saved at any point. After the identification process had been run, the results can be output in various report formats, including CSV.
1919

20-
DROID is made available under the [New BSD License](https://raw.github.com/digital-preservation/droid/master/license.md).
20+
DROID is made available under the [New BSD Licence](https://raw.github.com/digital-preservation/droid/master/license.md).
2121

22-
More information can be found on the [DROID github pages](https://digital-preservation.github.io/droid/).
22+
More information can be found on the [DROID GitHub pages](https://digital-preservation.github.io/droid/).
2323

2424
## Installing DROID
2525

@@ -42,23 +42,23 @@ $ droid -R directory
4242
...
4343
~~~
4444

45-
If you don't need every bit of information that DROID outputs by default you can make it print only a limited set of columns using the `-co`, or `--columns` option (note the `-a`, it's required in this case!):
45+
If you don't need every bit of information that DROID outputs by default, you can make it print only a limited set of columns using the `-co`, or `--columns` option (note the `-a`; it's required in this case!):
4646

4747
~~~console
4848
$ droid -co NAME PUID -a file.jpg
4949
"NAME","PUID"
5050
"file.jpg","fmt/1507"
5151
~~~
5252

53-
To remove even more noise from the output you can use the `-qc`, or `--quote-commas` switch which tells DROID to use quotes only where necessary:
53+
To remove even more noise from the output, you can use the `-qc`, or `--quote-commas` switch which tells DROID to use quotes only where necessary:
5454

5555
~~~console
5656
$ droid -qc -co NAME PUID -a file.jpg
5757
NAME,PUID
5858
file.jpg,fmt/1507
5959
~~~
6060

61-
Beyond these basic invocations there are many additional options for advanced tweaking of DROID's operation. To learn about them run:
61+
Beyond these basic invocations, there are many additional options for advanced tweaking of DROID's operation. To learn about them run:
6262

6363
~~~console
6464
$ droid --help
@@ -92,7 +92,7 @@ Type: Container Version: 20230822 File name: container-signature-20230822.xml
9292
Type: Container Version: 20231127 File name: container-signature-20231127.xml
9393
~~~
9494

95-
If for some reason you want to use another, possibly older signature file for identification you can change the default with the `-s`, or `--set-signature-file` option (remember to switch back to the latest version when you are done!):
95+
If for some reason you want to use another, possibly older signature file for identification, you can change the default with the `-s`, or `--set-signature-file` option (remember to switch back to the latest version when you are done!):
9696

9797
~~~console
9898
$ droid -s 114
@@ -104,21 +104,21 @@ Default signature file updated. Version: 20230822 File name: container-signatur
104104

105105
## Building DROID
106106

107-
DROID can be built from source using Maven. The source code can be obtained from the Github repository at [https://github.com/digital-preservation/droid](https://github.com/digital-preservation/droid)
107+
DROID can be built from source using Maven. The source code can be obtained from the GitHub repository at [https://github.com/digital-preservation/droid](https://github.com/digital-preservation/droid)
108108

109109
Once the code is cloned into a folder (e.g. `droid`), executing `mvn clean install` inside it will build the code. After a successful build, two archives are provided inside the `droid-binary/target` folder.
110110

111-
### Linux / OSX users
111+
### Linux / macOS users
112112

113-
You will need JAVA 8 to 17 installed to run DROID.
113+
You will need JAVA 21 installed to run DROID.
114114

115115
Unpack the archive `droid-binary-${VERSION}-bin.zip`, then use the `droid.sh` script to run the application.
116116

117117
### Windows users
118118
Archive `droid-binary-${VERSION}-bin-win64-with-jre.zip`
119119

120120

121-
You will need JAVA 8 to 17 installed to run DROID. For Windows users who might not be able to install JAVA, the provided bundle includes JAVA 17.
121+
You will need JAVA 21 installed to run DROID. For Windows users who might not be able to install JAVA, the provided bundle includes JAVA 21.
122122

123123
Unpack the archive `droid-binary-${VERSION}-bin-win64-with-jre.zip`, then use the `droid.bat` script to run the application.
124124

@@ -166,7 +166,7 @@ DROID can now put a signature directly inside a `Sequence` attribute on the `<By
166166

167167
The full syntax can be used in either binary or container signature files.
168168

169-
## Developer related guidance
169+
## Developer-related guidance
170170

171-
For any detais about contributing, testing, releasing, please check the [wiki](https://github.com/digital-preservation/droid/wiki)
171+
For any details about contributing, testing, releasing, please check the [wiki](https://github.com/digital-preservation/droid/wiki)
172172

Signature syntax.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ The signature syntax compiled into XML by PRONOM is the original syntax defined
1414

1515
Container signatures support a wider syntax than binary signatures, for example allowing whitespace and ASCII strings. For the most part, this extended syntax just makes the signatures more human readable. In a few cases some new capabilities are supported that PRONOM can't currently compile for binary signatures.
1616

17-
All of the syntax can be used in either binary or container signatures in DROID itself, but PRONOM won't be able to compile container syntax into XML for binary signatures if you want to submit them to TNA.
17+
All the syntax can be used in either binary or container signatures in DROID itself, but PRONOM won't be able to compile container syntax into XML for binary signatures if you want to submit them to TNA.
1818

1919
Container specific syntax is marked in the descriptions below.
2020

2121
### Value matching
2222
The following syntax can be used to match bytes.
2323

2424
#### Bytes: 00 FF
25-
Bytes to match are written as two digit, case insensitive hex values.
25+
Bytes to match are written as two-digit, case-insensitive hex values.
2626
```
2727
ff Fe A1 00
2828
```
@@ -42,7 +42,7 @@ A single character enclosed in single quotes can also be used as in place of a b
4242
_Note:_ due to a bug in the byteseek library, only ASCII characters are currently supported by DROID. Characters over 127 may cause incorrect compilation, as it attempts to render the characters in the system default character set, which is probably not ISO-8859-1.
4343

4444
#### Byte ranges: \[n:m]
45-
To match a byte within a range of values, we can use a byte range. This is written as two byte values separated with a colon, all enclosed in square brackets. Bytes are specified as 2 digit hex values.
45+
To match a byte within a range of values, we can use a byte range. This is written as two byte values separated with a colon, all enclosed in square brackets. Bytes are specified as 2-digit hex values.
4646
```
4747
[30:39]
4848
```
@@ -82,11 +82,11 @@ This will match all the bytes which have the 8th or 4th bit set (10001000):
8282
_Note:_ the bitmask is not a standard part of the original PRONOM syntax; it originates in the byteseek matching library used by DROID. However, it is now being used in both binary and container signatures, although older versions of DROID won't be able to parse it in binary signatures.
8383

8484
### Alternatives: (00|F0|3C)
85-
If there is a set of different values that can match, they can be specified inside round brackets, with the alternatives separated by the | character.
85+
If there is a set of different values that can match, they can be specified inside round brackets, with the alternatives separated by the `|` character.
8686
```
8787
(00|F0|3C)
8888
```
89-
Alternatives can be longer than just a single byte. In this example, three byte sequences could be matched. Alternative sequences don't have to be the same length as each other:
89+
Alternatives can be longer than just a single byte. In this example, three byte sequences could be matched. Alternative sequences don't have to be the same length as each other:
9090
```
9191
(00 01 | B0 B1 B2 | C0 C1 C2 C3)
9292
```
@@ -97,13 +97,13 @@ Older binary signatures should only use hex bytes inside alternatives. Containe
9797
```
9898

9999
#### Multi-byte sets: (00|C2|DE) or \[00 C2 DE]
100-
The standard PRONOM binary syntax only supports multi-byte sets by specifying them as a set of alternative bytes. For example:
100+
The standard PRONOM binary syntax only supports multi-byte sets by specifying them as a set of alternative bytes. For example:
101101
```
102102
(00|C2|DE)
103103
```
104104

105105
**Container signature syntax**
106-
Multi byte sets let you specify any set of bytes within square brackets. For example:
106+
Multi-byte sets let you specify any set of bytes within square brackets. For example:
107107
```
108108
[00 C2 DE]
109109
```
@@ -115,7 +115,7 @@ It can also include ranges or any other value matching syntax within the set:
115115
```
116116
[00 C2 DE 'A'-'Z' &01]
117117
```
118-
Strings can be used to specify particular byte values. Note that the string itself doesn't match - the set matches any of the characters in the string:
118+
Strings can be used to specify particular byte values. Note that the string itself doesn't match - the set matches any of the characters in the string:
119119
```
120120
['A'-'Z' 'aeiou']
121121
```
@@ -130,23 +130,23 @@ To match any byte, we can use two question marks:
130130
```
131131

132132
#### Unlimited gaps *
133-
To specify that there's a unlimited gap between two parts of an expression (subject to how far DROID is configured to actually scan or the end of the data, whichever comes first), we can write an asterisk.
133+
To specify that there's an unlimited gap between two parts of an expression (subject to how far DROID is configured to actually scan or the end of the data, whichever comes first), we can add an asterisk.
134134

135135
The following expression will first match _30 31 23 33 4E_, and it will then search for _43 2A B1 D4 CC EF_ until the end of the data:
136136
```
137137
30 31 23 33 4E * 43 2A B1 D4 CC EF
138138
```
139139

140140
#### Fixed gaps {n}
141-
To specify that there's a gap of one or more bytes we don't care about, we can write the size of the gap as a decimal number, surrounded by curly brackets:
141+
To specify that there's a gap of one or more bytes we don't care about, we can write the size of the gap as a decimal number, surrounded by curly braces:
142142
```
143143
01 02 03 {128} FF FE
144144
```
145145

146146
Note that writing _{1}_ is equivalent to writing _??_.
147147

148148
#### Variable gaps {n-m}
149-
To specify that there's a range of possible bytes we don't care about, we can write the range as two numbers separted by a hyphen, surrounded by curly brackets:
149+
To specify that there's a range of possible bytes we don't care about, we can write the range as two numbers separated by a hyphen, surrounded by curly braces:
150150
```
151151
01 02 03 {128-256} FF FE
152152
```

0 commit comments

Comments
 (0)