FIX Update sources with correct branchs for v4

Also re-arrange the sources to relate directly to the CMS major version
to make it easier to update for subsequent majors.

sources-user.js

@@ -1,5 +1,4 @@
 module.exports = [
-  /******* main content *********/
   // v4
   {
     resolve: `gatsby-source-git`,
@@ -10,6 +9,169 @@ module.exports = [
       patterns: `docs/en/**`
     }
   },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/setting_up_advancedworkflow`,
+      remote: `https://github.com/symbiote/silverstripe-advancedworkflow`,
+      branch: `5`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/online_databases_and_registries`,
+      remote: `https://github.com/silverstripe/silverstripe-registry`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/content_review`,
+      remote: `https://github.com/silverstripe/silverstripe-contentreview`,
+      branch: `4`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/blogs`,
+      remote: `https://github.com/silverstripe/silverstripe-blog`,
+      branch: `3`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/forms`,
+      remote: `https://github.com/silverstripe/silverstripe-userforms`,
+      branch: `5`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/working_with_multiple_websites`,
+      remote: `https://github.com/silverstripe/silverstripe-subsites`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/taxonomies`,
+      remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/iframe`,
+      remote: `https://github.com/silverstripe/silverstripe-iframe`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/site_wide_rss_feeds`,
+      remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/content_blocks`,
+      remote: `https://github.com/dnadesign/silverstripe-elemental`,
+      branch: `4`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/modules_report`,
+      remote: `https://github.com/bringyourownideas/silverstripe-maintenance`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/share_draft_content`,
+      remote: `https://github.com/silverstripe/silverstripe-sharedraftcontent`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/document_converter`,
+      remote: `https://github.com/silverstripe/silverstripe-documentconverter`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/ckan_registry`,
+      remote: `https://github.com/silverstripe/silverstripe-ckan-registry`,
+      branch: `1`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/multi-factor_authentication`,
+      remote: `https://github.com/silverstripe/silverstripe-mfa`,
+      branch: `4`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--managing_your_website/reports/security_report`,
+      remote: `https://github.com/silverstripe/silverstripe-securityreport`,
+      branch: `2`,
+      patterns: `docs/en/userguide/**`,
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--managing_your_website/reports/sitewide_content_report`,
+      remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
+      branch: `3`,
+      patterns: `docs/en/userguide/**`,
+    }
+  },
+  {
+    resolve: `gatsby-source-git`,
+    options: {
+      name: `user--4--optional_features/managing_devices`,
+      remote: `https://github.com/silverstripe/silverstripe-session-manager`,
+      branch: `1`,
+      patterns: `docs/en/userguide/**`
+    }
+  },
+
   // v3
   {
     resolve: `gatsby-source-git`,
@@ -20,9 +182,6 @@ module.exports = [
       patterns: `docs/en/**`
     }
   },
-
-  
-  // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -32,11 +191,7 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-  
-  // v3
   {
-      // Running a fork. Switch remote back once merged.
     resolve: `gatsby-source-git`,
     options: {
       name: `user--3--optional_features/setting_up_advancedworkflow`,
@@ -45,21 +200,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/setting_up_advancedworkflow`,
-        remote: `https://github.com/symbiote/silverstripe-advancedworkflow`,
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* registry ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -69,21 +209,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/online_databases_and_registries`,
-        remote: `https://github.com/silverstripe/silverstripe-registry`,
-        branch: `master`,          
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* forum ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -93,24 +218,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    /******* contentreview ********/
-
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/content_review`,
-        remote: `https://github.com/silverstripe/silverstripe-contentreview`,
-        branch: `master`,          
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* blog ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -120,34 +227,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/blogs`,
-        remote: `https://github.com/silverstripe/silverstripe-blog`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* userforms ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/forms`,
-        remote: `https://github.com/silverstripe/silverstripe-userforms`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* translatable ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -157,10 +236,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    /******* subsites ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -170,21 +245,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/working_with_multiple_websites`,
-        remote: `https://github.com/silverstripe/silverstripe-subsites`,
-        branch: `1.1`,          
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* secureassets ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -194,10 +254,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    /******* taxonomy ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -207,21 +263,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/taxonomies`,
-        remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* iframe ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -231,21 +272,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/iframe`,
-        remote: `https://github.com/silverstripe/silverstripe-iframe`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* versionfeed ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -255,21 +281,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/site_wide_rss_feeds`,
-        remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* dms ********/
-
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -279,96 +290,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
-    /******* elemental ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/content_blocks`,        
-        remote: `https://github.com/dnadesign/silverstripe-elemental`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/modules_report`,
-        remote: `https://github.com/bringyourownideas/silverstripe-maintenance`,        
-        branch: `1`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* sharedraftcontent ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/share_draft_content`,
-        remote: `https://github.com/silverstripe/silverstripe-sharedraftcontent`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* documentconverter ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/document_converter`,
-        remote: `https://github.com/silverstripe/silverstripe-documentconverter`,
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* ckan-registry ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/ckan_registry`,
-        remote: `https://github.com/silverstripe/silverstripe-ckan-registry`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******* mfa ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/multi-factor_authentication`,
-        remote: `https://github.com/silverstripe/silverstripe-mfa`,
-        branch: `master`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
-
-    /******** securityreport ********/
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--managing_your_website/reports/security_report`,
-        remote: `https://github.com/silverstripe/silverstripe-securityreport`,          
-        branch: `master`,
-        patterns: `docs/en/userguide/**`,
-      }        
-    },
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -378,19 +299,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`,
     }
   },
-
-    /******** sitewide-content-report ********/
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--managing_your_website/reports/sitewide_content_report`,
-        remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
-        branch: `master`,
-        patterns: `docs/en/userguide/**`,
-      }        
-    },
-    // v3
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -400,17 +308,4 @@ module.exports = [
       patterns: `docs/en/userguide/**`,
     }
   },
-
-    /******* session-manager ********/
-
-    // v4
-    {
-      resolve: `gatsby-source-git`,
-      options: {
-        name: `user--4--optional_features/managing_devices`,
-        remote: `https://github.com/silverstripe/silverstripe-session-manager`,
-        branch: `1`,
-        patterns: `docs/en/userguide/**`        
-      }
-    },
 ];