diff --git a/bindings/java/doxygen/datasources.dox b/bindings/java/doxygen/datasources.dox
index 103121e75d2854e15c2bc657f02f765eed8adf59..882596cadb2a8c0932a696bc4f3f0c7eb32aded4 100644
--- a/bindings/java/doxygen/datasources.dox
+++ b/bindings/java/doxygen/datasources.dox
@@ -4,29 +4,29 @@
This page outlines some of the core concepts around data sources and how they are organized.
\section ds_ds Data Sources
-A org.sleuthkit.datamodel.DataSource represents a set of data that is added to a case. Example data sources include:
+A org.sleuthkit.datamodel.DataSource represents a set of data that has been added to a case. Examples of data sources include:
- A disk or phone image
- A set of logical files
- A report from another forensics tool
-The case database and objects are organized in, generally, a tree structure. The data sources are often the set of top-most items in the tree.
-You can call org.sleuthkit.datamodel.SleuthkitCase.getDataSources() to get all of the ones in a case. From there you can call getChildren() to recursively go from, for example, the disk image to volumes, to file systems, to files and subfolders.
+The objects in the case database are generally organized in a tree structure. The data sources are often the set of top-most items in the tree.
+You can call org.sleuthkit.datamodel.SleuthkitCase.getDataSources() to get all of data sources in a case. From there you can call getChildren() to go down the tree. For example, you can go from the disk image to volumes, then to file systems, and finally to files and subfolders.
You can add data sources by various SleuthkitCase methods, such as org.sleuthkit.datamodel.SleuthkitCase.makeAddImageProcess().
\section ds_hosts Hosts
-All data sources must be associated with a org.sleuthkit.datamodel.Host. A host represents the device that the data source came from. Some hosts will have only a single data source, such as for a computer with one hard drive. Others may have multiple, such as a phone with an image of the handset and another image of a media card.
+All data sources must be associated with a org.sleuthkit.datamodel.Host. A host represents the device that the data source came from. Some hosts will have only a single data source, for example when analyzing a computer with one hard drive. Other hosts may have multiple data sources, for example when analyzing a phone with an image of the handset and another image of a media card.
-If you later learn that two data soures are from the same device, you can merge the hosts.
+If you later learn that two data sources are from the same device, you can merge the hosts.
Hosts are managed from org.sleuthkit.datamodel.HostManager.
-NOTE: Hosts are different from org.sleuthkit.datamodel.HostAddress. A Host is for devices that were seized and added to the case. A HostAddress is for an address to any external host that was found during the analysis of a data source. For example, a HostAddress for "www.sleuthkit.org" could be created based on web history artifacts.
+NOTE: Hosts are different from org.sleuthkit.datamodel.HostAddress. A Host is for devices that were seized and added to the case. A HostAddress is for an address of any external host that was found during the analysis of a data source. For example, a HostAddress for "www.sleuthkit.org" could be created based on web history artifacts.
\section ds_person Persons
-You can optionally associate a host with a org.sleuthkit.datamodel.Person. This can allow you to more easily organize data in a large case. The concept is that you have a data source becuase it is owned or used by a given person. You can group that person's data sources together.
+You can optionally associate a host with a org.sleuthkit.datamodel.Person. This can allow you to more easily organize data in a large case. The concept is that you have multiple data sources representing different devices that are all owned or used by a given person. You can group that person's data sources together.
Persons are managed from org.sleuthkit.datamodel.PersonManager.
diff --git a/bindings/java/doxygen/os_accounts.dox b/bindings/java/doxygen/os_accounts.dox
index 9b6625d1707d3e31a4640b90d8effeb1ae1e76ca..b83c2e5a565a05c40dfea6ab0b3bd5ed4823063c 100644
--- a/bindings/java/doxygen/os_accounts.dox
+++ b/bindings/java/doxygen/os_accounts.dox
@@ -4,44 +4,45 @@
This page outlines some of the core concepts around OS Accounts and Realms and how they are stored.
OS Accounts are unique data types in the TSK datamodel and have more complexity than other types because
-we often may not fully understand the details at various times in the processing.
+we often will not fully understand the details when creating the OS Accounts early in the processing and will
+need to update them at various points as analysis continues.
\section os_acct_basics Basic Terminology
-- An OS account allows a person to do some action or access some resource on a device.
-- A realm is the scope wherein the OS Account is defined. A realm can be scoped to a single host (i.e. for accounts that exist only on a single host) or to a network domain (such as Windows domain accounts).
+- An <b>OS Account</b> allows a person to do some action or access some resource on a device.
+- A <b>realm</b> is the scope wherein the OS Account is defined. A realm can be scoped to a single host (i.e., for accounts that exist only on a single host) or to a network domain (such as Windows domain accounts).
\section os_acct_challenges OS Account Challenges
-A key challenge with OS Accounts is that we do not know the account information until we have started to parse files and OS configuration files. Or, we may never know the details if we have only a media card.
+A key challenge with OS Accounts is that we do not know the account information until we have started to parse files, and the more detailed information will only come from OS configuration files. It is also possible that we may never know the details if we have only a media card.
As a user adds a disk image to the case, we may learn about addresses from the files. But, we won't yet know the account name or if it is domain-scoped or local-scoped. So, the basic properties of the realm and account may change as more data is ingested and analyzed. This could even result in needing to merge realms and accounts.
-Another difference with other data types in the TSK data model is that OS Accounts may span multiple data sources if they are domain accounts. Therefore, they are not "children" of a data source. They exist outside of the usual tree model in TSK.
+Another difference with other data types in the TSK data model is that OS Accounts may span multiple data sources if they are domain accounts. Therefore, they are not "children" of a data source and exist outside of the usual tree model in TSK.
\section os_acct_realm OS Account Realms
-An org.sleuthkit.datamodel.OsAccountRealm represents the scope of a set of OS Accounts. It's scope is defined by org.sleuthkit.datamodel.OsAccountRealm.RealmScope. By default, the scope is set to host-level and a org.sleuthkit.datamodel.OsAccountRealm.ScopeConfidence of inferred. As more is learned, the confidence and scope can be made more specific.
+An org.sleuthkit.datamodel.OsAccountRealm represents the scope of a set of OS Accounts. A realm's scope is defined by org.sleuthkit.datamodel.OsAccountRealm.RealmScope. By default, the scope is set to host-level and the org.sleuthkit.datamodel.OsAccountRealm.ScopeConfidence is set to inferred. As more is learned, the confidence and scope can be made more specific.
A realm has two core fields:
-- Address that the OS uses internally, such as part of a Windows SID.
+- Address that the OS uses internally, such as part of a Windows SID
- Name that is what users more often see
-When searching for realms, the address has priority over the name. Often times with Windows systems, we may have a realm address from SIDs, but not a specific realm name.
+When searching for realms, the address has priority over the name. Often times with Windows systems, we may have a realm address from SIDs but not a specific realm name.
Realms are managed by org.sleuthkit.datamodel.OsAccountRealmManager.
\section os_acct_acct OS Accounts
-An org.sleuthkit.datamodel.OsAccount represents an account that was configured into an operating system. It must be defined within the scope of an OsAccountRealm.
+An org.sleuthkit.datamodel.OsAccount represents an account that was configured in an operating system. It must be defined within the scope of an OsAccountRealm.
-It has two core fields:
+An Os Account has two core fields:
- Login name that the user enters (such as jdoe)
-- Address that the OS uses internally (such as a UID of 0 or a Windows SID)
+- Address that the operating system uses internally (such as a UID of 0 or a Windows SID)
-OS Accounts also have other properties, such as full name, creation date, etc. that can be set after it is creaated.
+OS Accounts also have other properties, such as full name, creation date, etc. that can be set after it is created.
OS Accounts are managed by org.sleuthkit.datamodel.OsAccountManager.
@@ -51,37 +52,41 @@ At this point, APIs exist for only Windows accounts, such as:
- org.sleuthkit.datamodel.OsAccountManager.newWindowsOsAccount()
- org.sleuthkit.datamodel.OsAccountManager.getWindowsOsAccount()
-In the future, additional methods will be created for other OSes.
+In the future, additional methods will be created for other operating systems.
-The underlying database schema supports other OSes, but the utility APIs do not exist to populate them other than with Windows SIDs.
+The underlying database schema supports other operating systems, but the utility APIs do not exist to populate them other than with Windows SIDs.
\section os_account_storing Storing Original Account Data
-We recommend that the OS account addresses or names that were parsed from the data source are saved alongside any references to OsAccount objects. For example, the TSK database stores the UID or SID that was stored in a file system for a file in addition to the reference to the OsAccount object that is associated with that address. This helps to ensure the original data is preserved in case an OsAccount can't be created, gets deleted, or incorrectly merged.
+We recommend that the OS Account addresses or names that were parsed from the data source are saved alongside any references to OsAccount objects. For example, the TSK database stores the UID or SID that was stored in a file system for a file in addition to the reference to the OsAccount object that is associated with that address. This helps to ensure the original data is preserved in case an OsAccount can't be created, gets deleted, or is incorrectly merged.
\section os_acct_example Example Creation & Update Code
There are three unique elements to creating and updating OS Accounts when adding data to the case database:
-1) You cannot create or update OS accounts in a multi-step org.sleuthkit.datamodel.SleuthkitCase.CaseDbTransaction. To avoid duplicates accross multiple node systems, you need to insert and update in a single step. If you have a transaction open while creating accounts, the database will likely go into a deadlock in single-user cases because the thread can not have two connections at the same time.
+<ol>
+<li>You cannot create or update OS accounts in a multi-step org.sleuthkit.datamodel.SleuthkitCase.CaseDbTransaction. To avoid duplicates across multiple node systems, you need to insert and update in a single step. If you have a transaction open while creating accounts, the database will likely go into a deadlock in single-user cases because the thread can not have two connections at the same time.
This means that if you are using CaseDbTransation to add a lot of files or artifacts, you'll need to:
-- Pre-process the data to identify what accounts you need to find references to
-- See if the OS Accounts already exist and update or make new ones
-- Add the files and artifacts with refrences to the OsAccounts
+<ol type="a">
+<li>Pre-process the data to identify what accounts you need to find references to
+<li>See if the OS Accounts already exist and update or make new ones
+<li>Add the files and artifacts with references to the OsAccounts
+</ol>
-2) You need to check if you have more information than what is already stored (i.e. maybe the realm name was unknown).
+<li>You need to check if you have more information than what is already stored (e.g., maybe the realm name was unknown).
-3) You need to record that an OS Account was refrenced on a given data source because OS Accounts are stored in parallel to data sources and are not children of them.
+<li>You need to record that an OS Account was referenced on a given data source because OS Accounts are stored in parallel to data sources and are not children of them.
+</ol>
Here are some examples.
\subsection os_acct_ex_get Adding a File or Data Artifact
-If you pass in an OsAccount to the various methods to add files and data artifacts, then the DB will make the association and record the occurance. All you need to do is get the account. You can do that with org.sleuthkit.datamodel.OsAccountManager.getWindowsOsAccount(). Note that sometimes that call will fail if the SID associated with the file is for a group, such as what happens when the OS Account has admin rights.
+If you pass in an OsAccount to the various methods to add files and data artifacts, then the database will make the association and record the occurence. All you need to do is get the account. You can do that with org.sleuthkit.datamodel.OsAccountManager.getWindowsOsAccount(). Note that sometimes that call will fail if the SID associated with the file is for a group, for example, if the OS Account has admin rights.
-If you get an OsAccount, you can try to upate it if you think you may have new information.
+If you get an OsAccount, you can try to update it if you think you may have new information.
Here is example pseudo-code:
@@ -107,9 +112,9 @@ catch (NotUserSIDException ex) {
\subsection os_acct_ex_update Parsing OS Configuration Data
-When parsing the Windows registry or other OS Configuration file you may find updated information about OS Accounts. You can call various org.sleuthkit.datamodel.OsAccountManager methods to get and update the accounts. When adding extended attributes, you can choose to limit the scope of the attribute to the single host being parsed or domain-level.
+When parsing the Windows registry or other OS Configuration file, you may find updated information about OS Accounts. You can call various org.sleuthkit.datamodel.OsAccountManager methods to get and update the accounts. When adding extended attributes, you can choose to limit the scope of the attribute to the single host being parsed or domain-level.
-You should make sure to call org.sleuthkit.datamodel.OsAccountManager.newOsAccountInstance() to ensure it is recorded that there was at least some reference to account on that data source. Otherwise, it will no be associated with it unless there were also files or artifacts that were mapped to it.
+You should make sure to call org.sleuthkit.datamodel.OsAccountManager.newOsAccountInstance() to ensure it is recorded that there was at least some reference to account on that data source. Otherwise, it will not be associated with the data source unless there were also files or artifacts that were mapped to the OS Account.
*/
diff --git a/bindings/java/doxygen/schema/db_schema_9_0.dox b/bindings/java/doxygen/schema/db_schema_9_0.dox
index 28be7c5c5b93f7f37740b4ca1f19643b46000084..64580bb0c1492c2722fabda558599eeabe437d9c 100644
--- a/bindings/java/doxygen/schema/db_schema_9_0.dox
+++ b/bindings/java/doxygen/schema/db_schema_9_0.dox
@@ -23,7 +23,7 @@ Some general notes on this schema:
# Schema Information
-This was a big change. Tables were added to support analsis results, OS accounts, Hosts & Person strcture of data sources, and host addresses (IPs, DNS, etc.). It has a major version change because there are new Content enum types (OsAccount and HostAddress).
+This was a big change. Tables were added to support analsis results, OS accounts, Hosts & Person strcture of data sources, and host addresses (IPs, DNS, etc.). It has a major version change because there are new Content enum types (OsAccount and HostAddress). More information on how to use these new objects can be found on the \ref mod_dspage and \ref mod_os_accounts_page pages.
<ul>
<li><b>Autopsy versions: </b> Autopsy 4.19