diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index ad8d55daf7d..0e0a18b2c96 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -367,7 +367,7 @@ Examples:
#### Searching people by any field: `find`
-You can find all `Persons` based on a search term after the label and display them as a list using the `find` command.
+You can find all persons based on a search term after the label and display them as a list using the `find` command.
Format: `find n/NAME...` or `find p/PHONE...` or `find e/EMAIL...` or `find a/ADDRESS...` or `find t/TAG_NAME...` or `find w/WEDDING_NAME...` or `find tk/TASK_NAME...`
@@ -409,36 +409,36 @@ To create a tag, type `create-tag` followed by the name of the tag.
* Tags are unique in WedLinker, there would not be any duplicated Tags.
* Multiple contacts can share the same tag.
* Tags are case-insensitive, so you cannot have both a 'hotel manager' and 'Hotel Manager' tag
-* If you want to create a Tag with a long name, it might not be shown clearly in the list.
-We recommend keeping names of Tags to a maximum of 50 characters long.
-You can use [list-tags](#listing-all-tags--list-tags-or-ltags) instead for better visuals.
Examples:
* To create a tag named `Florist`, enter the command:
* `create-tag t/Florist`
-> [!TIP]
-> To display a list of all the tags that have been created, you can use the [list-tags](#listing-all-tags--list-tags-or-ltags) command.
-
Caution:
- Tags with single or multiple spaces in their names are considered distinct and treated as separate tags. For example:
- Venue IC vs. Venue IC
+- If you want to create a Tag with a long name, it might not be shown clearly in the list.
+We recommend keeping names of Tags to a maximum of 50 characters long.
+You can use [list-tags](#listing-all-tags--list-tags-or-ltags) instead for better visuals.
+
+
#### Assigning tag to contact : `tag`
-Use the `tag` command when you want to assign a tag to a specific contact in WedLinker.
+You can assign a tag to a specific person in WedLinker by using the `tag` command.
Format: `tag PERSON_NUMBER t/TAG_NAME... [f/]`
To assign a tag to a contact, type `tag` followed by the positional number of the person in the contact list and the name of the tag.
* The `PERSON_NUMBER` **must be a positive integer** 1, 2, 3, ….
-* The `Tag` must exists in WedLinker before it can be assigned.
+* The `Tag` must exist in WedLinker before it can be assigned.
* If the `Tag` does not exist, you can use the label `f/` to force the creation and assignment of the `Tag`.
Examples:
@@ -450,7 +450,7 @@ Examples:
-- Force-tagging a person with extraneous input will cause those extraneous inputs to be ignored. For example:
+- Force-tagging a person with extra input will cause those extra inputs to be ignored. For example:
- `tag 1 f/ RandomWord t/Tag1` will cause `RandomWord` to be ignored.
+
#### Unassigning tag from contacts : `untag`
-Use the `untag command` when you want to remove a tag from a specific contact in WedLinker.
+You can remove a tag from a specific person in WedLinker by using the `untag` command.
Format: `untag PERSON_NUMBER t/TAG_NAME...`
To remove a tag from a contact, type `untag` followed by the positional number of the person in the contact list and the name of the tag.
* The `PERSON_NUMBER` **must be a positive integer** 1, 2, 3, ….
-* `TAG_NAME` is case-insensitive.
+* `TAG_NAME` is case-sensitive unlike other tag commands so if person 2 is tagged with the tag Hotel Manager, only entering the command `untag 2 t/Hotel Manager`
+ will remove the tag from person 2 and `untag 2 t/hotel manager` will not.
Examples:
* To remove the tag named `Florist` from the first person in the list, enter the command:
* `untag 1 t/Florist`
-**Known issue:** the untag command is case-sensitive, so if person 2 is tagged with the tag Hotel Manager, only entering the command `untag 2 t/Hotel Manager`
-will remove the tag from person 2 and `untag 2 t/hotel manager` will not.
+
-### Deleting a tag : `delete-tag` or `dtag`
+#### Deleting a tag : `delete-tag` or `dtag`
-Use the `delete-tag` command to delete a tag you no longer have a use for.
+You can delete a tag you no longer use in WedLinker by using the `delete-tag` command.
Format: `delete-tag t/TAG_NAME [f/]` or `dtag t/TAG_NAME [f/]`
@@ -491,7 +493,7 @@ To delete a tag from WedLinker, type `delete-tag` followed by the name of the ta
* `TAG_NAME` is case-insensitive.
* The `Tag` must exist in WedLinker.
-* The `Tag` cannot be assigned to any contacts.
+* The `Tag` cannot be assigned to any contacts after it is deleted.
* If the `Tag` is currently in use, you can use `f/` to force its deletion and remove the tag from all contacts.
Examples:
@@ -505,69 +507,73 @@ Examples:
#### Adding a Wedding : `create-wedding` or `cw`
-Use the `create-wedding` command to create a Wedding within WedLinker that can be linked to contacts.
+You can create a Wedding within WedLinker that can be linked to contacts by using the `create-wedding` command.
Format: `create-wedding w/WEDDING_NAME` or `cw w/WEDDING_NAME`
To create a `Wedding`, type `create-wedding` followed by the name of the wedding.
-* The `WEDDING_NAME` should only contain alphanumeric characters, spaces or the following characters: / . , ' & : ( )
+* The `WEDDING_NAME` should only contain letters, numbers, spaces or the following characters: / . , ' & : ( )
* `WEDDING_NAME` is case-insensitive.
* Weddings are unique in WedLinker, there would not be any duplicated Weddings.
-* Contacts can be assigned to the Wedding using the [assign-wedding](#assigning-contact-to-a-wedding--assign-wedding-or-asw) command.
-* If you want to create a Wedding with a long name, it might not be shown clearly in the list.
- We recommend keeping names of Weddings to a maximum of 50 characters long.
- You can use [list-weddings](#listing-all-weddings--list-weddings-or-lw) instead for better visuals.
Examples:
* To create a Wedding named `Wedding 1`, enter the command:
* `create-wedding w/Wedding 1`
-* Contacts can be assigned to the Wedding using the [assign-wedding](#assign-contact-to-a-wedding-assign-wedding) command.
Caution:
-
- Weddings with single or multiple spaces in their names are considered distinct and treated as separate weddings. For example:
- O'Hare's Wedding vs. O'Hare's Wedding
+- If you want to create a Wedding with a long name, it might not be shown clearly in the list.
+We recommend keeping names of Weddings to a maximum of 50 characters long.
+You can use [list-weddings](#listing-all-weddings--list-weddings-or-lw) instead for better visuals.
+
#### Assigning contact to one or more Weddings : `assign-wedding` or `asw`
-Use the `assign-wedding` command to assign a contact to one or more Weddings.
+You can assign a person to one or more Weddings by using the `assign-wedding` command.
Format: `assign-wedding PERSON_NUMBER w/WEDDING_NAME… [p1/] [p2/] [f/]` or `asw PERSON_NUMBER w/WEDDING_NAME… [p1/] [p2/] [f/]`
-To assign a contact to one or more `Weddings`, type `assign-wedding`, followed by the positional number of the person in the contact list and the name(s) of the wedding(s).
+To assign a person to one or more `Weddings`, type `assign-wedding`, followed by the positional number of the person in the person list and the name(s) of the wedding(s).
* `WEDDING_NAME` is case-insensitive.
* The `PERSON_NUMBER` **must be a positive integer** 1, 2, 3, ….
* The `Wedding` must exists in WedLinker before it can be assigned.
* If the `Wedding` does not exist, you can use `f/` to force its creation and assignment to the contact.
* Assigning with the optional `p1/` or `p2/` keywords will set that contact as Partner 1 or Partner 2 of the wedding respectively.
+* When you use this function with both `p1/` and `p2/`, WedLinker will default to assigning the person as the first partner.
Examples:
* To assign the Wedding named `Wedding 1` to the third person in the contact list, enter the command:
* `assign-wedding 3 w/Wedding 1`
+* To assign the Weddings named Wedding 3 to the second person as the first partner in the wedding, and the wedding Amanda's Wedding to the second person as a guest, enter the command:
+ * `assign-wedding 2 w/Wedding 3 p1/ w/Amanda's Wedding`
-**Known Issues:** When you use this function with both `p1/` and `p2/`, WedLinker will default to assigning the person as the first partner.
+
#### Editing Wedding details : `edit-wedding` or `ew`
-Use the `edit-wedding` command to edit details of a Wedding, such as the Wedding name and Address.
+You can edit details of a Wedding, such as the Wedding name and Address by using the `edit-wedding` command.
Format: `edit-wedding WEDDING_NUMBER [a/ADDRESS] [d/DATE]` or `ew WEDDING_NUMBER [a/ADDRESS] [d/DATE]`
-To edit the details of a `Wedding`, enter the command [list-weddings](#listing-all-weddings-list-weddings) to identify the Wedding number in the `Wedding` list.
-Following that, type "edit-wedding" followed by the Wedding number enter the details you wish to edit and the name of the wedding.
+To edit the details of a `Wedding`, enter the command [list-weddings](#listing-all-weddings--list-weddings-or-lw) to identify the Wedding number in the `Wedding` list.
+Following that, type "edit-wedding" followed by the Wedding number and the details you wish to edit.
* The WEDDING_NUMBER **must be a positive integer** 1, 2, 3, ….
* Existing values in the specified fields will be overwritten with the specified values.
* Date must be in "YYYY-MM-DD" format.
+Examples:
+
-The PERSON_TASK_NUMBER corresponds to each task's position within a contact's assigned tasks. +The PERSON_TASK_NUMBER corresponds to each Task's position within a Person's assigned tasks.
-* In this example, the PERSON_TASK_NUMBER 3 for the first person refers to the task with the description "Send invitations", and the command `unassign-task 1 3` will remove the "Send invitations" task from the contact with `PERSON_NUMBER` 1, which is "Alex Yeoh". +* In this example, the PERSON_TASK_NUMBER 3 for the first Person refers to the Task with the description "Send invitations", and the command `unassign-task 1 3` will remove the "Send invitations" Task from the Person with `PERSON_NUMBER` 1, which is "Alex Yeoh". Examples: * To remove the tasks with the descriptions `Buy cake` and `Finalise itinerary` from the first person in the contact list: * First, identify the assigned Task numbers of the two tasks assigned to the person * Should the assigned Task numbers be 2 and 3, enter the command: `unassign-task 1 2 3` -### Marking a task as completed : `mark-task` or `mtask` +