From 03979936f3f9e05c50a27b88e3d8fb26465b47a2 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 28 Sep 2016 20:00:01 +1300
Subject: [PATCH 1/7] Move reused object structures to a standard structures
 folder

---
 docs/api/screen.md                          | 29 +++------------
 docs/api/shell.md                           | 31 ++--------------
 docs/api/structures/bounds.md               |  6 ++++
 docs/api/structures/certificate.md          |  9 +++++
 docs/api/structures/display.md              | 15 ++++++++
 docs/api/structures/jump-list-category.md   | 21 +++++++++++
 docs/api/structures/jump-list-item.md       | 28 +++++++++++++++
 docs/api/structures/memory-usage-details.md |  8 +++++
 docs/api/structures/shortcut-details.md     | 15 ++++++++
 docs/api/structures/task.md                 | 14 ++++++++
 docs/api/structures/thumbar-button.md       | 21 +++++++++++
 docs/api/tray.md                            | 24 +++----------
 docs/api/web-contents.md                    | 32 +++--------------
 docs/api/web-frame.md                       | 40 +++------------------
 14 files changed, 157 insertions(+), 136 deletions(-)
 create mode 100644 docs/api/structures/bounds.md
 create mode 100644 docs/api/structures/certificate.md
 create mode 100644 docs/api/structures/display.md
 create mode 100644 docs/api/structures/jump-list-category.md
 create mode 100644 docs/api/structures/jump-list-item.md
 create mode 100644 docs/api/structures/memory-usage-details.md
 create mode 100644 docs/api/structures/shortcut-details.md
 create mode 100644 docs/api/structures/task.md
 create mode 100644 docs/api/structures/thumbar-button.md

