Merge pull request #4211 from foundryvtt/wiki/fixes

[#4037] Various wiki fixes

wiki/Activity-Type-Attack.md

@@ -7,7 +7,7 @@ The Attack activity allows for making attacks and rolling damage.
 
 Using the attack activity will place an attack card into the chat log, with "Attack" and "Damage" buttons (assuming damage has been defined for the attack, otherwise only the "Attack" button will appear). Clicking on these buttons will open the standard rolling prompts.
 
-![Attack Card & Dialogs](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/enchantment/attack-chat-dialog.jpg)
+![Attack Card & Dialogs](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/attack-chat-dialog.jpg)
 
 When making an attack with a weapon, a few additional options may appear in the attack roll dialog:
 - *Ammunition*: For weapons with the Ammunition property, the ammunition used with the attack will be selectable. This ammo will add a bonus to the attack roll if it has a magical bonus and bonuses to the subsequent damage rolled using the same attack card
@@ -19,13 +19,13 @@ When making an attack with a weapon, a few additional options may appear in the
 
 After creating the Attack activity the configuration sheet will open on the "Identity" tab. In addition to the standard activity options (see the [Activities Overview](Activities.md) for more details), Attack also includes a pair of properties for defining the attack type. *Attack Type* indicates whether this is a melee or ranged attack, and *Attack Classification* indicates whether it is a weapon, spell, or unarmed attack. These values affect what bonuses are applied to attack and damage rolls from the actor. If possible, these values will be populated by default values from the containing item.
 
-![Attack Sheet - Identity Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/attack-identity.jpg)
+![Attack Sheet - Identity Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/attack-identity.jpg)
 
 ### Attack Details & Damage
 
 The "Effect" tab contains the rest of the unique properties for the Attack activity, split into sections defining attack and damage details.
 
-![Attack Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/attack-effect.jpg)
+![Attack Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/attack-effect.jpg)
 
 The "Attack Details" section contains values used to calculate the attack roll itself:
 - *Attack Ability*: Ability used to make the attack and available as `@mod` in damage formulas

wiki/Activity-Type-Check.md

@@ -7,13 +7,13 @@ The Check activity allows for calling for ability checks including those that us
 
 When the check activity is used it will place buttons in chat for each of the checks defined in the activity.
 
-![Check Chat Card](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/check-card.jpg)
+![Check Chat Card](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/check-card.jpg)
 
 ## Configuring Checks
 
 After creating the Check activity the configuration sheet will open. Navigate over to the "Effect" tab to see options specific to the Check activity.
 
-![Check Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/check-effect.jpg)
+![Check Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/check-effect.jpg)
 
 The "Check Details" section contains values used to determine what kind of checks are rolled and what the target DC is:
 - *Associated Skills or Tools*: One or more skills or tools to create checks for. If left blank, then a single ability check will be created instead

wiki/Activity-Type-Damage.md

@@ -5,7 +5,7 @@ The Damage activity allows for rolling damage.
 
 ## Configuring Damage
 
-![Damage Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/damage-effect.jpg)
+![Damage Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/damage-effect.jpg)
 
 After creating the Damage activity the configuration sheet will open. Navigate over to the "Effect" tab to see the Damage-specific details plus the actual damage parts:
 - *Allow Critical*: Allow critical damage to be rolled

wiki/Activity-Type-Heal.md

@@ -5,6 +5,6 @@ The Heal activity allows for rolling healing.
 
 ## Configuring Heal
 
-![Heal Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/heal-effect.jpg)
+![Heal Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/heal-effect.jpg)
 
 After creating the Heal activity the configuration sheet will open. Navigate over to the "Effect" tab to see the healing formula, type, and scaling details.

wiki/Activity-Type-Save.md

@@ -7,7 +7,7 @@ The Save activity allows for calling for saving throws and rolling damage.
 
 After creating the Save activity the configuration sheet will open. Navigate over to the "Effect" tab to see options specific to the Save activity.
 
-![Save Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/save-effect.jpg)
+![Save Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/save-effect.jpg)
 
 The "Save Details" section contains values used to determine what kind of save is rolled and what the target DC is:
 - *Challenge Ability*: Controls what ability must be used when rolling the saving throw

wiki/Activity-Type-Utility.md

@@ -7,11 +7,11 @@ The Utility activity allows for rolling an arbitrary formula, adding effects, or
 
 After creating the Utility activity the configuration sheet will open to the "Identity" tab. In addition to the standard activity identity options (see the [Activities Overview](Activities.md) for more details), Utility also includes a *Utility Roll Prompt* option. This controls whether the rolling dialog is shown when rolling the utility roll (if present).
 
-![Utility Sheet - Identity Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/utility-identity.jpg)
+![Utility Sheet - Identity Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/utility-identity.jpg)
 
 ### Utility Roll
 
-![Utility Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/summoning/utility-effect.jpg)
+![Utility Sheet - Effect Tab](https://raw.githubusercontent.com/foundryvtt/dnd5e/publish-wiki/wiki/images/activities/utility-effect.jpg)
 
 The "Effect" tab contains the configuration information for the utility roll:
 - *Roll Label*: Label used for the rolling button in place of the default "Roll" label

wiki/Hooks.md

@@ -62,7 +62,7 @@ Fires after a concentration effect is created.
 | item   | Item5e         | The item that is being concentrated on. |
 | effect | ActiveEffect5e | The created ActiveEffect instance.      |
 
-### `dnd5e.preEndConcentrating`
+### `dnd5e.preEndConcentration`
 
 Fires before a concentration effect is deleted. Returning `false` will prevent concentration effect from being deleted.
 
@@ -71,7 +71,7 @@ Fires before a concentration effect is deleted. Returning `false` will prevent c
 | actor  | Actor5e        | The actor ending concentration.        |
 | effect | ActiveEffect5e | The ActiveEffect that will be deleted. |
 
-### `dnd5e.endConcentrating`
+### `dnd5e.endConcentration`
 
 Fires after a concentration effect is deleted.