From 03570561535b8edfa38dea3bc1ba307e58f14d0d Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Dec 16 2012 17:09:30 +0000 Subject: Update help functionality and tcar-fs documentation models. Previous to this commit, the help functionality doesn't produce Tcar-fs documentation manual in Texinfo format correctly because of the document structure modifications (i.e., it was removed all the Trunk, Branches and Tags chapters as well as all the related references to them from source files) and the location used as based to produce the documentation. In this commit, I make the help functionality to produce Tcar-fs documentation manual by changing the production base location from repository's first directory level to documentation model's first directory level. Additionally, the following changes were also committed: - Fix some references inside Tcar-fs documentation models themselves in order for the manual to build correctly. - Centralize licenses information. Don't duplicate the Licenses chapter from its default template directory. Instead, create a symbolic link to it. --- diff --git a/Documentation/Models/Texinfo/Default/en_US/Licenses/chapter-nodes.texinfo b/Documentation/Models/Texinfo/Default/en_US/Licenses/chapter-nodes.texinfo index 62f1f60..da69108 100755 --- a/Documentation/Models/Texinfo/Default/en_US/Licenses/chapter-nodes.texinfo +++ b/Documentation/Models/Texinfo/Default/en_US/Licenses/chapter-nodes.texinfo @@ -1,9 +1,9 @@ @node GNU General Public License @section GNU General Public License @cindex GNU General Public License -@include Documentation/Models/Texinfo/Default/en_US/Licenses/GPL.texinfo +@include Licenses/GPL.texinfo @node GNU Free Documentation License @section GNU Free Documentation License @cindex GNU Free Documentation License -@include Documentation/Models/Texinfo/Default/en_US/Licenses/GFDL.texinfo +@include Licenses/GFDL.texinfo diff --git a/Documentation/Models/Texinfo/Default/es_ES/Licenses/chapter-nodes.texinfo b/Documentation/Models/Texinfo/Default/es_ES/Licenses/chapter-nodes.texinfo index 2f94df2..e7eded9 100755 --- a/Documentation/Models/Texinfo/Default/es_ES/Licenses/chapter-nodes.texinfo +++ b/Documentation/Models/Texinfo/Default/es_ES/Licenses/chapter-nodes.texinfo @@ -1,9 +1,9 @@ @node GNU General Public License @section Licencia Pública General de GNU @cindex Licencia pública general GNU -@include Documentation/Models/Texinfo/Default/Licenses/GPL.texinfo +@include Licenses/GPL.texinfo @node GNU Free Documentation License @section Licencia de Documentación Libre de GNU @cindex Licencia documentación libre GNU -@include Documentation/Models/Texinfo/Default/Licenses/GFDL.texinfo +@include Licenses/GFDL.texinfo diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/Fonts.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/Fonts.texinfo index a77a537..7eaeee9 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/Fonts.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/Fonts.texinfo @@ -1,14 +1,14 @@ -@node Trunk Identity Fonts -@section @file{trunk/Identity/Fonts} -@cindex Trunk identity fonts +@node Identity Fonts +@section @file{Identity/Fonts} +@cindex Identity fonts -The @file{trunk/Identity/Fonts} directory exists to organize +The @file{Identity/Fonts} directory exists to organize typographies used inside @value{TCPCVI} that aren't packaged inside @value{TCD}. -The @file{trunk/Identity/Fonts} directory is under version control. +The @file{Identity/Fonts} directory is under version control. -Content rendition inside @file{trunk/Identity/Fonts} directory is not +Content rendition inside @file{Identity/Fonts} directory is not supported. @c -- describe, in one paragraph, what a font is. @@ -19,31 +19,31 @@ Inkscape, font files should be stored either in are out of @value{TCAR} and doesn't provide version control by themselves. In order for version controlled typographies to be available inside programs like GIMP and Inkscape, we store them under -@file{trunk/Identity/Fonts} directory and create links to them from +@file{Identity/Fonts} directory and create links to them from @file{~/.fonts} directory. -@float Example, trunk-identity-fonts-1 +@float Example, identity-fonts-1 @verbatim -trunk/Identity/Fonts +Identity/Fonts `-- denmark.ttf (file) <-- ~/.fonts/denmark.ttf (link) @end verbatim @caption{Relation between fonts inside the workstation.} @end float -The creation and maintainance of links related to fonts inside the +The creation and maintenance of links related to fonts inside the working copy are automated by @code{prepare} functionality of @command{centos-art.sh} script. Inside @value{TCPCVI}, the @samp{DejaVu LGC} typography is used as default typography in all visual manifestations. The @samp{DejaVu LGC} typography comes with @value{TCD} so there is no need to store it in -@file{trunk/Identity/Fonts} for you to use. +@file{Identity/Fonts} for you to use. Inside @value{TCPCVI}, the @samp{Denmark} typography is used as base to build The CentOS Logo (i.e., the main graphic design that connects/identifies all visual manifestations related to The CentOS Project). The @samp{Denmark} typography doesn't come with @value{TCD} -so it is store in @file{trunk/Identity/Fonts} for you to use. +so it is store in @file{Identity/Fonts} for you to use. The license information of @samp{Denmark} typography isn't very clear, at least not as clear as the one in @samp{DejaVu LGC} typography is. diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes-corporate.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes-corporate.texinfo index 8a72508..c9e707c 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes-corporate.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes-corporate.texinfo @@ -1,10 +1,8 @@ @node Identity Brushes Corporate @section @file{Identity/Brushes/Corporate} -@cindex identity brushes corporate +@cindex Identity brushes corporate ... @c -- <[centos-art(SeeAlso) -@itemize -@end itemize @c -- ]> diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes.texinfo index 05c7990..6bbf699 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/brushes.texinfo @@ -1,6 +1,6 @@ @node Identity Brushes @section @file{Identity/Brushes} -@cindex identity brushes +@cindex Identity brushes The @file{Identity/Brushes} directory exists to organize GIMP brushes used inside @value{TCPCVI}. @@ -32,7 +32,7 @@ of using version controlled brushes inside GIMP, we store brush related files inside @file{Identity/Brushes} directory and create links to them from @file{~/.gimp-2.2/brushes} directory. -@float Example,trunk-identity-brushes-1 +@float Example,identity-brushes-1 @verbatim Identity/Brushes |-- Corporate @@ -51,17 +51,17 @@ Identity/Brushes @caption{Relation between brushes inside the workstation.} @end float -The entire link preparation and maintainance of brushes inside the +The entire link preparation and maintenance of brushes inside the working copy is automated by @code{prepare} functionality of @command{centos-art.sh} script. Inside the working copy, brushes might be created individually in different locations, but they all need to be linked from one unique location (i.e., @file{~/.gimp-2.2/brushes}). This configuration may -provoke brushes to overlap one another if a consistent name -convenction is not implemented correctly. In that sake, the brushes -file names are build using their directory and file names as reference -in order to build unique names that can be used as identifiers. +provoke brushes to overlap one another if a consistent name convention +is not implemented correctly. In that sake, the brushes file names +are build using their directory and file names as reference in order +to build unique names that can be used as identifiers. Brushes produced with GIMP has a description field associated that is shown in the Brushes panel of GIMP. This description is set when the diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-menu.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-menu.texinfo index c055a60..a293921 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-menu.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-menu.texinfo @@ -11,7 +11,6 @@ * Identity Models:: * Identity Models Brands:: * Identity Models Brands Logos:: -* Identity Models Icons:: * Identity Models Themes:: * Identity Palettes:: * Identity Patterns:: diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-nodes.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-nodes.texinfo index d95885c..ec7c372 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-nodes.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/chapter-nodes.texinfo @@ -10,7 +10,6 @@ @include Identity/models.texinfo @include Identity/models-brands.texinfo @include Identity/models-brands-logos.texinfo -@include Identity/models-icons.texinfo @include Identity/models-themes.texinfo @include Identity/palettes.texinfo @include Identity/patterns.texinfo diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/fonts.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/fonts.texinfo index 524df6f..7eaeee9 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/fonts.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/fonts.texinfo @@ -1,6 +1,6 @@ @node Identity Fonts @section @file{Identity/Fonts} -@cindex identity fonts +@cindex Identity fonts The @file{Identity/Fonts} directory exists to organize typographies used inside @value{TCPCVI} that aren't packaged inside @@ -22,7 +22,7 @@ available inside programs like GIMP and Inkscape, we store them under @file{Identity/Fonts} directory and create links to them from @file{~/.fonts} directory. -@float Example, trunk-identity-fonts-1 +@float Example, identity-fonts-1 @verbatim Identity/Fonts `-- denmark.ttf (file) <-- ~/.fonts/denmark.ttf (link) @@ -30,7 +30,7 @@ Identity/Fonts @caption{Relation between fonts inside the workstation.} @end float -The creation and maintainance of links related to fonts inside the +The creation and maintenance of links related to fonts inside the working copy are automated by @code{prepare} functionality of @command{centos-art.sh} script. diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/identity.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/identity.texinfo deleted file mode 100644 index 788f31e..0000000 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/identity.texinfo +++ /dev/null @@ -1,33 +0,0 @@ -@node Trunk Identity -@section @file{trunk/Identity} -@cindex Trunk identity - -The @file{trunk/Identity} directory describes @value{TCPCI}, what it -is and the components it is made of. - -@value{TCPCI} is the ``persona'' of the organization known as The -CentOS Project. The CentOS Project Corporate Identity plays a -significant role in the way The CentOS Project, as organization, -presents itself to both internal and external stakeholders. In general -terms, The CentOS Project Corporate Identity expresses the values and -ambitions of The CentOS Project organization, its business, and its -characteristics. @value{TCPCI} provides visibility, recognizability, -reputation, structure and identification to The CentOS Project by -means of Corporate Design, Corporate Communication, and Corporate -Behaviour. - -From Corporate Design, Corporate Communication and Corporate -Behaviour, it is the Corporate Design the one organized inside -@file{trunk/Identity} directory through the following components: - -@c -- <[centos-art(SeeAlso) -@itemize -@item @ref{Trunk Identity Brushes} -@item @ref{Trunk Identity Fonts} -@item @ref{Trunk Identity Images} -@item @ref{Trunk Identity Models} -@item @ref{Trunk Identity Palettes} -@item @ref{Trunk Identity Patterns} -@item @ref{Trunk Identity Webenv} -@end itemize -@c -- ]> diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-logos.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-logos.texinfo index d0fcddb..aafccb9 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-logos.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-logos.texinfo @@ -1,6 +1,6 @@ @node Identity Images Brands Logos @section @file{Identity/Images/Brands/Logos} -@cindex identity images brands logos +@cindex Identity images brands logos The @file{Identity/Images/Brands/Logos} exists to organize images related to The CentOS Logos, in different formats (e.g., PNG, @@ -12,7 +12,7 @@ manifestations of the organization known as @value{TCPROJ}. As The CentOS Symbol, The CentOS Logo is used to ``brand'' images produced by @value{TCPROJ} and provide a visual connection between images so they can be monolithically recognized as part of @value{TCPROJ}. The CentOS -Logo must be exactly the same everytime it is printed out and a route +Logo must be exactly the same every time it is printed out and a route to reproduce it in such a way must be available so as to avoid reproduction mistakes when images are branded with it. diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-types.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-types.texinfo index e01fc79..494db0b 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-types.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands-types.texinfo @@ -9,10 +9,10 @@ JPG, PDF, TIF, XBM, XPM) and dimensions. The CentOS Type is the typographical part of The CentOS Logo. Comparing with both The CentOS Logo and The CentOS Symbol, The CentOS Type by its own, provides poor visual connection between images that -intend to be recongnized as a monolithic part of @value{TCPROJ} and +intend to be recognized as a monolithic part of @value{TCPROJ} and shouldn't be used alone. Instead, The CentOS Logo or The CentOS Symbol -are prefered. The CentOS Symbol must be exactly the same everytime it -is printed out and a route to reproduce it in such a way must be +are preferred. The CentOS Symbol must be exactly the same every time +it is printed out and a route to reproduce it in such a way must be available so as to avoid reproduction mistakes when images are branded with it. diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands.texinfo index 5584f10..46b12ab 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-brands.texinfo @@ -1,6 +1,6 @@ @node Identity Images Brands @section @file{Identity/Images/Brands} -@cindex identity images brands +@cindex Identity images brands The @file{Identity/Images/Brands} directory exists to organize brand information related to @value{TCPROJ}. diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-icons.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-icons.texinfo index 4ab48dd..a332608 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-icons.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-icons.texinfo @@ -1,10 +1,8 @@ @node Identity Models Icons @section @file{Identity/Models/Icons} -@cindex identity models icons +@cindex Identity models icons ... @c -- <[centos-art(SeeAlso) -@itemize -@end itemize @c -- ]> diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-themes.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-themes.texinfo index e9d12da..cf3a6d9 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-themes.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images-themes.texinfo @@ -1,6 +1,6 @@ @node Identity Images Themes @section @file{Identity/Images/Themes} -@cindex identity images themes +@cindex Identity images themes ... @menu diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images.texinfo index 81cdfa8..2971bd3 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/images.texinfo @@ -1,6 +1,6 @@ @node Identity Images @section @file{Identity/Images} -@cindex identity images +@cindex Identity images The @file{Identity/Images} directory exists to store all image files (e.g., PNG, JPG, PPM, etc.) related to @value{TCPCVI}. @@ -11,10 +11,6 @@ The @file{Identity/Images} directory contains no file, but the following organizational directories: @c -- <[centos-art(SeeAlso) -@itemize -@item @ref{Identity Images Brands} -@item @ref{Identity Images Themes} -@end itemize @c -- ]> Content rendition inside @file{Identity/Images} directory takes diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-brands-logos.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-brands-logos.texinfo index db72930..d7d98d9 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-brands-logos.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-brands-logos.texinfo @@ -1,6 +1,6 @@ @node Identity Models Brands Logos @section @file{Identity/Models/Brands/Logos} -@cindex identity models brands logos +@cindex Identity models brands logos ... diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-themes.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-themes.texinfo index c0561ba..37504c2 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-themes.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models-themes.texinfo @@ -1,10 +1,8 @@ @node Identity Models Themes @section @file{Identity/Models/Themes} -@cindex identity models themes +@cindex Identity models themes ... @c -- <[centos-art(SeeAlso) -@itemize -@end itemize @c -- ]> diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models.texinfo index 4b12b4b..dfafe4d 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/models.texinfo @@ -7,7 +7,6 @@ @c -- <[centos-art(SeeAlso) @itemize @item @ref{Identity Models Brands} -@item @ref{Identity Models Icons} @item @ref{Identity Models Themes} @end itemize @c -- ]> diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/palettes.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/palettes.texinfo index b618c74..7ae9984 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/palettes.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/palettes.texinfo @@ -1,6 +1,6 @@ @node Identity Palettes @section @file{Identity/Palettes} -@cindex identity palettes +@cindex Identity palettes ... @menu diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/patterns.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/patterns.texinfo index c6d5a69..1157522 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/patterns.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/patterns.texinfo @@ -1,6 +1,7 @@ @node Identity Patterns @section @file{Identity/Patterns} -@cindex identity patterns +@cindex Identity patterns + ... @menu diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/webenv.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/webenv.texinfo index 1f23537..1571757 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/webenv.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Identity/webenv.texinfo @@ -1,6 +1,6 @@ @node Identity Webenv @section @file{Identity/Webenv} -@cindex identity webenv +@cindex Identity webenv ... @menu diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Licenses/chapter-nodes.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Licenses/chapter-nodes.texinfo index 62f1f60..da69108 100755 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Licenses/chapter-nodes.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Licenses/chapter-nodes.texinfo @@ -1,9 +1,9 @@ @node GNU General Public License @section GNU General Public License @cindex GNU General Public License -@include Documentation/Models/Texinfo/Default/en_US/Licenses/GPL.texinfo +@include Licenses/GPL.texinfo @node GNU Free Documentation License @section GNU Free Documentation License @cindex GNU Free Documentation License -@include Documentation/Models/Texinfo/Default/en_US/Licenses/GFDL.texinfo +@include Licenses/GFDL.texinfo diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/chapter.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/chapter.texinfo index 9a5e227..7ca2cf9 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/chapter.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/chapter.texinfo @@ -1,6 +1,6 @@ -@node Scripts +@nod Scripts @chapter The @file{Scripts} Directory -@cindex The @file{Scripts} Directory +@cindex Scripts @c -- Chapter Introduction @@ -69,7 +69,7 @@ where @var{BASEDIR} is an absolute path inside your workstation, @end defvar @c -- Chapter Menu -@include Identity/chapter-menu.texinfo +@include Scripts/chapter-menu.texinfo @c -- Chapter Nodes -@include Identity/chapter-nodes.texinfo +@include Scripts/chapter-nodes.texinfo diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/functions.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/functions.texinfo index eeae3a6..c237c21 100644 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/functions.texinfo +++ b/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/functions.texinfo @@ -1,5 +1,5 @@ @node Scripts Functions -@section @file{Scripts/Functions} +@section The @file{Scripts/Functions} directory @cindex Scripts functions The @file{Scripts/Functions} directory exists to organize common and @@ -31,7 +31,7 @@ string as described below: The @code{cli} functionality initializes the command-line interface (cli) of @command{centos-art.sh} script. This function evaluates the first argument provided to @command{centos-art.sh} script and call the -specific functionality that respondes to it. The @code{cli} function +specific functionality that responds to it. The @code{cli} function is directly called from @file{centos-art.sh} itself once global variables are defined, working copy verification performed, common functionalities exported into the execution environment, and signals diff --git a/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/scripts.texinfo b/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/scripts.texinfo deleted file mode 100644 index e69de29..0000000 --- a/Documentation/Models/Texinfo/Tcar-fs/en_US/Scripts/scripts.texinfo +++ /dev/null diff --git a/Scripts/Bash/Functions/Commons/cli_exportFunctions.sh b/Scripts/Bash/Functions/Commons/cli_exportFunctions.sh index 7a44774..30a6272 100755 --- a/Scripts/Bash/Functions/Commons/cli_exportFunctions.sh +++ b/Scripts/Bash/Functions/Commons/cli_exportFunctions.sh @@ -31,9 +31,7 @@ function cli_exportFunctions { # Verify the export identification existence. This argument must # be passed as first argument and match a relative path format. - if [[ ! $EXPORTID ]] || [[ $EXPORTID == '' ]];then - cli_printMessage "`gettext "The export id must be passed as first argument."`" --as-error-line - elif [[ ! $EXPORTID =~ '^[A-Z][[:alpha:]]+(/[[:alpha:]_]+)+$' ]];then + if [[ ! $EXPORTID =~ '^[A-Z][[:alpha:]]+(/[[:alpha:]_]+)+$' ]];then cli_printMessage "`gettext "The export id doesn't match its pattern."`" --as-error-line fi diff --git a/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructureChapters.sh b/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructureChapters.sh index f9c7c48..4b21640 100755 --- a/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructureChapters.sh +++ b/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructureChapters.sh @@ -29,13 +29,15 @@ function texinfo_createStructureChapters { local MANUAL_CHAPTER_DIR='' # Define list of chapter templates files used to build the - # documentation manual. Do not include the `Chapters' directory - # here. It is used to build chapters based on value passed though - # `--chapter' option passed in the command-line. + # documentation manual. Do not include the `Chapters' and + # `Licenses' directory here. The Chapters directory is used to + # build chapters based on value of `--chapter' option passed + # through the command-line. The `Licenses' directory is linked + # from its default template directory. local FILE='' local FILES=$(cli_getFilesList ${MANUAL_TEMPLATE_L10N} \ --pattern="^.+/chapter(-menu|-nodes)?\.${MANUAL_EXTENSION}$" --mindepth='2' \ - | grep -v '/Chapters/') + | egrep -v '/(Chapters|Licenses)/') # Loop through chapter structures and create them inside the # manual. @@ -62,4 +64,14 @@ function texinfo_createStructureChapters { done + # Create link to `Licenses' default template directory. There + # isn't a need to duplicate this information. In fact it is + # important not to have it duplicated so we can centralize such + # information for all documentation manuals. + if [[ -d ${MANUAL_CHAPTER_DIR}/Licenses ]];then + rm -r ${MANUAL_CHAPTER_DIR}/Licenses + else + ln -s ${TCAR_WORKDIR}/Documentation/Models/Texinfo/Default/${CLI_LANG_LL}/Licenses ${MANUAL_CHAPTER_DIR}/Licenses + fi + } diff --git a/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFiles.sh b/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFiles.sh index 5751dd8..cb8f43e 100755 --- a/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFiles.sh +++ b/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFiles.sh @@ -40,7 +40,7 @@ function texinfo_updateOutputFiles { # Add the working copy root directory to directory stack to make # path construction correctly. Otherwise, makeinfo may produce # paths incorrectly. - pushd ${TCAR_WORKDIR} > /dev/null + pushd ${MANUAL_BASEDIR_L10N} > /dev/null texinfo_updateOutputFileInfo texinfo_updateOutputFileXhtml