diff --git a/docs/api/screen.md b/docs/api/screen.md
index 55413abc6398..fbbbef929dc7 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -49,23 +49,6 @@ app.on('ready', () => {
 })
 ```
 
-## The `Display` object
-
-The `Display` object represents a physical display connected to the system. A
-fake `Display` may exist on a headless system, or a `Display` may correspond to
-a remote, virtual display.
-
-* `display` object
-  * `id` Integer - Unique identifier associated with the display.
-  * `rotation` Integer - Can be 0, 90, 180, 270, represents screen rotation in
-    clock-wise degrees.
-  * `scaleFactor` Number - Output device's pixel scale factor.
-  * `touchSupport` String - Can be `available`, `unavailable`, `unknown`.
-  * `bounds` Object
-  * `size` Object
-  * `workArea` Object
-  * `workAreaSize` Object
-
 ## Events
 
 The `screen` module emits the following events:
@@ -75,7 +58,7 @@ The `screen` module emits the following events:
 Returns:
 
 * `event` Event
-* `newDisplay` Object
+* `newDisplay` [Display](structures/display.md)
 
 Emitted when `newDisplay` has been added.
 
@@ -84,7 +67,7 @@ Emitted when `newDisplay` has been added.
 Returns:
 
 * `event` Event
-* `oldDisplay` Object
+* `oldDisplay` [Display](structures/display.md)
 
 Emitted when `oldDisplay` has been removed.
 
@@ -93,7 +76,7 @@ Emitted when `oldDisplay` has been removed.
 Returns:
 
 * `event` Event
-* `display` Object
+* `display` [Display](structures/display.md)
 * `changedMetrics` String[]
 
 Emitted when one or more metrics change in a `display`. The `changedMetrics` is
@@ -130,10 +113,6 @@ Returns `Display` - The display nearest the specified point.
 
 ### `screen.getDisplayMatching(rect)`
 
-* `rect` Object
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `rect` [Bounds](structures/bounds.md)
 
 Returns `Display` - The display that most closely intersects the provided bounds.
diff --git a/docs/api/shell.md b/docs/api/shell.md
index f673007c28d7..5ca33a4b3f12 100644
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -64,21 +64,7 @@ Play the beep sound.
   * `update` - Updates specified properties only on an existing shortcut.
   * `replace` - Overwrites an existing shortcut, fails if the shortcut doesn't
     exist.
-* `options` Object
-  * `target` String - The target to launch from this shortcut.
-  * `cwd` String (optional) - The working directory. Default
-    is empty.
-  * `args` String (optional) - The arguments to be applied to `target` when
-    launching from this shortcut. Default is empty.
-  * `description` String (optional) - The description of the shortcut. Default
-    is empty.
-  * `icon` String (optional) - The path to the icon, can be a DLL or EXE. `icon`
-    and `iconIndex` have to be set together. Default is empty, which uses the
-    target's icon.
-  * `iconIndex` Integer (optional) - The resource ID of icon when `icon` is a
-    DLL or EXE. Default is 0.
-  * `appUserModelId` String (optional) - The Application User Model ID. Default
-    is empty.
+* `options` [ShortcutDetails](structures/shortcut-details.md)
 
 Returns `Boolean` - Whether the shortcut was created successfully
 
@@ -88,20 +74,7 @@ Creates or updates a shortcut link at `shortcutPath`.
 
 * `shortcutPath` String
 
-Returns `Object`:
-* `target` String - The target to launch from this shortcut.
-* `cwd` String (optional) - The working directory. Default is empty.
-* `args` String (optional) - The arguments to be applied to `target` when
-launching from this shortcut. Default is empty.
-* `description` String (optional) - The description of the shortcut. Default
-is empty.
-* `icon` String (optional) - The path to the icon, can be a DLL or EXE. `icon`
-and `iconIndex` have to be set together. Default is empty, which uses the
-target's icon.
-* `iconIndex` Integer (optional) - The resource ID of icon when `icon` is a
-DLL or EXE. Default is 0.
-* `appUserModelId` String (optional) - The Application User Model ID. Default
-is empty.
+Returns `ShortcutDetails`
 
 Resolves the shortcut link at `shortcutPath`.
 
diff --git a/docs/api/structures/bounds.md b/docs/api/structures/bounds.md
new file mode 100644
index 000000000000..715366ba4bc6
--- /dev/null
+++ b/docs/api/structures/bounds.md
@@ -0,0 +1,6 @@
+# Bounds
+
+* `x` Integer
+* `y` Integer
+* `width` Integer
+* `height` Integer
diff --git a/docs/api/structures/certificate.md b/docs/api/structures/certificate.md
new file mode 100644
index 000000000000..3d3190a3d804
--- /dev/null
+++ b/docs/api/structures/certificate.md
@@ -0,0 +1,9 @@
+# Certificate
+
+* `data` String - PEM encoded data
+* `issuerName` String - Issuer's Common Name
+* `subjectName` String - Subject's Common Name
+* `serialNumber` String - Hex value represented string
+* `validStart` Integer - Start date of the certificate being valid in seconds
+* `validExpiry` Integer - End date of the certificate being valid in seconds
+* `fingerprint` String - Fingerprint of the certificate
diff --git a/docs/api/structures/display.md b/docs/api/structures/display.md
new file mode 100644
index 000000000000..3c07915b89bb
--- /dev/null
+++ b/docs/api/structures/display.md
@@ -0,0 +1,15 @@
+# Display
+
+* `id` Integer - Unique identifier associated with the display.
+* `rotation` Integer - Can be 0, 90, 180, 270, represents screen rotation in
+  clock-wise degrees.
+* `scaleFactor` Number - Output device's pixel scale factor.
+* `touchSupport` String - Can be `available`, `unavailable`, `unknown`.
+* `bounds` Object
+* `size` Object
+* `workArea` Object
+* `workAreaSize` Object
+
+The `Display` object represents a physical display connected to the system. A
+fake `Display` may exist on a headless system, or a `Display` may correspond to
+a remote, virtual display.
diff --git a/docs/api/structures/jump-list-category.md b/docs/api/structures/jump-list-category.md
new file mode 100644
index 000000000000..dbec04c2f6d2
--- /dev/null
+++ b/docs/api/structures/jump-list-category.md
@@ -0,0 +1,21 @@
+# JumpListCategory
+
+* `type` String - One of the following:
+  * `tasks` - Items in this category will be placed into the standard `Tasks`
+    category. There can be only one such category, and it will always be
+    displayed at the bottom of the Jump List.
+  * `frequent` - Displays a list of files frequently opened by the app, the
+    name of the category and its items are set by Windows.
+  * `recent` - Displays a list of files recently opened by the app, the name
+    of the category and its items are set by Windows. Items may be added to
+    this category indirectly using `app.addRecentDocument(path)`.
+  * `custom` - Displays tasks or file links, `name` must be set by the app.
+* `name` String - Must be set if `type` is `custom`, otherwise it should be
+  omitted.
+* `items` JumpListItem[] - Array of [`JumpListItem`](jump-list-item.md) objects if `type` is `tasks` or
+  `custom`, otherwise it should be omitted.
+
+**Note:** If a `JumpListCategory` object has neither the `type` nor the `name`
+property set then its `type` is assumed to be `tasks`. If the `name` property
+is set but the `type` property is omitted then the `type` is assumed to be
+`custom`.
diff --git a/docs/api/structures/jump-list-item.md b/docs/api/structures/jump-list-item.md
new file mode 100644
index 000000000000..52008d2ad3a6
--- /dev/null
+++ b/docs/api/structures/jump-list-item.md
@@ -0,0 +1,28 @@
+# JumpListItem
+
+* `type` String - One of the following:
+  * `task` - A task will launch an app with specific arguments.
+  * `separator` - Can be used to separate items in the standard `Tasks`
+    category.
+  * `file` - A file link will open a file using the app that created the
+    Jump List, for this to work the app must be registered as a handler for
+    the file type (though it doesn't have to be the default handler).
+* `path` String - Path of the file to open, should only be set if `type` is
+  `file`.
+* `program` String - Path of the program to execute, usually you should
+  specify `process.execPath` which opens the current program. Should only be
+  set if `type` is `task`.
+* `args` String - The command line arguments when `program` is executed. Should
+  only be set if `type` is `task`.
+* `title` String - The text to be displayed for the item in the Jump List.
+  Should only be set if `type` is `task`.
+* `description` String - Description of the task (displayed in a tooltip).
+  Should only be set if `type` is `task`.
+* `iconPath` String - The absolute path to an icon to be displayed in a
+  Jump List, which can be an arbitrary resource file that contains an icon
+  (e.g. `.ico`, `.exe`, `.dll`). You can usually specify `process.execPath` to
+  show the program icon.
+* `iconIndex` Integer - The index of the icon in the resource file. If a
+  resource file contains multiple icons this value can be used to specify the
+  zero-based index of the icon that should be displayed for this task. If a
+  resource file contains only one icon, this property should be set to zero.
diff --git a/docs/api/structures/memory-usage-details.md b/docs/api/structures/memory-usage-details.md
new file mode 100644
index 000000000000..6957efff9c96
--- /dev/null
+++ b/docs/api/structures/memory-usage-details.md
@@ -0,0 +1,8 @@
+# MemoryUsageDetails
+
+* `count` Integer
+* `size` Integer
+* `liveSize` Integer
+* `decodedSize` Integer
+* `purgedSize` Integer
+* `purgeableSize` Integer
diff --git a/docs/api/structures/shortcut-details.md b/docs/api/structures/shortcut-details.md
new file mode 100644
index 000000000000..53d40d9ad9a1
--- /dev/null
+++ b/docs/api/structures/shortcut-details.md
@@ -0,0 +1,15 @@
+# ShortcutDetails
+
+* `target` String - The target to launch from this shortcut.
+* `cwd` String (optional) - The working directory. Default is empty.
+* `args` String (optional) - The arguments to be applied to `target` when
+launching from this shortcut. Default is empty.
+* `description` String (optional) - The description of the shortcut. Default
+is empty.
+* `icon` String (optional) - The path to the icon, can be a DLL or EXE. `icon`
+and `iconIndex` have to be set together. Default is empty, which uses the
+target's icon.
+* `iconIndex` Integer (optional) - The resource ID of icon when `icon` is a
+DLL or EXE. Default is 0.
+* `appUserModelId` String (optional) - The Application User Model ID. Default
+is empty.
diff --git a/docs/api/structures/task.md b/docs/api/structures/task.md
new file mode 100644
index 000000000000..503f02aa4d4b
--- /dev/null
+++ b/docs/api/structures/task.md
@@ -0,0 +1,14 @@
+# Task
+
+* `program` String - Path of the program to execute, usually you should
+  specify `process.execPath` which opens the current program.
+* `arguments` String - The command line arguments when `program` is
+  executed.
+* `title` String - The string to be displayed in a JumpList.
+* `description` String - Description of this task.
+* `iconPath` String - The absolute path to an icon to be displayed in a
+  JumpList, which can be an arbitrary resource file that contains an icon. You
+  can usually specify `process.execPath` to show the icon of the program.
+* `iconIndex` Integer - The icon index in the icon file. If an icon file
+  consists of two or more icons, set this value to identify the icon. If an
+  icon file consists of one icon, this value is 0.
diff --git a/docs/api/structures/thumbar-button.md b/docs/api/structures/thumbar-button.md
new file mode 100644
index 000000000000..0e95f8a9fd97
--- /dev/null
+++ b/docs/api/structures/thumbar-button.md
@@ -0,0 +1,21 @@
+# ThumbarButton
+
+* `icon` [NativeImage](native-image.md) - The icon showing in thumbnail
+  toolbar.
+* `click` Function
+* `tooltip` String (optional) - The text of the button's tooltip.
+* `flags` Array (optional) - Control specific states and behaviors of the
+  button. By default, it is `['enabled']`.
+
+The `flags` is an array that can include following `String`s:
+
+* `enabled` - The button is active and available to the user.
+* `disabled` - The button is disabled. It is present, but has a visual state
+  indicating it will not respond to user action.
+* `dismissonclick` - When the button is clicked, the thumbnail window closes
+  immediately.
+* `nobackground` - Do not draw a button border, use only the image.
+* `hidden` - The button is not shown to the user.
+* `noninteractive` - The button is enabled but not interactive; no pressed
+  button state is drawn. This value is intended for instances where the button
+  is used in a notification.
diff --git a/docs/api/tray.md b/docs/api/tray.md
index 19510085d0fc..625d512099bd 100644
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -70,11 +70,7 @@ The `Tray` module emits the following events:
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` Object _macOS_ _Windows_ - the bounds of tray icon.
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `bounds` Bounds - The [Bounds](structures/bounds.md) of tray icon
 
 Emitted when the tray icon is clicked.
 
