diff --git a/doc/keys.conf.example b/doc/keys.conf.example
index 334ec45e1..c188ba7f3 100644
--- a/doc/keys.conf.example
+++ b/doc/keys.conf.example
@@ -11,16 +11,25 @@ rvl-common=
 # Korean common key. This is used by Korean games.
 rvl-korean=
 
+# vWii common key. This is used by vWii-specific titles.
+wup-starbuck-vwii-common=
+
+# RVT-R debug key. This is used by development systems
+# for prototype RVT-R discs.
+rvt-debug=
+
+# RVT-R Korean debug key. Not known to be used...
+rvt-korean=
+
+# vWii debug common key. Not known to be used...
+cat-starbuck-vwii-common=
+
 # SD keys. These are used to decrypt save files
 # that have been copied to an SD card.
 rvl-sd-aes=
 rvl-sd-iv=
 rvl-sd-md5=
 
-# RVT-R debug key. This is used by development systems
-# for prototype RVT-R discs.
-rvt-debug=
-
 ######## Nintendo 3DS ########
 
 ### NOTE: For keys that don't depend on title contents,
diff --git a/doc/rom-properties.conf.example b/doc/rom-properties.conf.example
index 0d72888b4..81ba08990 100644
--- a/doc/rom-properties.conf.example
+++ b/doc/rom-properties.conf.example
@@ -41,3 +41,24 @@ DownloadHighResScans=true
 ; Prefer the internal icon if the file browser requests
 ; a small (48x48 or lower) thumbnail preview.
 UseIntIconForSmallSizes=true
+
+; Store file origin info for downloaded images from
+; online databases.
+StoreFileOriginInfo=true
+
+[Options]
+; Enable thumbnailing on "slow" filesystems.
+EnableThumbnailOnNetworkFS=false
+
+; Show an overlay icon if a ROM image has "dangerous" permissions.
+; Currently only implemented in the KDE UI frontend.
+ShowDangerousPermissionsOverlayIcon=true
+
+[DMGTitleScreenMode]
+; Determine which title screenshot to use for different types
+; of Game Boy games: DMG (original), SGB (Super), CGB (Color).
+; Key = ROM type
+; Value = Screenshot to use
+CGB=CGB
+DMG=DMG
+SGB=SGB