diff --git a/Scripts/Bash/Functions/Commons/cli_checkRepoDirSource.sh b/Scripts/Bash/Functions/Commons/cli_checkRepoDirSource.sh
index 498da4a..e853214 100755
--- a/Scripts/Bash/Functions/Commons/cli_checkRepoDirSource.sh
+++ b/Scripts/Bash/Functions/Commons/cli_checkRepoDirSource.sh
@@ -4,13 +4,15 @@
 # construction to directories inside the working copy, using absolute
 # paths. This function transforms relative paths passed as non-option
 # arguments to centos-art.sh script command-line into absolute paths
-# inside the working copy. Further verifications, (e.g., whether they
-# really exist as directories inside the working copy or not) should
-# be realized outside this function. 
+# inside the working copy based on whether you are using Subversion or
+# Git as version control system. Further verifications, (e.g., whether
+# they really exist as directories inside the working copy or not)
+# should be realized outside this function.
 #
-#   NOTE: Transforming relative paths into absolute paths before
-#   processing them is very useful when you need to execute the
-#   centos-art.sh script anywhere inside the workstation.
+# NOTE: Transforming relative paths into absolute paths before
+# processing them is very useful when you need to execute the
+# centos-art.sh script as command (e.g., `centos-art') anywhere
+# inside the workstation.
 #
 # Use this function whenever you need to be sure that non-option
 # arguments passed to centos-art.sh script command-line will always
@@ -40,19 +42,36 @@ function cli_checkRepoDirSource {
 
     local LOCATION=${1}
 
-    # Redefine source value to build repository absolute path from
-    # repository top level on. As we are removing the absolute path
-    # prefix (e.g., `/home/centos/artwork/') from all centos-art.sh
-    # output (in order to save horizontal output space), we need to be
-    # sure that all strings begining with `trunk/...', `branches/...',
-    # and `tags/...' use the correct absolute path. That is, you can
-    # refer trunk's entries using both
-    # `/home/centos/artwork/trunk/...' or just `trunk/...', the
-    # `/home/centos/artwork/' part is automatically added here. 
-    if [[ $LOCATION =~ '^(trunk|branches|tags)' ]];then
-        LOCATION=${TCAR_WORKDIR}/$LOCATION
-    fi
+    # When we use Subversion as version control system, we follow the
+    # `trunk', `branches', `tags' convention to organize files inside
+    # the repository and need to redefine the source path in order to
+    # build repository absolute path from repository's top level on.
+    #
+    # As we are removing the absolute path prefix (e.g.,
+    # `/home/centos/artwork/') from all centos-art.sh output (in order
+    # to save horizontal output space), we need to be sure that all
+    # strings beginning with `trunk/...', `branches/...', and
+    # `tags/...' use the correct absolute path. That is, you can refer
+    # trunk's entries using both `/home/centos/artwork/trunk/...' or
+    # just `trunk/...', the `/home/centos/artwork/' part is
+    # automatically added here.
+    #
+    # When we use Git as version control system, there isn't a need of
+    # using the `trunk', `branches', `tags' convention we were using
+    # for Subversion.  Instead, we use a Git remote branch named
+    # `develop' to do most of the work. Then, when we have something
+    # functional in `develop' branch, we merge `develop' branch into
+    # the `master' branch (probably doing a rebase on master branch).
+    #
+    # There isn't a need of verifying the paths built here.  This is
+    # something we do later, using the cli_checkFiles function. We
+    # don't do the file verification here to avoid malformed error
+    # messages when we reassign variable values using this function as
+    # reference (e.g., in order to prevent error messages to be also
+    # stored inside variables.).
+    LOCATION=${TCAR_WORKDIR}/${LOCATION}
 
-    # Output absolute path to location.
+    # Output the absolute path to location.
     echo "${LOCATION}"
+
 }
