port new changes to en

Author: libremente

docs/en/categories-list.rst

@@ -0,0 +1,112 @@
+.. _categories-list:
+
+List of software categories
+===========================
+
+Here follows a controlled vocabulary of useful tags for categorizing the
+software.
+
+====================================
+Tag
+====================================
+accounting
+agile-project-management
+applicant-tracking
+application-development
+appointment-scheduling
+backup
+billing-and-invoicing
+blog
+budgeting
+business-intelligence
+business-process-management
+cad
+call-center-management
+cloud-management
+collaboration
+communications
+compliance-management
+contact-management
+content-management
+crm
+customer-service-and-support
+data-analytics
+data-collection
+data-visualization
+digital-asset-management
+digital-citizenship
+document-management
+donor-management
+e-commerce
+e-signature
+email-management
+email-marketing
+employee-management
+enterprise-project-management
+enterprise-social-networking
+erp
+event-management
+facility-management
+feedback-and-reviews-management
+financial-reporting
+fleet-management
+fundraising
+gamification
+geographic-information-systems
+grant-management
+graphic-design
+help-desk
+hr
+ide
+identity-management
+instant-messaging
+inventory-management
+it-asset-management
+it-development
+it-management
+it-security
+it-service-management
+knowledge-management
+learning-management-system
+marketing
+mind-mapping
+mobile-marketing
+mobile-payment
+network-management
+office
+online-booking
+online-community
+payment-gateway
+payroll
+predictive-analysis
+procurement
+productivity-suite
+project-collaboration
+project-management
+property-management
+real-estate-management
+remote-support
+resource-management
+sales-management
+seo
+service-desk
+social-media-management
+survey
+talent-management
+task-management
+taxes-management
+test-management
+time-management
+time-tracking
+translation
+video-conferencing
+video-editing
+visitor-management
+voip
+warehouse-management
+web-collaboration
+web-conferencing
+website-builder
+workflow-management
+
+====================================

docs/en/index.rst

@@ -36,7 +36,7 @@ Table of contents
    schema.rst
    country.rst
    forks.rst
-   pa-types.rst
-   tags.rst 
+   categories-list.rst
+   scope-list.rst
    tools.rst
    example.rst

docs/en/pa-types.rst

@@ -197,21 +197,18 @@ Use the predefined values if possible. If the software runs on a
 platform for which a predefined value is not available, a different
 value can be used.
 
-Key ``tags``
-~~~~~~~~~~~~
+Key ``categories``
+~~~~~~~~~~~~~~~~~~
 
 -  Type: array of strings
 -  Presence: mandatory
--  Acceptable values: see :ref:`tags-list` 
+-  Acceptable values: see :ref:`categories-list` 
 
 A list of words that can be used to describe the software and can help
 building catalogs of open software.
 
-Each tag must be in Unicode lowercase, and should not contain any
-Unicode whitespace character. The suggested character to separate
-multiple words is ``-`` (single dash).
-
-See also: ``description/[lang]/freeTags/``
+The controlled vocabulary :ref:`categories-list` contains the list of allowed
+values.
 
 Key ``usedBy``
 ~~~~~~~~~~~~~~
@@ -264,16 +261,22 @@ Key ``softwareType``
 
 -  Type: enumerated string
 -  Presence: mandatory
--  Allowed values: ``standalone``, ``addon``, ``library``,
-   ``configurationFiles``
+-  Allowed values: ``standalone/mobile``, ``standalone/iot``,
+   ``standalone/desktop``, ``standalone/web``, ``standalone/backend``,
+   ``standalone/other``, ``addon``, ``library``, ``configurationFiles``
 
 The keys are:
 
--  ``standalone`` - The software is a standalone, self-contained
-   package. Most software will be of this type. Part of this category is
-   software that can run on a desktop computer (e.g. as an executable),
-   as a cloud-based application, as a network service or even as a set
-   of cloud services or microservices.
+-  ``standalone/mobile`` - The software is a standalone, self-contained
+   The software is a native mobile app.
+-  ``standalone/iot`` - The software is suitable for an IoT context.
+-  ``standalone/desktop`` - The software is typically installed and run in a  
+   a desktop operating system environment.
+-  ``standalone/web`` - The software represents a web application usable by
+   means of a browser. 
+-  ``standalone/backend`` - The software is a backend application.
+-  ``standalone/other`` - The software has a different nature from the once
+   listed above.  
 -  ``softwareAddon`` - The software is an addon, such as a plugin or a
    theme, for a more complex software (e.g. a CMS or an office suite).
 -  ``library`` - The software contains a library or an SDK to make it
@@ -287,27 +290,6 @@ The keys are:
 Section ``intendedAudience``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Key ``intendedAudience/onlyFor``
-''''''''''''''''''''''''''''''''
-
--  Type: enumerated string or array of strings
--  Presence: optional
--  Values: see :ref:`pa-types` 
--  Example: ``"city"``
-
-Public software could be very specific in scope because there is a large
-set of tasks that are specific to each type of administration. For
-instance, many softwares that are used in schools are probably not
-useful in hospitals. If you want to explicitly mark some software as
-only useful to certain types of administrations, you should add them to
-this key.
-
-The list of allowed values is defined in  :ref:`pa-types`,
-and can be country-specific.
-
-This list can evolve at any time, separately from the version of this
-specification.
-
 Key ``intendedAudience/countries``
 ''''''''''''''''''''''''''''''''''
 
@@ -330,6 +312,16 @@ case if there is a conflict between how software is working and a
 specific law, process or technology. All countries are specified using
 lowercase ISO 3166-1 alpha-2 two-letter country codes.
 
+Key ``intendedAudience/scope``
+''''''''''''''''''''''''''''''
+
+-  Type: array of strings
+-  Presence: optional
+-  Acceptable values: see :ref:`scope-list` 
+
+This key contains a list of tags related to the field of application of
+the software. 
+
 Section ``description``
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -465,22 +457,6 @@ Whichever the format for the documentation, remember to make its source
 files available under an open license, possibly by committing them as
 part of the repository itself.
 
-Key ``description/[lang]/freeTags/``
-''''''''''''''''''''''''''''''''''''
-
--  Type: array of strings
--  Presence: optional
-
-This key contains a list of free tags that can be applied to a software.
-
-Since they contain values that do not have an official translation, and
-as such only make sense to a human in a specific language, tags are
-written in a specific language.
-
-Each tag must be in Unicode lowercase, and should not contain any
-Unicode whitespace character. The suggested character to separate
-multiple words is ``-`` (single dash).
-
 Key ``description/[lang]/features``
 '''''''''''''''''''''''''''''''''''