@@ -85,11 +81,7 @@ Emitted when the tray icon is clicked.
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` Object - the bounds of tray icon.
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `bounds` Bounds - The [Bounds](structures/bounds.md) of tray icon
 
 Emitted when the tray icon is right clicked.
 
@@ -100,11 +92,7 @@ Emitted when the tray icon is right clicked.
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` Object - the bounds of tray icon
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `bounds` Bounds - The [Bounds](structures/bounds.md) of tray icon
 
 Emitted when the tray icon is double clicked.
 
@@ -243,11 +231,7 @@ Sets the context menu for this icon.
 
 #### `tray.getBounds()` _macOS_ _Windows_
 
-Returns `Object`:
-* `x` Integer
-* `y` Integer
-* `width` Integer
-* `height` Integer
+Returns `Bounds` - A [Bounds](structures/bounds.md) object
 
 The `bounds` of this tray icon as `Object`.
 
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 1b10d9624c58..0a831d71de69 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -247,14 +247,7 @@ Returns:
 * `event` Event
 * `url` URL
 * `error` String - The error code
-* `certificate` Object
-  * `data` String - PEM encoded data
-  * `issuerName` String - Issuer's Common Name
-  * `subjectName` String - Subject's Common Name
-  * `serialNumber` String - Hex value represented string
-  * `validStart` Integer - Start date of the certificate being valid in seconds
-  * `validExpiry` Integer - End date of the certificate being valid in seconds
-  * `fingerprint` String - Fingerprint of the certificate
+* `certificate` [Certificate](structures/certificate.md)
 * `callback` Function
 
 Emitted when failed to verify the `certificate` for `url`.
@@ -268,14 +261,7 @@ Returns:
 
 * `event` Event
 * `url` URL
-* `certificateList` [Objects]
-  * `data` String - PEM encoded data
-  * `issuerName` String - Issuer's Common Name
-  * `subjectName` String - Subject's Common Name
-  * `serialNumber` String - Hex value represented string
-  * `validStart` Integer - Start date of the certificate being valid in seconds
-  * `validExpiry` Integer - End date of the certificate being valid in seconds
-  * `fingerprint` String - Fingerprint of the certificate
+* `certificateList` Certificate[]
 * `callback` Function
 
 Emitted when a client certificate is requested.
@@ -479,11 +465,7 @@ app.on('ready', () => {
 Returns:
 
 * `event` Event
-* `dirtyRect` Object
-  * `x` Integer - The x coordinate on the image.
-  * `y` Integer - The y coordinate on the image.
-  * `width` Integer - The width of the dirty area.
-  * `height` Integer - The height of the dirty area.
+* `dirtyRect` [Bounds](structures/bounds.md)
 * `image` [NativeImage](native-image.md) - The image data of the whole frame.
 
 Emitted when a new frame is generated. Only the dirty area is passed in the
@@ -521,7 +503,7 @@ webContents.loadURL('https://github.com', options)
 
 #### `contents.downloadURL(url)`
 
-* `url` URL
+* `url` String
 
 Initiates a download of the resource at `url` without navigating. The
 `will-download` event of `session` will be triggered.
@@ -798,11 +780,7 @@ console.log(requestId)
 
 #### `contents.capturePage([rect, ]callback)`
 
-* `rect` Object (optional) - The area of the page to be captured
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `rect` [Bounds](structures/bounds.md) (optional) - The area of the page to be captured
 * `callback` Function
 
 Captures a snapshot of the page within `rect`. Upon completion `callback` will
diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index a1234c176652..e26ad9edaee1 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -110,41 +110,11 @@ this limitation.
 ### `webFrame.getResourceUsage()`
 
 Returns `Object`:
-* `images` Object
-  * `count` Integer
-  * `size` Integer
-  * `liveSize` Integer
-  * `decodedSize` Integer
-  * `purgedSize` Integer
-  * `purgeableSize` Integer
-* `cssStyleSheets` Object
-  * `count` Integer
-  * `size` Integer
-  * `liveSize` Integer
-  * `decodedSize` Integer
-  * `purgedSize` Integer
-  * `purgeableSize` Integer
-* `xslStyleSheets` Object
-  * `count` Integer
-  * `size` Integer
-  * `liveSize` Integer
-  * `decodedSize` Integer
-  * `purgedSize` Integer
-  * `purgeableSize` Integer
-* `fonts` Object
-  * `count` Integer
-  * `size` Integer
-  * `liveSize` Integer
-  * `decodedSize` Integer
-  * `purgedSize` Integer
-  * `purgeableSize` Integer
-* `other` Object
-  * `count` Integer
-  * `size` Integer
-  * `liveSize` Integer
-  * `decodedSize` Integer
-  * `purgedSize` Integer
-  * `purgeableSize` Integer
+* `images` [MemoryUsageDetails](structures/memory-usage-details.md)
+* `cssStyleSheets` [MemoryUsageDetails](structures/memory-usage-details.md)
+* `xslStyleSheets` [MemoryUsageDetails](structures/memory-usage-details.md)
+* `fonts` [MemoryUsageDetails](structures/memory-usage-details.md)
+* `other` [MemoryUsageDetails](structures/memory-usage-details.md)
 
 Returns an object describing usage information of Blink's internal memory
 caches.

From b859afc118c2f29095a9bc2a43bd8c98555397fc Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 5 Oct 2016 09:35:23 +1100
Subject: [PATCH 2/7] Update docs to follow the 'link first instance' standard

---
 docs/api/app.md            | 15 ++++--------
 docs/api/browser-window.md | 47 +++++++++-----------------------------
 docs/api/shell.md          |  2 +-
 docs/api/tray.md           |  8 +++----
 4 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 7d3454dda272..3049244a1a32 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -219,14 +219,7 @@ Returns:
 * `event` Event
 * `webContents` [WebContents](web-contents.md)
 * `url` URL
-* `certificateList` [Objects]
-  * `data` String - PEM encoded data
-  * `issuerName` String - Issuer's Common Name
-  * `subjectName` String - Subject's Common Name
-  * `serialNumber` String - Hex value represented string
-  * `validStart` Integer - Start date of the certificate being valid in seconds
-  * `validExpiry` Integer - End date of the certificate being valid in seconds
-  * `fingerprint` String - Fingerprint of the certificate
+* `certificateList` [Certificate[]](structures/certificate.md)
 * `callback` Function
 
 Emitted when a client certificate is requested.
@@ -523,7 +516,7 @@ The API uses the Windows Registry and LSCopyDefaultHandlerForURLScheme internall
 
 ### `app.setUserTasks(tasks)` _Windows_
 
-* `tasks` Array - Array of `Task` objects
+* `tasks` [Task[]](structures/task.md) - Array of `Task` objects
 
 Adds `tasks` to the [Tasks][tasks] category of the JumpList on Windows.
 
@@ -555,7 +548,7 @@ Returns `Object`:
 * `minItems` Integer - The minimum number of items that will be shown in the
   Jump List (for a more detailed description of this value see the
   [MSDN docs][JumpListBeginListMSDN]).
-* `removedItems` Array - Array of `JumpListItem` objects that correspond to
+* `removedItems` [JumpListItem[]](structures/jump-list-item.md) - Array of `JumpListItem` objects that correspond to
   items that the user has explicitly removed from custom categories in the
   Jump List. These items must not be re-added to the Jump List in the **next**
   call to `app.setJumpList()`, Windows will not display any custom category
@@ -563,7 +556,7 @@ Returns `Object`:
 
 ### `app.setJumpList(categories)` _Windows_
 
-* `categories` Array or `null` - Array of `JumpListCategory` objects.
+* `categories` [JumpListCategory[]](structures/jump-list-category.md) or `null` - Array of `JumpListCategory` objects.
 
 Sets or removes a custom Jump List for the application, and returns one of the
 following strings:
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 015cf986865d..7b459c24648c 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -666,45 +666,26 @@ height areas you have within the overall content view.
 
 #### `win.setBounds(options[, animate])`
 
-* `options` Object
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `options` [Bounds](structures/bounds.md)
 * `animate` Boolean (optional) _macOS_
 
-Resizes and moves the window to `width`, `height`, `x`, `y`.
+Resizes and moves the window to the supplied bounds
 
 #### `win.getBounds()`
 
-Returns `Object`:
-* `width` Integer
-* `height` Integer
-* `x` Integer
-* `y` Integer
+Returns [`Bounds`](structures/bounds.md)
 
 #### `win.setContentBounds(options[, animate])`
 
-* `options` Object
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `options` [Bounds](structures/bounds.md)
 * `animate` Boolean (optional) _macOS_
 
 Resizes and moves the window's client area (e.g. the web page) to
-`width`, `height`, `x`, `y`.
+the supplied bounds.
 
 #### `win.getContentBounds()`
 
-Returns `Object`:
-* `width` Integer
-* `height` Integer
-* `x` Integer
-* `y` Integer
-
-Returns an object that contains the window's client area (e.g. the web page)
-width, height, x and y values.
+Returns [`Bounds`](structures/bounds.md)
 
 #### `win.setSize(width, height[, animate])`
 
@@ -967,11 +948,7 @@ Whether `Boolean` - Whether the window's document has been edited.
 
 #### `win.capturePage([rect, ]callback)`
 
-* `rect` Object (optional) - The area of the page to be captured
-  * `x` Integer
-  * `y` Integer
-  * `width` Integer
-  * `height` Integer
+* `rect` [Bounds](structures/bounds.md) (optional) - The bounds to capture
 * `callback` Function
 
 Same as `webContents.capturePage([rect, ]callback)`.
@@ -1060,7 +1037,9 @@ On Windows and Linux always returns
 
 #### `win.setThumbarButtons(buttons)` _Windows_
 
-* `buttons` Array
+* `buttons` [ThumbarButton[]](structures/thumbar-button.md)
+
+Returns `Boolean` - Whether the buttons were added successfully
 
 Add a thumbnail toolbar with a specified set of buttons to the thumbnail image
 of a window in a taskbar button layout. Returns a `Boolean` object indicates
@@ -1096,11 +1075,7 @@ The `flags` is an array that can include following `String`s:
 
 #### `win.setThumbnailClip(region)` _Windows_
 
-* `region` Object - Region of the window
-  * `x` Integer - x-position of region
-  * `y` Integer - y-position of region
-  * `width` Integer - width of region
-  * `height` Integer - height of region
+* `region` [Bounds](structures/bounds.md) - Region of the window
 
 Sets the region of the window to show as the thumbnail image displayed when
 hovering over the window in the taskbar. You can reset the thumbnail to be
diff --git a/docs/api/shell.md b/docs/api/shell.md
index 5ca33a4b3f12..03f6972e3b88 100644
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -74,7 +74,7 @@ Creates or updates a shortcut link at `shortcutPath`.
 
 * `shortcutPath` String
 
-Returns `ShortcutDetails`
+Returns [`ShortcutDetails`](structures/shortcut-details.md)
 
 Resolves the shortcut link at `shortcutPath`.
 
diff --git a/docs/api/tray.md b/docs/api/tray.md
index 625d512099bd..2d567b836461 100644
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -70,7 +70,7 @@ The `Tray` module emits the following events:
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` Bounds - The [Bounds](structures/bounds.md) of tray icon
+* `bounds` [Bounds](structures/bounds.md) - The bounds of tray icon
 
 Emitted when the tray icon is clicked.
 
@@ -81,7 +81,7 @@ Emitted when the tray icon is clicked.
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` Bounds - The [Bounds](structures/bounds.md) of tray icon
+* `bounds` [Bounds](structures/bounds.md) - The bounds of tray icon
 
 Emitted when the tray icon is right clicked.
 
@@ -92,7 +92,7 @@ Emitted when the tray icon is right clicked.
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` Bounds - The [Bounds](structures/bounds.md) of tray icon
+* `bounds` [Bounds](structures/bounds.md) - The bounds of tray icon
 
 Emitted when the tray icon is double clicked.
 
@@ -231,7 +231,7 @@ Sets the context menu for this icon.
 
 #### `tray.getBounds()` _macOS_ _Windows_
 
-Returns `Bounds` - A [Bounds](structures/bounds.md) object
+Returns [`Bounds`](structures/bounds.md)
 
 The `bounds` of this tray icon as `Object`.
 

From 2b05c61ae3020ff76b54813743a89142b5aef53e Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 5 Oct 2016 10:55:32 +1100
Subject: [PATCH 3/7] Update docs for parsing

---
 docs/api/structures/bounds.md               |  8 ++++----
 docs/api/structures/certificate.md          |  4 ++--
 docs/api/structures/display.md              | 12 ++++++++----
 docs/api/structures/jump-list-item.md       |  2 +-
 docs/api/structures/memory-usage-details.md | 12 ++++++------
 docs/api/structures/shortcut-details.md     |  2 +-
 docs/api/structures/task.md                 |  2 +-
 docs/api/structures/thumbar-button.md       |  2 +-
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/docs/api/structures/bounds.md b/docs/api/structures/bounds.md
index 715366ba4bc6..9a7406a51ecd 100644
--- a/docs/api/structures/bounds.md
+++ b/docs/api/structures/bounds.md
@@ -1,6 +1,6 @@
 # Bounds
 
-* `x` Integer
-* `y` Integer
-* `width` Integer
-* `height` Integer
+* `x` Number
+* `y` Number
+* `width` Number
+* `height` Number
diff --git a/docs/api/structures/certificate.md b/docs/api/structures/certificate.md
index 3d3190a3d804..19a2027d4032 100644
--- a/docs/api/structures/certificate.md
+++ b/docs/api/structures/certificate.md
@@ -4,6 +4,6 @@
 * `issuerName` String - Issuer's Common Name
 * `subjectName` String - Subject's Common Name
 * `serialNumber` String - Hex value represented string
-* `validStart` Integer - Start date of the certificate being valid in seconds
-* `validExpiry` Integer - End date of the certificate being valid in seconds
+* `validStart` Number - Start date of the certificate being valid in seconds
+* `validExpiry` Number - End date of the certificate being valid in seconds
 * `fingerprint` String - Fingerprint of the certificate
diff --git a/docs/api/structures/display.md b/docs/api/structures/display.md
index 3c07915b89bb..d3949277e183 100644
--- a/docs/api/structures/display.md
+++ b/docs/api/structures/display.md
@@ -1,14 +1,18 @@
 # Display
 
-* `id` Integer - Unique identifier associated with the display.
-* `rotation` Integer - Can be 0, 90, 180, 270, represents screen rotation in
+* `id` Number - Unique identifier associated with the display.
+* `rotation` Number - Can be 0, 90, 180, 270, represents screen rotation in
   clock-wise degrees.
 * `scaleFactor` Number - Output device's pixel scale factor.
 * `touchSupport` String - Can be `available`, `unavailable`, `unknown`.
-* `bounds` Object
+* `bounds` [Bounds](bounds.md)
 * `size` Object
-* `workArea` Object
+  * `height` Number
+  * `width` Number
+* `workArea` [Bounds](bounds.md)
 * `workAreaSize` Object
+  * `height` Number
+  * `width` Number
 
 The `Display` object represents a physical display connected to the system. A
 fake `Display` may exist on a headless system, or a `Display` may correspond to
diff --git a/docs/api/structures/jump-list-item.md b/docs/api/structures/jump-list-item.md
index 52008d2ad3a6..c34b4097c4b7 100644
--- a/docs/api/structures/jump-list-item.md
+++ b/docs/api/structures/jump-list-item.md
@@ -22,7 +22,7 @@
   Jump List, which can be an arbitrary resource file that contains an icon
   (e.g. `.ico`, `.exe`, `.dll`). You can usually specify `process.execPath` to
   show the program icon.
-* `iconIndex` Integer - The index of the icon in the resource file. If a
+* `iconIndex` Number - The index of the icon in the resource file. If a
   resource file contains multiple icons this value can be used to specify the
   zero-based index of the icon that should be displayed for this task. If a
   resource file contains only one icon, this property should be set to zero.
diff --git a/docs/api/structures/memory-usage-details.md b/docs/api/structures/memory-usage-details.md
index 6957efff9c96..91d1e154107b 100644
--- a/docs/api/structures/memory-usage-details.md
+++ b/docs/api/structures/memory-usage-details.md
@@ -1,8 +1,8 @@
 # MemoryUsageDetails
 
-* `count` Integer
-* `size` Integer
-* `liveSize` Integer
-* `decodedSize` Integer
-* `purgedSize` Integer
-* `purgeableSize` Integer
+* `count` Number
+* `size` Number
+* `liveSize` Number
+* `decodedSize` Number
+* `purgedSize` Number
+* `purgeableSize` Number
diff --git a/docs/api/structures/shortcut-details.md b/docs/api/structures/shortcut-details.md
index 53d40d9ad9a1..c57c345ba6ed 100644
--- a/docs/api/structures/shortcut-details.md
+++ b/docs/api/structures/shortcut-details.md
@@ -9,7 +9,7 @@ is empty.
 * `icon` String (optional) - The path to the icon, can be a DLL or EXE. `icon`
 and `iconIndex` have to be set together. Default is empty, which uses the
 target's icon.
-* `iconIndex` Integer (optional) - The resource ID of icon when `icon` is a
+* `iconIndex` Number (optional) - The resource ID of icon when `icon` is a
 DLL or EXE. Default is 0.
 * `appUserModelId` String (optional) - The Application User Model ID. Default
 is empty.
diff --git a/docs/api/structures/task.md b/docs/api/structures/task.md
index 503f02aa4d4b..a73ff0990849 100644
--- a/docs/api/structures/task.md
+++ b/docs/api/structures/task.md
@@ -9,6 +9,6 @@
 * `iconPath` String - The absolute path to an icon to be displayed in a
   JumpList, which can be an arbitrary resource file that contains an icon. You
   can usually specify `process.execPath` to show the icon of the program.
-* `iconIndex` Integer - The icon index in the icon file. If an icon file
+* `iconIndex` Number - The icon index in the icon file. If an icon file
   consists of two or more icons, set this value to identify the icon. If an
   icon file consists of one icon, this value is 0.
diff --git a/docs/api/structures/thumbar-button.md b/docs/api/structures/thumbar-button.md
index 0e95f8a9fd97..c029e881bb4d 100644
--- a/docs/api/structures/thumbar-button.md
+++ b/docs/api/structures/thumbar-button.md
@@ -4,7 +4,7 @@
   toolbar.
 * `click` Function
 * `tooltip` String (optional) - The text of the button's tooltip.
-* `flags` Array (optional) - Control specific states and behaviors of the
+* `flags` String[] (optional) - Control specific states and behaviors of the
   button. By default, it is `['enabled']`.
 
 The `flags` is an array that can include following `String`s:

From c34d868609aefcc2f79894a6da7f6019dc5a4e2d Mon Sep 17 00:00:00 2001
From: Zeke Sikelianos <zeke@sikelianos.com>
Date: Wed, 5 Oct 2016 15:09:18 -0700
Subject: [PATCH 4/7] update docs-linter

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 53ee0fc794e8..ee9463d5aef7 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "asar": "^0.11.0",
     "browserify": "^13.1.0",
     "electabul": "~0.0.4",
-    "electron-docs-linter": "1.7.1",
+    "electron-docs-linter": "^1.8.1",
     "request": "*",
     "standard": "^7.1.2",
     "standard-markdown": "^1.2.1"

From f80e81bf9f2199369ad45a20b466a40b439c4e54 Mon Sep 17 00:00:00 2001
From: Zeke Sikelianos <zeke@sikelianos.com>
Date: Wed, 5 Oct 2016 15:09:30 -0700
Subject: [PATCH 5/7] standardize

---
 docs/api/app.md                               | 30 ++++++++++++-------
 .../desktop-environment-integration.md        | 10 ++++---
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 3049244a1a32..d0cd16bf234e 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -651,15 +651,21 @@ app.setJumpList([
     name: 'Tools',
     items: [
       {
-        type: 'task', title: 'Tool A',
-        program: process.execPath, args: '--run-tool-a',
-        icon: process.execPath, iconIndex: 0,
+        type: 'task',
+        title: 'Tool A',
+        program: process.execPath,
+        args: '--run-tool-a',
+        icon: process.execPath,
+        iconIndex: 0,
         description: 'Runs Tool A'
       },
       {
-        type: 'task', title: 'Tool B',
-        program: process.execPath, args: '--run-tool-b',
-        icon: process.execPath, iconIndex: 0,
+        type: 'task',
+        title: 'Tool B',
+        program: process.execPath,
+        args: '--run-tool-b',
+        icon: process.execPath,
+        iconIndex: 0,
         description: 'Runs Tool B'
       }
     ]
@@ -668,14 +674,18 @@ app.setJumpList([
   { // has no name and no type so `type` is assumed to be "tasks"
     items: [
       {
-        type: 'task', title: 'New Project',
-        program: process.execPath, args: '--new-project',
+        type: 'task',
+        title: 'New Project',
+        program: process.execPath,
+        args: '--new-project',
         description: 'Create a new project.'
       },
       { type: 'separator' },
       {
-        type: 'task', title: 'Recover Project',
-        program: process.execPath, args: '--recover-project',
+        type: 'task',
+        title: 'Recover Project',
+        program: process.execPath,
+        args: '--recover-project',
         description: 'Recover Project'
       }
     ]
diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index 343657092660..32d3cd296e83 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -119,10 +119,12 @@ const {app, Menu} = require('electron')
 
 const dockMenu = Menu.buildFromTemplate([
   {label: 'New Window', click () { console.log('New Window') }},
-  {label: 'New Window with Settings', submenu: [
-    {label: 'Basic'},
-    {label: 'Pro'}
-  ]},
+  {label: 'New Window with Settings',
+    submenu: [
+      {label: 'Basic'},
+      {label: 'Pro'}
+    ]
+  },
   {label: 'New Command...'}
 ])
 app.dock.setMenu(dockMenu)

From 4d49156dac68a626141806cc8dc5b2951ff73198 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Sat, 8 Oct 2016 13:09:31 +1100
Subject: [PATCH 6/7] Rename bounds -> rectangle

---
 docs/api/browser-window.md                  | 16 ++++++++--------
 docs/api/screen.md                          |  2 +-
 docs/api/structures/bounds.md               |  6 ------
 docs/api/structures/certificate.md          |  2 +-
 docs/api/structures/display.md              |  6 +++---
 docs/api/structures/jump-list-category.md   |  2 +-
 docs/api/structures/jump-list-item.md       |  2 +-
 docs/api/structures/memory-usage-details.md |  2 +-
 docs/api/structures/rectangle.md            |  6 ++++++
 docs/api/structures/shortcut-details.md     |  2 +-
 docs/api/structures/task.md                 |  2 +-
 docs/api/structures/thumbar-button.md       |  2 +-
 docs/api/tray.md                            |  8 ++++----
 docs/api/web-contents.md                    |  4 ++--
 14 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 docs/api/structures/bounds.md
 create mode 100644 docs/api/structures/rectangle.md

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 7b459c24648c..b42f397a49d1 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -664,20 +664,20 @@ the player itself we would call this function with arguments of 16/9 and
 are within the content view--only that they exist. Just sum any extra width and
 height areas you have within the overall content view.
 
-#### `win.setBounds(options[, animate])`
+#### `win.setBounds(bounds[, animate])`
 
-* `options` [Bounds](structures/bounds.md)
+* `bounds` [Rectangle](structures/rectangle.md)
 * `animate` Boolean (optional) _macOS_
 
 Resizes and moves the window to the supplied bounds
 
 #### `win.getBounds()`
 
-Returns [`Bounds`](structures/bounds.md)
+Returns [`Rectangle`](structures/rectangle.md)
 
-#### `win.setContentBounds(options[, animate])`
+#### `win.setContentBounds(bounds[, animate])`
 
-* `options` [Bounds](structures/bounds.md)
+* `bounds` [Rectangle](structures/rectangle.md)
 * `animate` Boolean (optional) _macOS_
 
 Resizes and moves the window's client area (e.g. the web page) to
@@ -685,7 +685,7 @@ the supplied bounds.
 
 #### `win.getContentBounds()`
 
-Returns [`Bounds`](structures/bounds.md)
+Returns [`Rectangle`](structures/rectangle.md)
 
 #### `win.setSize(width, height[, animate])`
 
@@ -948,7 +948,7 @@ Whether `Boolean` - Whether the window's document has been edited.
 
 #### `win.capturePage([rect, ]callback)`
 
-* `rect` [Bounds](structures/bounds.md) (optional) - The bounds to capture
+* `rect` [Rectangle](structures/rectangle.md) (optional) - The bounds to capture
 * `callback` Function
 
 Same as `webContents.capturePage([rect, ]callback)`.
@@ -1075,7 +1075,7 @@ The `flags` is an array that can include following `String`s:
 
 #### `win.setThumbnailClip(region)` _Windows_
 
-* `region` [Bounds](structures/bounds.md) - Region of the window
+* `region` [Rectangle](structures/rectangle.md) - Region of the window
 
 Sets the region of the window to show as the thumbnail image displayed when
 hovering over the window in the taskbar. You can reset the thumbnail to be
diff --git a/docs/api/screen.md b/docs/api/screen.md
index fbbbef929dc7..ebc2be45ab7d 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -113,6 +113,6 @@ Returns `Display` - The display nearest the specified point.
 
 ### `screen.getDisplayMatching(rect)`
 
-* `rect` [Bounds](structures/bounds.md)
+* `rect` [Rectangle](structures/rectangle.md)
 
 Returns `Display` - The display that most closely intersects the provided bounds.
diff --git a/docs/api/structures/bounds.md b/docs/api/structures/bounds.md
deleted file mode 100644
index 9a7406a51ecd..000000000000
--- a/docs/api/structures/bounds.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Bounds
-
-* `x` Number
-* `y` Number
-* `width` Number
-* `height` Number
diff --git a/docs/api/structures/certificate.md b/docs/api/structures/certificate.md
index 19a2027d4032..95e15ceadaf5 100644
--- a/docs/api/structures/certificate.md
+++ b/docs/api/structures/certificate.md
@@ -1,4 +1,4 @@
-# Certificate
+# Certificate Object
 
 * `data` String - PEM encoded data
 * `issuerName` String - Issuer's Common Name
diff --git a/docs/api/structures/display.md b/docs/api/structures/display.md
index d3949277e183..d702b35a1bec 100644
--- a/docs/api/structures/display.md
+++ b/docs/api/structures/display.md
@@ -1,15 +1,15 @@
-# Display
+# Display Object
 
 * `id` Number - Unique identifier associated with the display.
 * `rotation` Number - Can be 0, 90, 180, 270, represents screen rotation in
   clock-wise degrees.
 * `scaleFactor` Number - Output device's pixel scale factor.
 * `touchSupport` String - Can be `available`, `unavailable`, `unknown`.
-* `bounds` [Bounds](bounds.md)
+* `bounds` [Rectangle](rectangle.md)
 * `size` Object
   * `height` Number
   * `width` Number
-* `workArea` [Bounds](bounds.md)
+* `workArea` [Rectangle](rectangle.md)
 * `workAreaSize` Object
   * `height` Number
   * `width` Number
diff --git a/docs/api/structures/jump-list-category.md b/docs/api/structures/jump-list-category.md
index dbec04c2f6d2..71bf0e49b5f3 100644
--- a/docs/api/structures/jump-list-category.md
+++ b/docs/api/structures/jump-list-category.md
@@ -1,4 +1,4 @@
-# JumpListCategory
+# JumpListCategory Object
 
 * `type` String - One of the following:
   * `tasks` - Items in this category will be placed into the standard `Tasks`
diff --git a/docs/api/structures/jump-list-item.md b/docs/api/structures/jump-list-item.md
index c34b4097c4b7..a58293a4ca94 100644
--- a/docs/api/structures/jump-list-item.md
+++ b/docs/api/structures/jump-list-item.md
@@ -1,4 +1,4 @@
-# JumpListItem
+# JumpListItem Object
 
 * `type` String - One of the following:
   * `task` - A task will launch an app with specific arguments.
diff --git a/docs/api/structures/memory-usage-details.md b/docs/api/structures/memory-usage-details.md
index 91d1e154107b..228a4452907b 100644
--- a/docs/api/structures/memory-usage-details.md
+++ b/docs/api/structures/memory-usage-details.md
@@ -1,4 +1,4 @@
-# MemoryUsageDetails
+# MemoryUsageDetails Object
 
 * `count` Number
 * `size` Number
diff --git a/docs/api/structures/rectangle.md b/docs/api/structures/rectangle.md
new file mode 100644
index 000000000000..0cd000699ea0
--- /dev/null
+++ b/docs/api/structures/rectangle.md
@@ -0,0 +1,6 @@
+# Rectangle Object
+
+* `x` Number - The x coordinate of the origin of the rectangle
+* `y` Number - The y coordinate of the origin of the rectangle
+* `width` Number
+* `height` Number
diff --git a/docs/api/structures/shortcut-details.md b/docs/api/structures/shortcut-details.md
index c57c345ba6ed..e7b272d09994 100644
--- a/docs/api/structures/shortcut-details.md
+++ b/docs/api/structures/shortcut-details.md
@@ -1,4 +1,4 @@
-# ShortcutDetails
+# ShortcutDetails Object
 
 * `target` String - The target to launch from this shortcut.
 * `cwd` String (optional) - The working directory. Default is empty.
diff --git a/docs/api/structures/task.md b/docs/api/structures/task.md
index a73ff0990849..61a28de879e7 100644
--- a/docs/api/structures/task.md
+++ b/docs/api/structures/task.md
@@ -1,4 +1,4 @@
-# Task
+# Task Object
 
 * `program` String - Path of the program to execute, usually you should
   specify `process.execPath` which opens the current program.
diff --git a/docs/api/structures/thumbar-button.md b/docs/api/structures/thumbar-button.md
index c029e881bb4d..324ee062d7d1 100644
--- a/docs/api/structures/thumbar-button.md
+++ b/docs/api/structures/thumbar-button.md
@@ -1,4 +1,4 @@
-# ThumbarButton
+# ThumbarButton Object
 
 * `icon` [NativeImage](native-image.md) - The icon showing in thumbnail
   toolbar.
diff --git a/docs/api/tray.md b/docs/api/tray.md
index 2d567b836461..ed9747ec3545 100644
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -70,7 +70,7 @@ The `Tray` module emits the following events:
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` [Bounds](structures/bounds.md) - The bounds of tray icon
+* `bounds` [Rectangle](structures/rectangle.md) - The bounds of tray icon
 
 Emitted when the tray icon is clicked.
 
@@ -81,7 +81,7 @@ Emitted when the tray icon is clicked.
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` [Bounds](structures/bounds.md) - The bounds of tray icon
+* `bounds` [Rectangle](structures/rectangle.md) - The bounds of tray icon
 
 Emitted when the tray icon is right clicked.
 
@@ -92,7 +92,7 @@ Emitted when the tray icon is right clicked.
   * `shiftKey` Boolean
   * `ctrlKey` Boolean
   * `metaKey` Boolean
-* `bounds` [Bounds](structures/bounds.md) - The bounds of tray icon
+* `bounds` [Rectangle](structures/rectangle.md) - The bounds of tray icon
 
 Emitted when the tray icon is double clicked.
 
@@ -231,7 +231,7 @@ Sets the context menu for this icon.
 
 #### `tray.getBounds()` _macOS_ _Windows_
 
-Returns [`Bounds`](structures/bounds.md)
+Returns [`Rectangle`](structures/rectangle.md)
 
 The `bounds` of this tray icon as `Object`.
 
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 0a831d71de69..106934ab0b62 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -465,7 +465,7 @@ app.on('ready', () => {
 Returns:
 
 * `event` Event
-* `dirtyRect` [Bounds](structures/bounds.md)
+* `dirtyRect` [Rectangle](structures/rectangle.md)
 * `image` [NativeImage](native-image.md) - The image data of the whole frame.
 
 Emitted when a new frame is generated. Only the dirty area is passed in the
@@ -780,7 +780,7 @@ console.log(requestId)
 
 #### `contents.capturePage([rect, ]callback)`
 
-* `rect` [Bounds](structures/bounds.md) (optional) - The area of the page to be captured
+* `rect` [Rectangle](structures/rectangle.md) (optional) - The area of the page to be captured
 * `callback` Function
 
 Captures a snapshot of the page within `rect`. Upon completion `callback` will

From 2acd7f4d12b3ee5d2b921474aff72bcc7cf8da2b Mon Sep 17 00:00:00 2001
From: Zeke Sikelianos <zeke@github.com>
Date: Fri, 7 Oct 2016 21:25:39 -0700
Subject: [PATCH 7/7] fix NativeImage link path

---
 docs/api/structures/thumbar-button.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/structures/thumbar-button.md b/docs/api/structures/thumbar-button.md
index 324ee062d7d1..259195852a4f 100644
--- a/docs/api/structures/thumbar-button.md
+++ b/docs/api/structures/thumbar-button.md
@@ -1,6 +1,6 @@
 # ThumbarButton Object
 
-* `icon` [NativeImage](native-image.md) - The icon showing in thumbnail
+* `icon` [NativeImage](../native-image.md) - The icon showing in thumbnail
   toolbar.
 * `click` Function
 * `tooltip` String (optional) - The text of the button's tooltip.