chg: master -> main everywhere

pull/194/head
Raphaël Vinot 2020-09-08 11:42:38 +02:00
parent 430a34e40c
commit 44357ecea9
4 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
# MISP Taxonomies # MISP Taxonomies
[![Build Status](https://travis-ci.org/MISP/misp-taxonomies.svg?branch=master)](https://travis-ci.org/MISP/misp-taxonomies) [![Build Status](https://travis-ci.org/MISP/misp-taxonomies.svg?branch=main)](https://travis-ci.org/MISP/misp-taxonomies)
MISP Taxonomies is a set of common classification libraries to tag, classify and organise information. Taxonomy allows to express the same vocabulary among a distributed set of users and organisations. MISP Taxonomies is a set of common classification libraries to tag, classify and organise information. Taxonomy allows to express the same vocabulary among a distributed set of users and organisations.
@ -197,7 +197,7 @@ The following taxonomy namespaces are reserved and used internally to MISP.
# Documentation # Documentation
A documentation of the taxonomies is [generated automatically](https://github.com/MISP/misp-taxonomies/blob/master/tools/machinetag.py) from the taxonomies description and available in [PDF](https://www.misp.software/taxonomies.pdf) and [HTML](https://www.misp.software/taxonomies.html). A documentation of the taxonomies is [generated automatically](https://github.com/MISP/misp-taxonomies/blob/main/tools/machinetag.py) from the taxonomies description and available in [PDF](https://www.misp.software/taxonomies.pdf) and [HTML](https://www.misp.software/taxonomies.html).
# How to contribute your taxonomy? # How to contribute your taxonomy?

View File

@ -23,7 +23,7 @@ def generateManifest(taxonomies):
manifest = {} manifest = {}
manifest['taxonomies'] = [] manifest['taxonomies'] = []
manifest['path'] = 'machinetag.json' manifest['path'] = 'machinetag.json'
manifest['url'] = 'https://raw.githubusercontent.com/MISP/misp-taxonomies/master/' manifest['url'] = 'https://raw.githubusercontent.com/MISP/misp-taxonomies/main/'
manifest['description'] = 'Manifest file of MISP taxonomies available.' manifest['description'] = 'Manifest file of MISP taxonomies available.'
manifest['license'] = 'CC-0' manifest['license'] = 'CC-0'
now = datetime.now() now = datetime.now()

View File

@ -2,7 +2,7 @@ import json
import requests import requests
debug = False debug = False
galaxy_url = 'https://raw.githubusercontent.com/MISP/misp-galaxy/master/clusters/' galaxy_url = 'https://raw.githubusercontent.com/MISP/misp-galaxy/main/clusters/'
elements = ['tools.json', 'threat-actors.json'] elements = ['tools.json', 'threat-actors.json']
# elements = ['threat-actor-tools.json'] # elements = ['threat-actor-tools.json']

View File

@ -88,7 +88,7 @@ def asciidoc(content=False, adoc=doc, t='title', toplevel=False):
content = '=== ' + content content = '=== ' + content
elif t == 'namespace': elif t == 'namespace':
content = '== ' + content + '\n' content = '== ' + content + '\n'
content = "{}\n{}{} {}{}{} {}".format(content, 'NOTE: ', namespace, 'namespace available in JSON format at https://github.com/MISP/misp-taxonomies/blob/master/', content = "{}\n{}{} {}{}{} {}".format(content, 'NOTE: ', namespace, 'namespace available in JSON format at https://github.com/MISP/misp-taxonomies/blob/main/',
namespace, '/machinetag.json[*this location*]. The JSON format can be freely reused in your application', namespace, '/machinetag.json[*this location*]. The JSON format can be freely reused in your application',
'or automatically enabled in https://www.github.com/MISP/MISP[MISP] taxonomy.') 'or automatically enabled in https://www.github.com/MISP/MISP[MISP] taxonomy.')
elif t == 'description' and toplevel is True: elif t == 'description' and toplevel is True: