From 780036ef1c6a8aefcc321ec76adadc8194f6f404 Mon Sep 17 00:00:00 2001 From: Balaji Pandian Date: Thu, 3 Dec 2015 18:19:19 -0500 Subject: [PATCH 1/3] Fixed spelling and grammar error --- www/FAQ.rst | 2 +- www/Philosophies.rst | 2 +- www/conf.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/FAQ.rst b/www/FAQ.rst index 9f72f866ff218..b7ac7792b78d2 100644 --- a/www/FAQ.rst +++ b/www/FAQ.rst @@ -19,7 +19,7 @@ That said, we do expect Swift to be a better language than C++ in a number of wa so why don't we implement the compiler itself in Swift? There are a couple of reasons that bootstrapping is not a good idea, at least in the short term: - * This complicates bringup of the compiler, because you have to move both the + * This complicates bring up of the compiler, because you have to move both the compiled language and the compiler at the same time as the language evolves. * We want the language evolution and direction to be driven by general purpose programming challenges, not by the specific needs of compiler hackers. The diff --git a/www/Philosophies.rst b/www/Philosophies.rst index 4098cfd749eaf..854b8ec62b397 100644 --- a/www/Philosophies.rst +++ b/www/Philosophies.rst @@ -4,7 +4,7 @@ Pervasive Philosophies Guiding the Swift Language Design ======================================================== -This are just notes, in no particular order. +These are just notes, in no particular order. Don't Repeat Yourself --------------------- diff --git a/www/conf.py b/www/conf.py index 1472a0591022b..3044c1622c87d 100644 --- a/www/conf.py +++ b/www/conf.py @@ -89,7 +89,7 @@ # -- Options for HTML output --------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. +# a list of built in themes. html_theme = 'haiku' # Theme options are theme-specific and customize the look and feel of a theme @@ -117,8 +117,8 @@ html_favicon = 'favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". +# relative to this directory. They are copied after the built in static files, +# so a file named "default.css" will overwrite the built in "default.css". html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, From 7998fe108697c8207c5196ed128a828ab9f0e56c Mon Sep 17 00:00:00 2001 From: Balaji Pandian Date: Thu, 3 Dec 2015 20:45:37 -0500 Subject: [PATCH 2/3] Revert inaccurate typo fix --- www/FAQ.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/FAQ.rst b/www/FAQ.rst index b7ac7792b78d2..9f72f866ff218 100644 --- a/www/FAQ.rst +++ b/www/FAQ.rst @@ -19,7 +19,7 @@ That said, we do expect Swift to be a better language than C++ in a number of wa so why don't we implement the compiler itself in Swift? There are a couple of reasons that bootstrapping is not a good idea, at least in the short term: - * This complicates bring up of the compiler, because you have to move both the + * This complicates bringup of the compiler, because you have to move both the compiled language and the compiler at the same time as the language evolves. * We want the language evolution and direction to be driven by general purpose programming challenges, not by the specific needs of compiler hackers. The From b2850bc42e3c25323ca1faade51d344bc93ba840 Mon Sep 17 00:00:00 2001 From: Balaji Pandian Date: Thu, 3 Dec 2015 20:53:16 -0500 Subject: [PATCH 3/3] Reverted "builtin" inaccurate typo fix --- www/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/conf.py b/www/conf.py index 3044c1622c87d..1472a0591022b 100644 --- a/www/conf.py +++ b/www/conf.py @@ -89,7 +89,7 @@ # -- Options for HTML output --------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for -# a list of built in themes. +# a list of builtin themes. html_theme = 'haiku' # Theme options are theme-specific and customize the look and feel of a theme @@ -117,8 +117,8 @@ html_favicon = 'favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the built in static files, -# so a file named "default.css" will overwrite the built in "default.css". +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,