diff --git a/source/clear-linux/clear-linux.rst b/source/clear-linux/clear-linux.rst index b0c4258a..67b12452 100644 --- a/source/clear-linux/clear-linux.rst +++ b/source/clear-linux/clear-linux.rst @@ -1,6 +1,6 @@ .. _clear-linux: -Clear Linux\* Project for Intel® Architecture +|CL-PRJ| ############################################# Welcome to the |CLOSIA| documentation pages. Our documentation is divided diff --git a/source/clear-linux/guides/network/figures/pktgen_lw3fd.png b/source/clear-linux/guides/network/figures/pktgen_lw3fd.png index 0e5a660c..d17318b1 100644 Binary files a/source/clear-linux/guides/network/figures/pktgen_lw3fd.png and b/source/clear-linux/guides/network/figures/pktgen_lw3fd.png differ diff --git a/source/clear-linux/reference/system-requirements.rst b/source/clear-linux/reference/system-requirements.rst index 7849ced7..25f2bc0d 100644 --- a/source/clear-linux/reference/system-requirements.rst +++ b/source/clear-linux/reference/system-requirements.rst @@ -3,9 +3,8 @@ Recommended minimum system requirements ####################################### -Clear Linux\* OS for Intel® Architecture can run on very minimal hardware. -For example, it can run on a system with a single core CPU, 128MB of memory, -and 600MB of disk space. +|CL-ATTR| can run on very minimal hardware. For example, it can run on a +system with a single core CPU, 128MB of memory, and 600MB of disk space. Different use cases and applications will require different configurations. For general |CL| use, in addition to a supported processor, the recommended @@ -13,9 +12,8 @@ minimum requirements include: * Processors: - Clear Linux\* OS for Intel® Architecture can run on any Intel® 64bit - processors which support UEFI\* and SSE\* v4.1 streaming SIMD\* - instructions. + |CL-ATTR| can run on any Intel® 64bit processors which support UEFI\* + and SSE\* v4.1 streaming SIMD\* instructions. The following processor families have been verified to run |CL|: diff --git a/source/conf.py b/source/conf.py index 448e260b..c6993a9e 100644 --- a/source/conf.py +++ b/source/conf.py @@ -52,7 +52,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Clear Linux* Project for Intel® Architecture' +project = u'Clear Linux* project' copyright = u'2016, many' author = u'many' @@ -130,7 +130,7 @@ html_theme_path = ['_themes'] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = "Documentation for Clear Linux* Project for Intel(r) Architecture" +html_title = "Documentation for Clear Linux* project" # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -232,7 +232,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'clr.tex', u'Documentation for Clear Linux* Project for Intel® Architecture', + (master_doc, 'clr.tex', u'Documentation for Clear Linux* project', u'many', 'manual'), ] @@ -262,7 +262,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'clearlinux', u'Documentation for Clear Linux* Project for Intel® Architecture', + (master_doc, 'clearlinux', u'Documentation for Clear Linux* project', [author], 1) ] @@ -276,7 +276,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'clearlinux', u'Documentation for Clear Linux* Project for Intel® Architecture', + (master_doc, 'clearlinux', u'Documentation for Clear Linux* project', author, 'Clear Linux', 'One line description of project.', 'Miscellaneous'), ] diff --git a/source/substitutions.txt b/source/substitutions.txt index d1ab31fd..7a156671 100644 --- a/source/substitutions.txt +++ b/source/substitutions.txt @@ -2,7 +2,9 @@ .. |CLOSIA| replace:: Clear Linux* OS -.. |CLP| replace:: Clear Linux* project +.. |CL-ATTR| replace:: Clear Linux* OS + +.. |CL-PRJ| replace:: Clear Linux* project .. |CC| replace:: Clear Containers