diff --git a/Scripts/Bash/Functions/Commons/cli_expandTMarkers.sh b/Scripts/Bash/Functions/Commons/cli_expandTMarkers.sh
index a4e3d0b..d3b71f7 100755
--- a/Scripts/Bash/Functions/Commons/cli_expandTMarkers.sh
+++ b/Scripts/Bash/Functions/Commons/cli_expandTMarkers.sh
@@ -34,10 +34,9 @@ function cli_expandTMarkers {
     local COUNT=0
     local COUNTSRC=0
     local COUNTDST=0
-    local LOCATION=''
 
     # Define source location on which sed replacements take place.
-    LOCATION="$1" 
+    local LOCATION="$1"
 
     # Verify that source location does exist.
     cli_checkFiles -e ${LOCATION}
@@ -130,9 +129,7 @@ function cli_expandTMarkers {
     fi
 
     # Define repository translation markers.
-    SRC[((++${#SRC[*]}))]='=REPO_TLDIR='
-    DST[((++${#DST[*]}))]="${TCAR_WORKDIR}/trunk"
-    SRC[((++${#SRC[*]}))]='=(REPO_HOME|TCAR_WORKDIR)='
+    SRC[((++${#SRC[*]}))]='=(REPO_TLDIR|REPO_HOME|TCAR_WORKDIR)='
     DST[((++${#DST[*]}))]="${TCAR_WORKDIR}"
 
     # Do replacement of nested translation markers.
diff --git a/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh b/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh
index 126e2cb..954d877 100755
--- a/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh
+++ b/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh
@@ -43,7 +43,7 @@ function cli_getPathComponent {
 
     # Define regular expression pattern that match the theme artistic
     # motif component inside the path strings.
-    local THEME_MOTIF="trunk/Identity/Images/Themes/(([[:alnum:]]+)/(${RELEASE}))"
+    local THEME_MOTIF="Identity/Images/Themes/(([[:alnum:]]+)/(${RELEASE}))"
 
     # Initialize arguments with an empty value and set it as local
     # variable to this function scope. Doing this is very important to
diff --git a/Scripts/Bash/Functions/Commons/cli_getRepoName.sh b/Scripts/Bash/Functions/Commons/cli_getRepoName.sh
index 5a234df..cc5381b 100755
--- a/Scripts/Bash/Functions/Commons/cli_getRepoName.sh
+++ b/Scripts/Bash/Functions/Commons/cli_getRepoName.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# cli_getRepoName.sh -- This function standardize file and directories
-# name convection inside the working copy of CentOS Artowrk
-# Repository. As convection, regular files are written in lower case
-# and directories are written in lower case but with the first letter
-# in upper case.  Use this function to sanitate the name of regular
-# files and directory components of paths you work with.
+# cli_getRepoName.sh -- This function standardizes files and
+# directories name convection inside the working copy of CentOS
+# Artowrk Repository. As convection, regular files are written in
+# lower-case and directories are written capitalized.  Use this
+# function to sanitate the name of regular files and directories on
+# paths you work with.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
 #
@@ -78,12 +78,12 @@ function cli_getRepoName {
                 # When path information is reduced, we need to
                 # consider that absolute paths contain some
                 # directories outside the working copy directory
-                # structure that shouldn't be sanitated  (e.g., /home,
+                # structure that shouldn't be sanitized (e.g., /home,
                 # /home/centos, /home/centos/artwork,
                 # /home/centos/artwork/turnk, trunk, etc.) So, we keep
-                # them unchaged for later use.
+                # them unchanged for later use.
                 PREFIXDIR=$(echo $NAME \
-                    | sed -r "s,^((${TCAR_WORKDIR}/)?(trunk|branches|tags)/).+$,\1,")
+                    | sed -r "s,^((${TCAR_WORKDIR}/)?(trunk|branches|tags)/)?.+$,\1,")
 
                 # ... and remove them from the path information we do
                 # want to sanitate.
@@ -110,15 +110,15 @@ function cli_getRepoName {
                         | sed -r 's/^([[:alpha:]])/\u\1/')
                 fi
 
-                # Rebuild path using sanitated values.
+                # Rebuild path using sanitized values.
                 CLEANDIRS="${CLEANDIRS}/$DIR"
 
             done
 
-            # Redefine path using sanitated values.
+            # Redefine path using sanitized values.
             NAME=$(echo ${CLEANDIRS} | sed -r "s!^/!!")
 
-            # Add prefix directory information to sanitated path
+            # Add prefix directory information to sanitate path
             # information.
             if [[ "$PREFIXDIR" != '' ]];then
                 NAME=${PREFIXDIR}${NAME}
diff --git a/Scripts/Bash/Functions/Commons/cli_printMessage.sh b/Scripts/Bash/Functions/Commons/cli_printMessage.sh
index e2f379a..40a6cfa 100755
--- a/Scripts/Bash/Functions/Commons/cli_printMessage.sh
+++ b/Scripts/Bash/Functions/Commons/cli_printMessage.sh
@@ -53,7 +53,8 @@ function cli_printMessage {
             # paths in order to free horizontal space on final output
             # messages.
             echo "$MESSAGE" | sed -r \
-                -e "s!${TCAR_WORKDIR}/(trunk|branches|tags)/!\1/!g" \
+                -e "s!${TCAR_WORKDIR}/!!g" \
+                -e "s!> /!> !g" \
                 -e "s!/{2,}!/!g" \
                 | awk 'BEGIN { FS=": " }
                     { 
@@ -75,7 +76,7 @@ function cli_printMessage {
             # Build the error message.
             cli_printMessage "${CLI_NAME} (${ORIGIN}):" --as-stdout-line
             cli_printMessage "${MESSAGE}" --as-response-line
-            cli_printMessage "${CLI_FUNCDIRNAM}" --as-toknowmore-line
+            cli_printMessage "${CLI_FUNCNAME}" --as-toknowmore-line
 
             # Finish script execution with exit status 1 (SIGHUP) to
             # imply the script finished because an error.  We are
@@ -86,8 +87,7 @@ function cli_printMessage {
 
         --as-toknowmore-line )
             cli_printMessage '-' --as-separator-line
-            cli_printMessage "`gettext "To know more, run the following command"`:" --as-stdout-line
-            cli_printMessage "centos-art help --read trunk/Scripts/Functions/$MESSAGE" --as-stdout-line
+            cli_printMessage "`gettext "To know more, run"` ${CLI_NAME} ${MESSAGE} --help" --as-stdout-line
             cli_printMessage '-' --as-separator-line
             ;;
 
@@ -144,12 +144,12 @@ function cli_printMessage {
 
         --as-notrailingnew-line )
             echo -e -n "${MESSAGE}" | sed -r \
-                -e "s!${TCAR_WORKDIR}/(trunk|branches|tags)/!\1/!g"
+                -e "s!${TCAR_WORKDIR}/!!g"
             ;;
 
         --as-stderr-line )
             echo "$MESSAGE" | sed -r \
-                -e "s!${TCAR_WORKDIR}/(trunk|branches|tags)/!\1/!g" 1>&2
+                -e "s!${TCAR_WORKDIR}/!!g" 1>&2
             ;;
 
     esac
diff --git a/Scripts/Bash/Functions/Help/Texinfo/texinfo.sh b/Scripts/Bash/Functions/Help/Texinfo/texinfo.sh
index 3c67188..0cd2abe 100755
--- a/Scripts/Bash/Functions/Help/Texinfo/texinfo.sh
+++ b/Scripts/Bash/Functions/Help/Texinfo/texinfo.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 #
-# texinfo.sh -- This function initilializes Texinfo documentation
-# format used by `centos-art.sh' script to produce and maintain
-# documentation manuals written in Texinfo format, inside the working
-# copy of The CentOS Artwork Repository.
+# texinfo.sh -- This function initializes Texinfo documentation format
+# used by `centos-art.sh' script to produce and maintain documentation
+# manuals written in Texinfo format, inside the working copy of The
+# CentOS Artwork Repository.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
 #
diff --git a/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructure.sh b/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructure.sh
index a2683c7..0e7de26 100755
--- a/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructure.sh
+++ b/Scripts/Bash/Functions/Help/Texinfo/texinfo_createStructure.sh
@@ -58,7 +58,7 @@ function texinfo_createStructure {
     fi
 
     # Create manual's top-level directory using subversion. This is
-    # the place where all texinfo documentation manuals is stored in.
+    # the place where all texinfo documentation manuals are stored in.
     if [[ ! -d ${MANUAL_BASEDIR} ]];then
         cli_printMessage "${MANUAL_BASEDIR}" --as-creating-line
         cli_runFnEnvironment svn --quiet --mkdir ${MANUAL_BASEDIR}
diff --git a/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFileXhtml.sh b/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFileXhtml.sh
index bb811a7..f9db873 100755
--- a/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFileXhtml.sh
+++ b/Scripts/Bash/Functions/Help/Texinfo/texinfo_updateOutputFileXhtml.sh
@@ -62,8 +62,8 @@ function texinfo_updateOutputFileXhtml {
     # Create `css' and `images' directories. In order to save disk
     # space, these directories are linked (symbolically) to their
     # respective locations inside the working copy. 
-    ln -s ${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css Css
-    ln -s ${TCAR_WORKDIR}/trunk/Identity/Images/Webenv Images
+    ln -s ${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css Css
+    ln -s ${TCAR_WORKDIR}/Identity/Images/Webenv Images
 
     # Remove directory where xhtml files are stored from directory
     # stack. The xhtml files have been already created.
@@ -73,9 +73,9 @@ function texinfo_updateOutputFileXhtml {
     # inside the initialization script (repository-init.pl). For example,
     # Would it be a possible way to produce different quotation HTML
     # outputs from the same texinfo quotation definition?  Instead,
-    # once the HTML code is produced we can take que quotation HTML
+    # once the HTML code is produced we can take the quotation HTML
     # definition plus the first letters inside it and transform the
-    # structure to a completly different thing that can be handle
+    # structure to a completely different thing that can be handle
     # through classed inside CSS definitions.
     sed -r -i \
         -f ${MANUAL_TEMPLATE}/manual.sed \
diff --git a/Scripts/Bash/Functions/Help/help.sh b/Scripts/Bash/Functions/Help/help.sh
index 01586ea..effcb89 100755
--- a/Scripts/Bash/Functions/Help/help.sh
+++ b/Scripts/Bash/Functions/Help/help.sh
@@ -38,7 +38,7 @@ function help {
 
     # Initialize manuals' top-level directory. This is the place where
     # source files for documentation manuals will be stored in. 
-    local MANUAL_TLDIR="${TCAR_WORKDIR}/trunk/Documentation/Models"
+    local MANUAL_TLDIR="${TCAR_WORKDIR}/Documentation/Models"
 
     # Initialize documentation format. This information defines the
     # kind of source files we work with inside the documentation
diff --git a/Scripts/Bash/Functions/Help/help_getOptions.sh b/Scripts/Bash/Functions/Help/help_getOptions.sh
index 0e86eb3..0c0d49e 100755
--- a/Scripts/Bash/Functions/Help/help_getOptions.sh
+++ b/Scripts/Bash/Functions/Help/help_getOptions.sh
@@ -44,7 +44,7 @@ function help_getOptions {
         case "$1" in
 
             -h | --help )
-                cli_runFnEnvironment help --read --format="texinfo" trunk/Scripts/Bash/Functions/Help
+                cli_runFnEnvironment help --read --format="texinfo" Scripts/Bash/Functions/Help
                 shift 1
                 exit
                 ;;
diff --git a/Scripts/Bash/Functions/Locale/locale.sh b/Scripts/Bash/Functions/Locale/locale.sh
index eb1a06c..8741f66 100755
--- a/Scripts/Bash/Functions/Locale/locale.sh
+++ b/Scripts/Bash/Functions/Locale/locale.sh
@@ -38,16 +38,17 @@ function locale {
     # Define localization (l10n) base directory. This is the place
     # where all translation messages are organized in. Translation
     # messages are organized herein using the same layout of the
-    # components they represent under the `trunk/Identity',
-    # `trunk/Documentation/Manuals' or `trunk/Scripts' directory
-    # structures.  The localization base directory must be used as
-    # source location for subversion operations (e.g., status, update,
-    # commit, etc.).  Otherwise, it would be difficult to add
-    # directory structures that have several levels down from the
-    # localization base directory up to the repository (e.g., it is
-    # not possible in subversion to add a directory which parent
-    # directory hasn't been added to the repository previously.).
-    local L10N_BASEDIR="${TCAR_WORKDIR}/trunk/Locales"
+    # components they represent under the `Identity',
+    # `Documentation/Manuals' or `Scripts' directory structures.  The
+    # localization base directory must be used as source location for
+    # control version system operations (e.g., status, update, commit,
+    # etc.).  Otherwise, it would be difficult to add directory
+    # structures that have several levels down from the localization
+    # base directory up to the repository (e.g.,
+    # subversion-1.4.2-4.el5_3.1.i386.rpm doesn't support recursive
+    # creation of directories which parent directories doesn't
+    # exist.).
+    local L10N_BASEDIR="${TCAR_WORKDIR}/Locales"
 
     # Interpret arguments and options passed through command-line.
     locale_getOptions
@@ -78,7 +79,7 @@ function locale {
         # is the place where POT and PO files are stored inside the
         # working copy.
         L10N_WORKDIR=$(echo "${ACTIONVAL}" \
-            | sed -r -e "s!trunk/(Identity|Scripts|Documentation)!trunk/Locales/\1!")/${CLI_LANG_LC}
+            | sed -r -e "s!(Identity|Scripts|Documentation)!Locales/\1!")/${CLI_LANG_LC}
 
         # Execute localization actions provided to centos-art.sh
         # script through its command-line. Notice that localization
diff --git a/Scripts/Bash/Functions/Locale/locale_combineLicenseMessages.sh b/Scripts/Bash/Functions/Locale/locale_combineLicenseMessages.sh
index 3c4def7..29c3c4c 100755
--- a/Scripts/Bash/Functions/Locale/locale_combineLicenseMessages.sh
+++ b/Scripts/Bash/Functions/Locale/locale_combineLicenseMessages.sh
@@ -33,7 +33,7 @@ function locale_combineLicenseMessages {
     local TRANSLATION_TEMPLATE=$2
 
     local DOCBOOK_LOCALES=$(echo $DOCBOOK_MODELS \
-        | sed 's!trunk/!trunk/Locales/!')
+        | sed -r 's!^!Locales/!')
 
     # Define list of all files you want to combine.
     local FILES="${DOCBOOK_LOCALES}/Gpl/${CLI_LANG_LC}/messages.po \
diff --git a/Scripts/Bash/Functions/Locale/locale_editMessages.sh b/Scripts/Bash/Functions/Locale/locale_editMessages.sh
index 0324127..e1287df 100755
--- a/Scripts/Bash/Functions/Locale/locale_editMessages.sh
+++ b/Scripts/Bash/Functions/Locale/locale_editMessages.sh
@@ -45,14 +45,14 @@ function locale_editMessages {
     # Prepare working directory to receive translation files.
     locale_prepareWorkingDirectory ${L10N_WORKDIR}
 
-    # Syncronize changes between repository and working copy. At this
+    # Synchronize changes between repository and working copy. At this
     # point, changes in the repository are merged in the working copy
     # and changes in the working copy committed up to repository.
     cli_synchronizeRepoChanges "${L10N_WORKDIR}"
 
     # Define list of PO files to process based on paths provided as
     # non-option arguments through centos-art.sh script command-line.
-    if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/(Documentation/Models/Docbook|Identity/Models)/.*$" ]];then
+    if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/(Documentation/Models/Docbook|Identity/Models)/.*$" ]];then
 
         # Define list of PO files for XML-based files.
         PO_FILES=$(cli_getFilesList ${L10N_WORKDIR} --type="f" --pattern="^.+/messages\.po$")
@@ -60,7 +60,7 @@ function locale_editMessages {
         # Do not create MO files for XML-based files.
         FLAG_DONT_CREATE_MO='true'
 
-    elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Scripts/Bash$" ]];then
+    elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Scripts/Bash$" ]];then
 
         # Define list of PO files for script files.
         PO_FILES=$(cli_getFilesList ${L10N_WORKDIR} --pattern="^.*${FLAG_FILTER}/messages\.po$")
@@ -92,7 +92,7 @@ function locale_editMessages {
     # so we need to update the related MO file based on recently
     # updated PO files here in order for `centos-art.sh' script to
     # print out the most up to date revision of localized messages.
-    # Notice that this is required only if we were localizaing shell
+    # Notice that this is required only if we were localizing shell
     # scripts.
     locale_updateMessageBinary
 
diff --git a/Scripts/Bash/Functions/Locale/locale_isLocalizable.sh b/Scripts/Bash/Functions/Locale/locale_isLocalizable.sh
index ae26d81..f86312e 100755
--- a/Scripts/Bash/Functions/Locale/locale_isLocalizable.sh
+++ b/Scripts/Bash/Functions/Locale/locale_isLocalizable.sh
@@ -3,8 +3,8 @@
 # locale_isLocalizable.sh -- This function determines whether a file or
 # directory can have translation messages or not. This is the way we
 # standardize what locations can be localized and what cannot inside
-# the repository. This function returns 0 when the path is localizable
-# and 1 when it is not.
+# the repository. This function returns 0 when the path is localize
+# able and 1 when it is not.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
 #
@@ -50,15 +50,14 @@ function locale_isLocalizable {
     # Verify location existence. If it doesn't exist we cannot go on.
     cli_checkFiles -e $LOCATION
 
-    # Define regular expresion list of all directories inside the
-    # repository that can have translation. These are the
-    # locale-specific directories will be created for.
-    DIRS[++((${#DIRS[*]}))]="${TCAR_WORKDIR}/trunk/Identity/Models/Themes/[[:alnum:]-]+/(Distro/$(\
+    # Define regular expression list of all directories inside the
+    # repository that can have translation.
+    DIRS[++((${#DIRS[*]}))]="${TCAR_WORKDIR}/Identity/Models/Themes/[[:alnum:]-]+/(Distro/$(\
         cli_getPathComponent --release-pattern)/Anaconda|Concept|Posters|Media)"
-    DIRS[++((${#DIRS[*]}))]="${TCAR_WORKDIR}/trunk/Documentation/Models/Docbook/[[:alnum:]-]+$"
-    DIRS[++((${#DIRS[*]}))]="${TCAR_WORKDIR}/trunk/Scripts/Bash$"
+    DIRS[++((${#DIRS[*]}))]="${TCAR_WORKDIR}/Documentation/Models/Docbook/[[:alnum:]-]+$"
+    DIRS[++((${#DIRS[*]}))]="${TCAR_WORKDIR}/Scripts/Bash$"
 
-    # Verify location passed as first argument agains the list of
+    # Verify location passed as first argument against the list of
     # directories that can have translation messages. By default, the
     # location passed as first argument is considered as a location
     # that cannot have translation messages until a positive answer
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
index 66f3990..7d6895f 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
@@ -80,7 +80,7 @@ function locale_updateMessageMetadata {
     # their working copies in different locations and we don't want to
     # version those changes each time a translation message be
     # updated. To be consistent about this, show path information from
-    # trunk level on. Don't show the variable part of the path.
+    # first level on. Don't show the variable part of the path.
     sed -i -r "s,${TCAR_WORKDIR}/,,g" ${FILE}
 
     # Expand translation markers inside file.
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageShell.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageShell.sh
index 4298126..9666579 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageShell.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageShell.sh
@@ -36,7 +36,7 @@ function locale_updateMessageShell {
 
     # Define list of absolute paths to function directories.
     local FNDIRS=$(cli_getFilesList ${ACTIONVAL}/Functions \
-        --maxdepth=1 --mindepth=1 --type='d' --pattern="/[^.]${FLAG_FILTER}")
+        --maxdepth=1 --mindepth=1 --type='d' --pattern="${ACTIONVAL}/${FLAG_FILTER}")
 
     for FNDIR in $FNDIRS;do
 
@@ -66,7 +66,7 @@ function locale_updateMessageShell {
         # location).
         local FILES=$(cli_getFilesList ${FNDIR} --pattern="^.+\.${EXTENSION}$")
 
-        # Retrive translatable strings from shell script files and
+        # Retrieve translatable strings from shell script files and
         # create the portable object template (.pot) from them.
         xgettext --output=${MESSAGES}.pot \
             --copyright-holder="$(cli_printCopyrightInfo --holder)" \
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageXml.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageXml.sh
index 795f2d8..8c37142 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageXml.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageXml.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # locale_updateMessageXml.sh -- This function parses XML-based files
-# (e.g., scalable vector graphics), retrives translatable strings and
+# (e.g., scalable vector graphics), retrieves translatable strings and
 # creates/update gettext portable objects.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
@@ -33,21 +33,21 @@ function locale_updateMessageXml {
     # (.pot) and portable objects (.po) files.
     local MESSAGES="${L10N_WORKDIR}/messages"
 
-    # Define what kind of XML file we are generatin translation
+    # Define what kind of XML file we are generating translation
     # messages for. This is relevant because scalable vector graphics
     # (SVG) files are not using entity expansion while DocBook files
     # do.
-    if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Documentation/Models/Docbook/[[:alnum:]-]+$" ]];then
+    if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Documentation/Models/Docbook/[[:alnum:]-]+$" ]];then
 
         locale_updateMessageXmlDocbook
 
         # Combine template messages and licenses messages so when
         # template be merged into the final portable object the
         # translations be there. If we cannot treat licenses as
-        # idependent documents (e.g., through XInclude), then lets
-        # keep translation messages as syncronized as possible.
+        # independent documents (e.g., through XInclude), then lets
+        # keep translation messages as synchronized as possible.
 
-    elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Identity/Models/.+$" ]];then
+    elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Identity/Models/.+$" ]];then
 
         locale_updateMessageXmlSvg
 
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbook.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbook.sh
index 249ffb4..92cbe1b 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbook.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbook.sh
@@ -43,7 +43,7 @@ function locale_updateMessageXmlDocbook {
     cli_checkFiles -e ${TEMPLATE}
 
     # Define file name used as template instance. Here is where we
-    # expand translation markers and entities before retriving
+    # expand translation markers and entities before retrieving
     # translation messages.
     local INSTANCE=$(cli_getTemporalFile "$(basename ${TEMPLATE})")
 
@@ -68,7 +68,7 @@ function locale_updateMessageXmlDocbook {
     # Create link to `Images' directory for validation to pass.
     # Otherwise, a validation error is reported because no path was
     # found to images.
-    ln -s ${TCAR_WORKDIR}/trunk/Identity/Images/Webenv $(dirname ${INSTANCE})/Images
+    ln -s ${TCAR_WORKDIR}/Identity/Images/Webenv $(dirname ${INSTANCE})/Images
 
     # Move into temporal directory so paths can be found relatively.
     pushd $(dirname ${INSTANCE}) > /dev/null
@@ -77,7 +77,7 @@ function locale_updateMessageXmlDocbook {
     xmllint --valid --noent ${INSTANCE} | xml2po -a - \
         | msgcat --output=${MESSAGES}.pot --width=70 --no-location -
 
-    # Move out to initail location.
+    # Move out to initial location.
     popd > /dev/null
 
     # Remove instance.
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlSvg.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlSvg.sh
index ef75881..f4d0f77 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlSvg.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlSvg.sh
@@ -4,7 +4,7 @@
 
 function locale_updateMessageXmlSvg {
 
-    # Inside trunk/Identity/Models, design models can be compressed or
+    # Inside `Identity/Models', design models can be compressed or
     # uncompressed. Because of this we cannot process all the design
     # models in one unique way. Instead, we need to treat them
     # individually based on their file type.
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessages.sh b/Scripts/Bash/Functions/Locale/locale_updateMessages.sh
index 285e4f9..88f4171 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessages.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessages.sh
@@ -46,7 +46,7 @@ function locale_updateMessages {
     # Prepare working directory to receive translation files.
     locale_prepareWorkingDirectory ${L10N_WORKDIR}
 
-    # Syncronize changes between repository and working copy. At this
+    # Synchronize changes between repository and working copy. At this
     # point, changes in the repository are merged in the working copy
     # and changes in the working copy committed up to repository.
     cli_synchronizeRepoChanges "${L10N_WORKDIR}"
@@ -55,14 +55,14 @@ function locale_updateMessages {
     # extract translatable strings from XML-based files or to use
     # xgettext to extract translatable strings from shell script
     # files.
-    if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/(Documentation/Models/Docbook|Identity/Models)/.*$" ]];then
+    if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/(Documentation/Models/Docbook|Identity/Models)/.*$" ]];then
 
         # Update translatable strings inside the portable object
         # template related to XML-based files (e.g., scalable vector
         # graphics).
         locale_updateMessageXml
 
-    elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Scripts/Bash$" ]];then
+    elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Scripts/Bash$" ]];then
 
         # Update translatable strings inside the portable object
         # template related to shell scripts (e.g., the centos-art.sh
@@ -73,7 +73,7 @@ function locale_updateMessages {
         cli_printMessage "`gettext "The path provided doesn't support localization."`" --as-error-line
     fi
 
-    # Syncronize changes between repository and working copy. At this
+    # Synchronize changes between repository and working copy. At this
     # point, changes in the repository are merged in the working copy
     # and changes in the working copy committed up to repository.
     cli_synchronizeRepoChanges "${L10N_WORKDIR}"
diff --git a/Scripts/Bash/Functions/Prepare/Config/vim.conf b/Scripts/Bash/Functions/Prepare/Config/vim.conf
index 5737ebd..e54c201 100755
--- a/Scripts/Bash/Functions/Prepare/Config/vim.conf
+++ b/Scripts/Bash/Functions/Prepare/Config/vim.conf
@@ -6,3 +6,4 @@ set softtabstop=4
 set shiftwidth=4
 set expandtab
 set tags=./tags,tags
+set spell
diff --git a/Scripts/Bash/Functions/Prepare/prepare_getLinkName.sh b/Scripts/Bash/Functions/Prepare/prepare_getLinkName.sh
index 9c3646a..94f089a 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_getLinkName.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_getLinkName.sh
@@ -9,8 +9,8 @@
 # 
 # For example, if the following information is provided:
 #
-# ARG1: /home/centos/artwork/trunk/Identity/Brushes
-# ARG2: /home/centos/artwork/trunk/Identity/Brushes/Corporate/symbol.gbr
+# ARG1: /home/centos/artwork/Identity/Brushes
+# ARG2: /home/centos/artwork/Identity/Brushes/Corporate/symbol.gbr
 #
 # the result will be: `corporate-symbol.gbr'.
 #
diff --git a/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh b/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh
index 7298a28..6062925 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh
@@ -45,7 +45,7 @@ function prepare_getOptions {
         case "$1" in
 
             -h | --help )
-                cli_runFunEnvironment help --read --format="texinfo" trunk/Scripts/Bash/Functions/Prepare
+                cli_runFnEnvironment help --read --format="texinfo" Scripts/Bash/Functions/Prepare
                 shift 1
                 exit
                 ;;
diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateEnvironment.sh b/Scripts/Bash/Functions/Prepare/prepare_updateEnvironment.sh
index 2c071d4..1253953 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_updateEnvironment.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_updateEnvironment.sh
@@ -43,7 +43,7 @@ function prepare_updateEnvironment {
     # executed from. This information will be used to construct the
     # working copy absolute path and will easy the procedure to follow
     # when a new absolute path should be defined for the working copy.
-    local TCAR_WORKDIR=$(echo "$0" | sed -r 's!^(.+)/trunk.*!\1!')
+    local TCAR_WORKDIR=$(dirname "$0")
 
     # Determine which is the brand information that will be used as
     # repository brand information. By default we are using `centos'
diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh b/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh
index 0eeaa8e..e5c24cd 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh
@@ -30,26 +30,25 @@ function prepare_updateImages {
 
     # Define list of directories that need to be rendered.
     local DIRS=$(cli_getFilesList \
-        ${TCAR_WORKDIR}/trunk/Identity/Images --maxdepth="1" \
+        ${TCAR_WORKDIR}/Identity/Images --maxdepth="1" \
         --mindepth="1" --type="d" --pattern=".+/[[:alnum:]]+")
 
     # CAUTION: The order in which the image components are rendered is
     # very important. For example, in order for theme images to hold
-    # the branding information the `trunk/Identity/Images/Brands'
-    # directory must be rendered before `trunk/Identity/Images/Themes'
-    # directory. The reason of this is that brand images are not draw
-    # inside theme design models themselves, but combined with theme
-    # images using the ImageMagick tool suite once both have been
-    # rendered.
+    # the branding information the `Identity/Images/Brands' directory
+    # must be rendered before the `Identity/Images/Themes' directory.
+    # The reason of this is that brand images are not draw inside
+    # theme design models themselves, but combined with theme images
+    # using the ImageMagick tool suite once both have been rendered.
 
     # Update list of directories to be sure that brands will always be
     # rendered as first image component. Here we remove the brand
     # component from the list and add it explicitly on top of all
     # other directories in the list.
-    DIRS="${TCAR_WORKDIR}/trunk/Identity/Images/Brands
-        $(echo "$DIRS" | grep -v 'trunk/Identity/Images/Brands')"
+    DIRS="${TCAR_WORKDIR}/Identity/Images/Brands
+        $(echo "$DIRS" | grep -v 'Identity/Images/Brands')"
 
     # Render image components using the list of directories.
-    cli_runFunEnvironment render ${DIRS} --with-brands
+    cli_runFnEnvironment render ${DIRS} --with-brands
 
 }
diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh b/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh
index 260cd60..17c2634 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh
@@ -53,7 +53,7 @@ function prepare_updateLinks {
 
     # Define the working copy directory structure. Here is where user
     # specific configuration links in the workstation will point to.
-    local WCDIR=${TCAR_WORKDIR}/trunk/Identity
+    local WCDIR=${TCAR_WORKDIR}/Identity
     local WCDIR_BRUSHES=${WCDIR}/Brushes
     local WCDIR_PALETTES=${WCDIR}/Palettes
     local WCDIR_PATTERNS=${WCDIR}/Patterns
@@ -113,26 +113,26 @@ function prepare_updateLinks {
     # copy.  Instead, create a symbolic link to it from different
     # places using absolute paths and the default style guide as
     # reference.
-    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css/reset.css
-    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Style-guide/0.0.1/Css/reset.css
+    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css/reset.css
+    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Style-guide/0.0.1/Css/reset.css
 
     # Define link relation for `images' directory used inside the
     # default web environment style guide. The `images' directory
     # contains common images used by all web environments. By default
     # no image is under version control so we point out the output
     # directory where this images produced, once rendered.
-    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Style-guide/0.0.1/Images
-    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Images/Webenv
+    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Style-guide/0.0.1/Images
+    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/Identity/Images/Webenv
 
     # Define link relation for `Manuals' images. These images exists
     # to help people describe ideas inside documentation.
-    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Images/Webenv/Manuals
-    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Images/Manuals
+    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/Identity/Images/Webenv/Manuals
+    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/Identity/Images/Manuals
 
     # Define link for `centos-logo.png', the branding information that
     # should be used in all web applications on the left-top corner.
-    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Images/Webenv/logo-centos.png
-    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/trunk/Identity/Images/Brands/Logos/White/78/centos.png
+    LINKS_SRC[((++${#LINKS_SRC[*]}))]=${TCAR_WORKDIR}/Identity/Images/Webenv/logo-centos.png
+    LINKS_DST[((++${#LINKS_DST[*]}))]=${TCAR_WORKDIR}/Identity/Images/Brands/Logos/White/78/centos.png
 
     # Define which files inside the user's configuration directories
     # need to be removed in order for centos-art.sh script to make a
@@ -165,7 +165,7 @@ function prepare_updateLinks {
             mkdir -p $(dirname ${LINKS_SRC[$COUNT]})
         fi
 
-        # Remove symbolic link before creating it to preven recursive
+        # Remove symbolic link before creating it to prevent recursive
         # creation once the first symbolic link be created and it be a
         # directory.
         if [[ -a ${LINKS_SRC[$COUNT]} ]];then
diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh b/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh
index 5ce15b7..a47cee3 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh
@@ -34,7 +34,7 @@ function prepare_updateLocales {
     # localized to itself' message.  Avoid this noise in the
     # preparation stuff.
     if [[ ! ${CLI_LANG_LL} =~ '^en' ]];then
-        cli_runFnEnvironment locale trunk/Scripts/Bash --update
+        cli_runFnEnvironment locale Scripts/Bash --update
     fi
 
 }
diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh b/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh
index fcd79c8..50ed846 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh
@@ -28,7 +28,7 @@
 function prepare_updateManuals {
 
     # Render key documentation manuals.
-    cli_runFnEnvironment render trunk/Documentation/Models/Docbook/Tcar-ug 
+    cli_runFnEnvironment render Documentation/Models/Docbook/Tcar-ug
     cli_runFnEnvironment help --update --format="texinfo" tcar-fs:::
 
 }
diff --git a/Scripts/Bash/Functions/Render/Conf/conf.sh b/Scripts/Bash/Functions/Render/Conf/conf.sh
index 599585f..05bdcd7 100755
--- a/Scripts/Bash/Functions/Render/Conf/conf.sh
+++ b/Scripts/Bash/Functions/Render/Conf/conf.sh
@@ -46,8 +46,8 @@ function conf {
     for FILENAME in $FILENAMES;do
 
         # Retrieve models you want to produce the image from.  Notice
-        # that relative path passed in this option must begin with
-        # `trunk/' directory and point to an existent file.
+        # that relative path passed in this option must point to one
+        # existent file inside the working copy.
         for MODEL in $(cli_getConfigValue "$TEMPLATE" "$FILENAME" "models");do
             MODELS[((++${#MODELS[*]}))]=${TCAR_WORKDIR}/${MODEL}
         done
diff --git a/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh b/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh
index b953c46..76a0e95 100755
--- a/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh
+++ b/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh
@@ -96,9 +96,12 @@ function conf_doBaseActions {
     cli_printMessage "${OUTPUT}" --as-creating-line
     ${COMMAND} ${IMAGE_INSTANCES[*]} ${OUTPUT}
 
+    # Create path for different image formats creation using PNG image
+    # extension as reference.
+    TARGET=$(echo ${OUTPUT} | sed -r "s/\.png$//")
+
     # Convert images from PNG to those formats specified in the
     # configuration file.
-    local TARGET=$(echo $OUTPUT | sed -r 's/\.(.+)$//')
     for FORMAT in ${FORMATS};do
         cli_printMessage "${TARGET}.${FORMAT}" --as-creating-line
         convert ${OUTPUT} ${TARGET}.${FORMAT}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook.sh b/Scripts/Bash/Functions/Render/Docbook/docbook.sh
index 623e2e7..cf5d685 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook.sh
@@ -25,26 +25,26 @@
 
 function docbook {
 
-    # Define absolute path to XSL files used for transforming Docbook
+    # Define absolute path to XSL files used for transforming DocBook
     # into other formats.
-    local DOCBOOK_XSL="${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Docbook/1.69.1/Xsl"
+    local DOCBOOK_XSL="${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Xsl"
 
-    # Define absolute path to Docbook models.
-    local DOCBOOK_MODELS="${TCAR_WORKDIR}/trunk/Documentation/Models/Docbook"
+    # Define absolute path to DocBook models.
+    local DOCBOOK_MODELS="${TCAR_WORKDIR}/Documentation/Models/Docbook"
+
+    # Verify absolute path to DocBook models.
+    cli_checkFiles ${DOCBOOK_MODELS} -d
 
     # Apply translation to design model in order to produce the
     # translated design model instance.
     docbook_doTranslation
 
-    # Expand translation markers inside design model instance.
-    cli_expandTMarkers ${INSTANCE}
-
-    # Exapand common contents inside instance.
+    # Expand common contents inside instance.
     docbook_expandLicenses ${INSTANCE}
 
     # When translated instances are rendered, system entities (e.g.,
     # `%entity-name;') don't appear in the translated instance (it
-    # seems that xml2po removes them) and this provokes Docbook
+    # seems that xml2po removes them) and this provokes DocBook
     # validation to fail.  So in order to pass the validation
     # successfully and automate the whole creation of system entities,
     # don't let this duty ion users'. Instead, make centos-art.sh
@@ -58,19 +58,20 @@ function docbook {
     # very important in order to detect document's malformations and
     # warn you about it, so you can correct them. It is also necessary
     # to save them in a new file in order to make translation markers
-    # expansion possible before transforming the Docbook instance into
+    # expansion possible before transforming the DocBook instance into
     # other formats.
     xmllint --valid --noent ${INSTANCE} > ${INSTANCE}.tmp
     if [[ $? -ne 0 ]];then
         cli_printMessage "`gettext "Validation failed."`" --as-error-line
     fi
 
-    # Expand translation markers on temporal instance.
-    cli_expandTMarkers ${INSTANCE}.tmp
-
     # Update instance to add translation markers expansion.
     mv ${INSTANCE}.tmp ${INSTANCE}
 
+    # Expand translation markers on the temporal instance with
+    # entities already expanded.
+    cli_expandTMarkers ${INSTANCE}
+
     # Convert DocBook source files to other formats.
     docbook_convertToXhtmlChunk
     docbook_convertToXhtml
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh
index 3250649..d0936c7 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh
@@ -10,21 +10,20 @@
 # In this configuration and using default configuration settings, I've
 # presented the following problems:
 #
-# 1. Something is wrong with headings. They are not expanded along
-# the whole page-body. They seem to be rendered in a reduced width
-# (1 inch approximatly). This provokes the heading to be broken in a
-# two-to-five letters column and sometimes it overlaps the
-# sectioning titles (e.g., chatper, section). I tried to customize
-# the value of `header.column.widths' and `page.margin.top' but it
-# seems to be not there where I need to touch.
+# 1. Something is wrong with headings. They are not expanded along the
+# whole page-body. They seem to be rendered in a reduced width (1 inch
+# approximately). This provokes the heading to be broken in a
+# two-to-five letters column and sometimes it overlaps the sectioning
+# titles (e.g., chapter, section). I tried to customize the value of
+# `header.column.widths' and `page.margin.top' but it seems to be not
+# there where I need to touch.
 #
 # 2. TOC's indentation is not rendered. Even the `toc.indent.width'
 # property is set to 24 by default.
 #
-# 3. Inside lists, when items are more than one line, the
-# indentation seems to work for the first line only.  All other
-# lines in the same item are not indented and begin completly
-# unaligned.
+# 3. Inside lists, when items are more than one line, the indentation
+# seems to work for the first line only.  All other lines in the same
+# item are not indented and begin completely unaligned.
 #
 # 4. Long file paths near the end of page-body aren't hyphenated.
 # Even the `hyphenate' property is set to `true' by default.
@@ -93,9 +92,9 @@ function docbook_convertToPdfFromXml {
     # Create link to `Images' directory. This is the directory where
     # images used by documentation are stored in. Be sure to remove
     # previous links first to prevent a recursive creation of links.
-    ln -sf ${TCAR_WORKDIR}/trunk/Identity/Images/Webenv $(dirname ${INSTANCE})/Images
+    ln -sf ${TCAR_WORKDIR}/Identity/Images/Webenv $(dirname ${INSTANCE})/Images
 
-    # Create formatting object supressing output from stderr.
+    # Create formatting object suppressing output from stderr.
     xsltproc --output ${FO} ${STYLE_INSTANCE_FINAL} ${SRC} 2> /dev/null
 
     # Create PDF format from formatting object. Because we are using
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh
index 93a86a3..7677b7e 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh
@@ -68,8 +68,8 @@ function docbook_convertToXhtml {
     # Create `css' and `images' directories. In order to save disk
     # space, these directories are linked (symbolically) to their
     # respective locations inside the working copy. 
-    ln -fs ${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css $(dirname $DST)/Css
-    ln -fs ${TCAR_WORKDIR}/trunk/Identity/Images/Webenv $(dirname $DST)/Images
+    ln -fs ${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css $(dirname $DST)/Css
+    ln -fs ${TCAR_WORKDIR}/Identity/Images/Webenv $(dirname $DST)/Images
 
     # Remove XSL instance files.
     rm ${STYLE_INSTANCE[*]}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
index 7e750ee..3dadcd2 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
@@ -64,8 +64,8 @@ function docbook_convertToXhtmlChunk {
     # space, these directories are linked (symbolically) to their
     # respective locations inside the working copy. Be sure to remove
     # previous links first to prevent a recursive creation of links.
-    ln -sf ${TCAR_WORKDIR}/trunk/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css ${DST}/Css
-    ln -sf ${TCAR_WORKDIR}/trunk/Identity/Images/Webenv ${DST}/Images
+    ln -sf ${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css ${DST}/Css
+    ln -sf ${TCAR_WORKDIR}/Identity/Images/Webenv ${DST}/Images
 
     # Remove XSL instance files.
     rm ${STYLE_INSTANCE[*]}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh
index de6180c..b32d157 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh
@@ -5,10 +5,10 @@
 # produce the translated instance that is used to expand translation
 # markers and produce different output formats.
 #
-# Assuming no translation file exists, an untranslated instace is
+# Assuming no translation file exists, an untranslated instance is
 # taken from the design model and created (i.e., just a copy) from it.
 # Using a design model instance (translated or not) is required in
-# order to expand translation markers safetly.
+# order to expand translation markers safely.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
 #
@@ -60,9 +60,9 @@ function docbook_doTranslation {
         # translation and licenses translations.
         local TRANSLATION_INSTANCE=${TMPDIR}/message.po
     
-        # Define path to docbook locales using models as reference.
+        # Define path to DocBook locales using models as reference.
         local DOCBOOK_LOCALES=$(echo $DOCBOOK_MODELS \
-            | sed 's!trunk/!trunk/Locales/!')
+            | sed 's!^!Locales/!')
 
         # Define list of all locale files you want to combine.
         local DOCBOOK_PO_FILES="${DOCBOOK_LOCALES}/Gpl/${CLI_LANG_LC}/messages.po \
@@ -75,9 +75,9 @@ function docbook_doTranslation {
         # Combine license translations with template translation in
         # order to reuse licenses translations in template files
         # without including them in template portable objects. In the
-        # case of Docbook templates, translations related to licenses
+        # case of DocBook templates, translations related to licenses
         # are required because license content is expanded at
-        # execution time inside the docbook instance used by XSL
+        # execution time inside the DocBook instance used by XSL
         # processor during transformation.
         msgcat --output=${TRANSLATION_INSTANCE} \
             --width=70 --no-location --use-first ${DOCBOOK_PO_FILES}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh
index 6a02691..c727f37 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh
@@ -34,8 +34,8 @@ function docbook_expandLicenses {
 
     local INSTANCE=$1
 
-    # Define absolute path to Docbook models.
-    local DOCBOOK_MODELS="${TCAR_WORKDIR}/trunk/Documentation/Models/Docbook"
+    # Define absolute path to DocBook models.
+    local DOCBOOK_MODELS="${TCAR_WORKDIR}/Documentation/Models/Docbook"
 
     # Define list of files holding licenses you want to include. Note
     # even this files are not inside the documentation structure
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh
index edd4755..4d6c768 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh
@@ -2,7 +2,7 @@
 #
 # docbook_expandSystemEntities.sh -- This function expands system
 # entities required by DocBook projects stored under
-# `trunk/Documentation/Manuals' directory.
+# `Documentation/Manuals' directory.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
 #
@@ -41,7 +41,7 @@ function docbook_expandSystemEntities {
             local ENTITY_NAME=$(basename ${ENTITY_PATH})
             echo '\n\t<!ENTITY % '${ENTITY_NAME}' SYSTEM "'${ENTITY_PATH}'">\n'
             echo '\t%'${ENTITY_NAME}';'
-        done)" 
+        done)"
 
     # Define both xml and docbook public definition.
     local PREAMBLE="<?xml version=\"1.0\" ?>"
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh
index 7482fc5..46c6cc2 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh
@@ -82,7 +82,7 @@ function svg_convertPngToBranded {
         # Define absolute path to image file used as brand. This is
         # the image put over the PNG image produced as result of
         # design models base rendition.
-        BRANDFILE=${TCAR_WORKDIR}/trunk/Identity/Images/Brands/$(echo $BRANDING_CONF_VALUE \
+        BRANDFILE=${TCAR_WORKDIR}/Identity/Images/Brands/$(echo $BRANDING_CONF_VALUE \
             | gawk 'BEGIN{ FS=":" } { print $1 }' \
             | sed -r "s/=BRAND=/${TCAR_BRAND}/g")
 
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToDm.sh b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToDm.sh
index dfb77b4..40db6bb 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToDm.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToDm.sh
@@ -67,13 +67,13 @@ function svg_convertPngToDm {
 
     # Initialize source location for brands. This is the place where
     # brand information, needed to build the display manager theme, is
-    # retrived from.
-    local BRAND_BASEDIR=${TCAR_WORKDIR}/trunk/Identity/Images/Brands
+    # retrieved from.
+    local BRAND_BASEDIR=${TCAR_WORKDIR}/Identity/Images/Brands
 
     # Initialize source location for artistic motif's backgrounds.
     # This is the place where background information needed to ubild
-    # the display manager theme is retrived from. 
-    local BGS=${TCAR_WORKDIR}/trunk/Identity/Images/Themes/${THEME}/Backgrounds/Img/Png
+    # the display manager theme is retrieved from.
+    local BGS=${TCAR_WORKDIR}/Identity/Images/Themes/${THEME}/Backgrounds/Img/Png
 
     # Initialize file variables. File variables are used build and
     # process the file relation between source and target locations. 
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh b/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh
index 9dfe267..bd9cb35 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh
@@ -38,7 +38,7 @@ function svg_doPostActions {
     # applied to base-rendition output and base-rendition output is
     # used as reference to perform directory-specific rendition, these
     # action must be defined before directory-specific rendition.
-    # Otherwise it wouldn't be possible to propagate changes impossed
+    # Otherwise it wouldn't be possible to propagate changes imposed
     # by these actions to new files produced as result of
     # directory-specific rendition.
     POSTACTIONS[((++${#POSTACTIONS[*]}))]="doPostCommand:png:mogrify -comment '$COMMENT'"
@@ -49,7 +49,7 @@ function svg_doPostActions {
     # the repository.
     if [[ $FLAG_DONT_DIRSPECIFIC == 'false' ]];then
 
-        if [[ $TEMPLATE =~ "trunk/Identity/(Models|Images)/Themes/.+\.${RENDER_EXTENSION}$" ]];then
+        if [[ $TEMPLATE =~ "Identity/(Models|Images)/Themes/.+\.${RENDER_EXTENSION}$" ]];then
 
             POSTACTIONS[((++${#POSTACTIONS[*]}))]="convertPngToBranded"
 
@@ -73,13 +73,13 @@ function svg_doPostActions {
                 POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngTo:jpg pdf'
             fi
 
-        elif [[ $TEMPLATE =~ "trunk/Identity/Models/Brands/.+\.${RENDER_EXTENSION}$" ]];then
+        elif [[ $TEMPLATE =~ "Identity/Models/Brands/.+\.${RENDER_EXTENSION}$" ]];then
             POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngToBrands'
 
-        elif [[ $TEMPLATE =~ "trunk/Identity/Models/Icons/.+\.${RENDER_EXTENSION}$" ]];then
+        elif [[ $TEMPLATE =~ "Identity/Models/Icons/.+\.${RENDER_EXTENSION}$" ]];then
             POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngToIcons'
 
-        elif [[ $TEMPLATE =~ "trunk/Identity/Models/Manuals.+\.${RENDER_EXTENSION}$" ]];then
+        elif [[ $TEMPLATE =~ "Identity/Models/Manuals.+\.${RENDER_EXTENSION}$" ]];then
             POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngTo:jpg pdf'
 
         fi
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_getColors.sh b/Scripts/Bash/Functions/Render/Svg/svg_getColors.sh
index 7b862f8..63a5ec9 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg_getColors.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg_getColors.sh
@@ -94,17 +94,17 @@ function svg_getColors {
     done
 
     # Define path to gpl palette. This is the first file we use to
-    # retrive color information from. Only the first file provided
+    # retrieve color information from. Only the first file provided
     # will be used.
     local PALETTE=$(echo $@ | cut -d' ' -f1)
 
     if [[ ! -f $PALETTE ]];then
 
         # Define palette path inside the theme's artistic motif.
-        local MOTIF_PALETTE=${TCAR_WORKDIR}/trunk/Identity/Images/Themes/$(cli_getPathComponent $ACTIONVAL --motif)/Palettes/grub.gpl
+        local MOTIF_PALETTE=${TCAR_WORKDIR}/Identity/Images/Themes/$(cli_getPathComponent $ACTIONVAL --motif)/Palettes/grub.gpl
 
         # Define palette path inside the theme's design model.
-        local MODEL_PALETTE=${TCAR_WORKDIR}/trunk/Identity/Models/Themes/${THEME_MODEL_NAME}/Palettes/grub.gpl
+        local MODEL_PALETTE=${TCAR_WORKDIR}/Identity/Models/Themes/${THEME_MODEL_NAME}/Palettes/grub.gpl
 
         # Redefine default background color using palettes provided by
         # artistic motif first, and design model later. Assuming none
@@ -120,7 +120,7 @@ function svg_getColors {
 
     else
 
-        # Retrive the fourth column from GPL palette. The fourth
+        # Retrieve the fourth column from GPL palette. The fourth
         # column of a GPL palette contains the palette commentary
         # field. The palette commentary field can be anything, but for
         # the sake of our own convenience we use it to store the color
@@ -132,7 +132,7 @@ function svg_getColors {
 
     fi
 
-    # Implement color formats convertions from rrggbb to other formats
+    # Implement color formats conversions from rrggbb to other formats
     # that you might need to use.
     for COLOR in $COLORS;do
 
diff --git a/Scripts/Bash/Functions/Render/render.sh b/Scripts/Bash/Functions/Render/render.sh
index 82b956f..72d133a 100755
--- a/Scripts/Bash/Functions/Render/render.sh
+++ b/Scripts/Bash/Functions/Render/render.sh
@@ -115,11 +115,11 @@ function render {
         # produced, we take the action value (ACTIONVAL) as reference
         # and describe the production through an action name
         # (ACTIONNAM).
-        if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Identity/Images/Themes" ]];then
+        if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Identity/Images/Themes" ]];then
             ACTIONNAM="render_doThemeActions"
-        elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Identity/Images" ]];then
+        elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Identity/Images" ]];then
             ACTIONNAM="render_doBaseActions"
-        elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/trunk/Documentation/Manuals/Docbook/[[:alnum:]-]+" ]];then
+        elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Documentation/Manuals/Docbook/[[:alnum:]-]+" ]];then
             ACTIONNAM="render_doBaseActions"
         else
             cli_printMessage "`gettext "The path provided doesn't support rendition."`" --as-error-line
diff --git a/Scripts/Bash/Functions/Render/render_doBaseActions.sh b/Scripts/Bash/Functions/Render/render_doBaseActions.sh
index 3f38731..82d67ee 100755
--- a/Scripts/Bash/Functions/Render/render_doBaseActions.sh
+++ b/Scripts/Bash/Functions/Render/render_doBaseActions.sh
@@ -41,7 +41,7 @@ function render_doBaseActions {
     local COUNT=0
 
     # Verify default directory where design models are stored in.
-    cli_checkFiles -e "${TCAR_WORKDIR}/trunk/Identity/Models/Themes/${FLAG_THEME_MODEL}"
+    cli_checkFiles -e "${TCAR_WORKDIR}/Identity/Models/Themes/${FLAG_THEME_MODEL}"
 
     # Redefine parent directory for current workplace.
     PARENTDIR=$(basename "${ACTIONVAL}")
@@ -180,7 +180,7 @@ function render_doBaseActions {
 
             # Define final location of translation file.
             TRANSLATION=$(dirname ${FILE} \
-               | sed -r 's!trunk/(Documentation|Identity)!trunk/Locales/\1!')/${CLI_LANG_LC}/messages.po
+               | sed -r 's!(Documentation|Identity)!Locales/\1!')/${CLI_LANG_LC}/messages.po
 
             # Define final location of template file.
             TEMPLATE=${FILE}
@@ -198,11 +198,11 @@ function render_doBaseActions {
             # -------------------------v| point   |    v------------v
             # Identity/Images/Themes/.../Firstboot/Img/3/splash-small.png
             #
-            # What we do here is remove the varibale path, the common
+            # What we do here is remove the variable path, the common
             # point, and the file extension parts in the string
-            # holding the path retrived from design models directory
+            # holding the path retrieved from design models directory
             # structure.  Then we use the common path as relative path
-            # to store the the final image file.
+            # to store the final image file.
             #
             # The file extension is removed from the common path
             # because it is set when we create the final image file.
diff --git a/Scripts/Bash/Functions/Render/render_doThemeActions.sh b/Scripts/Bash/Functions/Render/render_doThemeActions.sh
index 598005b..e0c20b5 100755
--- a/Scripts/Bash/Functions/Render/render_doThemeActions.sh
+++ b/Scripts/Bash/Functions/Render/render_doThemeActions.sh
@@ -33,11 +33,11 @@ function render_doThemeActions {
 
     # Define base directory of artistic motifs. This is the location
     # where all artistic motifs are stored in.
-    local MOTIF_BASEDIR="${TCAR_WORKDIR}/trunk/Identity/Images/Themes"
+    local MOTIF_BASEDIR="${TCAR_WORKDIR}/Identity/Images/Themes"
 
     # Define base directory of design models. This is the location
     # where all design models are stored in.
-    local MODEL_BASEDIR="${TCAR_WORKDIR}/trunk/Identity/Models/Themes"
+    local MODEL_BASEDIR="${TCAR_WORKDIR}/Identity/Models/Themes"
 
     # Define directory structure of design models. Design models
     # directory structures are used as reference to create artistic
diff --git a/Scripts/Bash/Functions/Render/render_getDirOutput.sh b/Scripts/Bash/Functions/Render/render_getDirOutput.sh
index baf27c5..34ed63e 100755
--- a/Scripts/Bash/Functions/Render/render_getDirOutput.sh
+++ b/Scripts/Bash/Functions/Render/render_getDirOutput.sh
@@ -44,9 +44,9 @@ function render_getDirOutput {
     # Redefine base output directory to introduce specific information
     # like release number and architecture. This information is
     # require by directories (e.g., the `Media' directory inside
-    # themes and the `trunk/Documentation/Manuals/Docbook/Distro'
-    # directory ) whose need this information to be passed explicitly
-    # at the command-line through the `--releasever' and `--basearch'
+    # themes and the `Documentation/Manuals/Docbook/Distro' directory
+    # ) whose need this information to be passed explicitly at the
+    # command-line through the `--releasever' and `--basearch'
     # options.  Other directories take such information from the path
     # they are stored in (e.g., the `Distro/5/Anaconda' directory
     # inside themes.). So, we need to differentiate the way
@@ -54,7 +54,7 @@ function render_getDirOutput {
     # in order to build the output path correctly at rendition time.
     if [[ $OUTPUT =~ "^${MOTIF_DIR}/Media$" ]];then
         OUTPUT=${OUTPUT}/${FLAG_RELEASEVER}/${FLAG_BASEARCH}
-    elif [[ $OUTPUT =~ 'trunk/Documentation/Manuals/Docbook/Distro$' ]];then
+    elif [[ $OUTPUT =~ 'Documentation/Manuals/Docbook/Distro$' ]];then
         OUTPUT=${OUTPUT}/${FLAG_RELEASEVER}
     else
         OUTPUT=${OUTPUT}
diff --git a/Scripts/Bash/Functions/Render/render_getDirTemplate.sh b/Scripts/Bash/Functions/Render/render_getDirTemplate.sh
index 4926d19..3276e68 100755
--- a/Scripts/Bash/Functions/Render/render_getDirTemplate.sh
+++ b/Scripts/Bash/Functions/Render/render_getDirTemplate.sh
@@ -6,15 +6,15 @@
 # direct or theme-specific rendition.
 #
 # Direct rendition takes one XML file from design model
-# (`trunk/Identity/Models') directory structure and produces one file
-# in `trunk/Identity/Images' directory strucutre. In this
+# (`Identity/Models') directory structure and produces one file
+# in `Identity/Images' directory strucutre. In this
 # configuration, the organization used to stored the design model is
 # taken as reference to build the path required to store the image
-# related to it under `trunk/Identity/Images' directory structure. 
+# related to it under `Identity/Images' directory structure.
 #
 # Theme-specific rendition takes one design model from
-# `trunk/Identity/Models/Themes' directory structure to produce one or
-# more images in `trunk/Identity/Images/Themes/$THEME/$VERSION/$MODEL'
+# `Identity/Models/Themes' directory structure to produce one or
+# more images in `Identity/Images/Themes/$THEME/$VERSION/$MODEL'
 # directory structure. In this configuration we have many different
 # artistic motifs that use one unique design model directory structure
 # as reference to produce images. 
@@ -59,13 +59,6 @@ function render_getDirTemplate {
     # renderable directory structures.
     TEMPLATE=$ACTIONVAL
 
-    # Sanitate design models location.  Be sure design models do
-    # always point to trunk directory structure. This is useful to let
-    # `centos-art.sh' script do rendition under branches directory
-    # structure, reusing design models under trunk directory
-    # structure.
-    TEMPLATE=$(echo "$TEMPLATE" | sed "s!/branches/!/trunk/!")
-
     # Define absolute path to input files using absolute path from
     # output files.
     if [[ -d ${TEMPLATE}/Tpl ]];then
diff --git a/Scripts/Bash/Functions/Render/render_getOptions.sh b/Scripts/Bash/Functions/Render/render_getOptions.sh
index 9fdd6d4..c94eff0 100755
--- a/Scripts/Bash/Functions/Render/render_getOptions.sh
+++ b/Scripts/Bash/Functions/Render/render_getOptions.sh
@@ -43,7 +43,7 @@ function render_getOptions {
         case "$1" in
 
             -h | --help )
-                cli_runFnEnvironment help --read --format="texinfo" trunk/Scripts/Bash/Functions/Render
+                cli_runFnEnvironment help --read --format="texinfo" Scripts/Bash/Functions/Render
                 shift 1
                 exit
                 ;;
diff --git a/Scripts/Bash/Functions/Svn/svn.sh b/Scripts/Bash/Functions/Svn/svn.sh
old mode 100644
new mode 100755
diff --git a/Scripts/Bash/Functions/Svn/svn_commitRepoChanges.sh b/Scripts/Bash/Functions/Svn/svn_commitRepoChanges.sh
index 114788c..7e5ba43 100755
--- a/Scripts/Bash/Functions/Svn/svn_commitRepoChanges.sh
+++ b/Scripts/Bash/Functions/Svn/svn_commitRepoChanges.sh
@@ -2,7 +2,7 @@
 #
 # svn_commitRepoChanges.sh -- This function explores the working copy
 # and commits changes up to central repository after checking changes
-# and adding unversioned files.
+# and adding files which aren't under version control.
 #
 # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project
 #
@@ -45,19 +45,19 @@ function svn_commitRepoChanges {
     # Print action message.
     cli_printMessage "`gettext "Checking changes in the working copy"`" --as-banner-line
 
-    # Build list of files that have received changes in its versioned
+    # Build list of files that have received changes in its version
     # status.  Be sure to keep output files off from this list.
-    # Remember, output files are not versioned inside the working
-    # copy, so they are not considered for evaluation here. But take
-    # care, sometimes output files are in the same format of source
-    # files, so we need to differentiate them using their locations.
+    # Remember, output files are not version inside the working copy,
+    # so they are not considered for evaluation here. But take care,
+    # sometimes output files are in the same format of source files,
+    # so we need to differentiate them using their locations.
 
     # Process location based on its path information.
-    if [[ ${LOCATION} =~ 'trunk/Documentation/Manuals/Texinfo)' ]];then
+    if [[ ${LOCATION} =~ 'Documentation/Manuals/Texinfo)' ]];then
         STATUSOUT="$(${SVN} status ${LOCATION} | egrep -v '(pdf|txt|xhtml|xml|docbook|bz2)$')\n$STATUSOUT"
-    elif [[ $LOCATION =~ 'trunk/Documentation/Manuals/Docbook' ]];then
+    elif [[ $LOCATION =~ 'Documentation/Manuals/Docbook' ]];then
         STATUSOUT="$(${SVN} status ${LOCATION} | egrep -v '(pdf|txt|xhtml)$')\n$STATUSOUT"
-    elif [[ $LOCATION =~ 'trunk/Identity' ]];then
+    elif [[ $LOCATION =~ 'Identity' ]];then
         STATUSOUT="$(${SVN} status ${LOCATION} | egrep -v '(pdf|png|jpg|rc|xpm|xbm|tif|ppm|pnm|gz|lss|log)$')\n$STATUSOUT"
     else
         STATUSOUT="$(${SVN} status ${LOCATION})\n$STATUSOUT"
diff --git a/Scripts/Bash/Functions/Svn/svn_deleteRepoFile.sh b/Scripts/Bash/Functions/Svn/svn_deleteRepoFile.sh
old mode 100644
new mode 100755
diff --git a/Scripts/Bash/Functions/Svn/svn_getOptions.sh b/Scripts/Bash/Functions/Svn/svn_getOptions.sh
old mode 100644
new mode 100755
index 366ea71..8422154
--- a/Scripts/Bash/Functions/Svn/svn_getOptions.sh
+++ b/Scripts/Bash/Functions/Svn/svn_getOptions.sh
@@ -43,7 +43,7 @@ function svn_getOptions {
         case "$1" in
 
             -h | --help )
-                cli_runFnEnvironment help --read --format="texinfo" trunk/Scripts/Bash/Functions/Svn
+                cli_runFnEnvironment help --read --format="texinfo" Scripts/Bash/Functions/Svn
                 shift 1
                 exit
                 ;;
diff --git a/Scripts/Bash/centos-art.sh b/Scripts/Bash/centos-art.sh
index 305c245..344a83c 100755
--- a/Scripts/Bash/centos-art.sh
+++ b/Scripts/Bash/centos-art.sh
@@ -27,6 +27,12 @@ if [[ ! $TCAR_WORKDIR ]] || [[ $TCAR_WORKDIR == "" ]];then
     TCAR_WORKDIR=${HOME}/artwork
 fi
 
+# Redefine the working copy absolute path considering the previous
+# directory structures used in the repository.
+if [[ -d ${TCAR_WORKDIR}/trunk ]];then
+    TCAR_WORKDIR=${TCAR_WORKDIR}/trunk
+fi
+
 # Initialize repository brand information.
 if [[ ! $TCAR_BRAND ]] || [[ $TCAR_BRAND == "" ]] ;then
     TCAR_BRAND='centos'
@@ -38,13 +44,13 @@ declare -xr CLI_VERSION='0.0.4'
 declare -xr CLI_LANG_LC=$(echo ${LANG} | cut -d'.' -f1)
 declare -xr CLI_LANG_LL=$(echo ${CLI_LANG_LC} | cut -d'_' -f1)
 declare -xr CLI_LANG_CC=$(echo ${CLI_LANG_LC} | cut -d'_' -f2)
-declare -xr CLI_BASEDIR="${TCAR_WORKDIR}/trunk/Scripts/Bash"
+declare -xr CLI_BASEDIR="${TCAR_WORKDIR}/Scripts/Bash"
 declare -xr CLI_FUNCDIR="${CLI_BASEDIR}/Functions"
 
-# Initialize internazionalization through GNU gettext.
+# Initialize internationalization through GNU gettext.
 . gettext.sh
 declare -xr TEXTDOMAIN=${CLI_NAME}.sh
-declare -xr TEXTDOMAINDIR=${TCAR_WORKDIR}/trunk/Locales/Scripts/Bash
+declare -xr TEXTDOMAINDIR=${TCAR_WORKDIR}/Locales/Scripts/Bash
 
 # Initialize absolute path to temporal directory.
 declare -xr TMPDIR="$(mktemp -p /tmp -d ${CLI_NAME}.sh-XXXXXX)"