From b4e85f1a4682c191642cd3cdeb613a1156b3e66e Mon Sep 17 00:00:00 2001 From: Bill Keese Date: Tue, 5 Jun 2012 17:43:22 +0900 Subject: [PATCH] fixing rest syntax errors, and deleting obsolete files --- build/webkit-mobile.rst | 6 +++--- developer/bugs.rst | 4 ++-- developer/metadoc.rst | 2 +- developer/rstwiki.rst | 3 --- dijit/form/CurrencyTextBox.rst | 1 + dijit/themes.rst | 10 +++++----- dojox/image/SlideShow.rst | 2 +- quickstart/arrays.rst | 3 --- quickstart/browser-sniffing.rst | 3 --- quickstart/module-returns.rst | 6 ------ releasenotes/1.8.rst | 6 +++--- releasenotes/migration-17.rst | 4 ++-- 12 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 developer/rstwiki.rst delete mode 100644 quickstart/arrays.rst delete mode 100644 quickstart/browser-sniffing.rst delete mode 100644 quickstart/module-returns.rst diff --git a/build/webkit-mobile.rst b/build/webkit-mobile.rst index 8ab90d6e9..2284aeba5 100644 --- a/build/webkit-mobile.rst +++ b/build/webkit-mobile.rst @@ -12,10 +12,10 @@ It should be used when: To create this special build: -.. code-block :: shell +.. code-block :: bash - cd util/buildscripts/ - ./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile + $ cd util/buildscripts/ + $ ./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile diff --git a/developer/bugs.rst b/developer/bugs.rst index f8af2090a..0be0064bf 100644 --- a/developer/bugs.rst +++ b/developer/bugs.rst @@ -78,7 +78,7 @@ When working in DojoX, if no Component is more accurate than the top level ``doj Do this recursively in projects with components. eg: If a bug is against ``dojox.layout.FloatingPane``, the Component would be ``DojoX Layout`` and the meta tag would be: ``[FloatingPane]``, making the summary look something like: -.. code-block :: bash +:: [patch][cla][FloatingPane] Fails to start when created in an iframe @@ -86,7 +86,7 @@ This indicates to the ``FloatingPane`` owner a fix covered under CLA lives in th Dijit prefers the module name be included in the summary, when in the "component" ``Dijit``, eg: -.. code-block :: bash +:: [regression] TabContainer: Title Heights collapse when ... diff --git a/developer/metadoc.rst b/developer/metadoc.rst index ebd2921a9..e92d08235 100644 --- a/developer/metadoc.rst +++ b/developer/metadoc.rst @@ -1,4 +1,4 @@ -.. _developer/rstwiki: +.. _developer/metadoc: ====================================== Editing Dojo's Reference Documentation diff --git a/developer/rstwiki.rst b/developer/rstwiki.rst deleted file mode 100644 index e5ae309cb..000000000 --- a/developer/rstwiki.rst +++ /dev/null @@ -1,3 +0,0 @@ -.. _developer/rstwiki: - -Moved to :ref:`Editing Dojo's Reference Documentation ` diff --git a/dijit/form/CurrencyTextBox.rst b/dijit/form/CurrencyTextBox.rst index 7e519b551..a3f1dd3f0 100644 --- a/dijit/form/CurrencyTextBox.rst +++ b/dijit/form/CurrencyTextBox.rst @@ -59,6 +59,7 @@ In this example using euros with German formatting, the invalid message contains :djConfig: async: true, parseOnLoad: false .. js :: + require(["dijit/form/CurrencyTextBox", "dojo/currency", "dojo/i18n!dojo/cldr/nls/de/currency", "dojo/i18n!dojo/cldr/nls/de/number", "dojo/domReady!" ], function(CurrencyTextBox, currency){ var example = currency.format(54775.53, {locale: 'de-de', currency: "EUR"}); diff --git a/dijit/themes.rst b/dijit/themes.rst index 3f44d2b12..e0666f81b 100644 --- a/dijit/themes.rst +++ b/dijit/themes.rst @@ -368,7 +368,7 @@ Thus, by modifying variables.less and rebuilding the CSS files, you could make y The beginning of variables.less looks like: -.. code-block :: less +.. code-block :: css @primary-color: #cfe5fa; // Base color for entire theme @secondary-color: #efefef; // Base color for bar-backgrounds @@ -389,7 +389,7 @@ The beginning of variables.less looks like: To compile all the less files into CSS files, on mac or other UNIX boxes do: -.. code-block :: shell +.. code-block :: bash $ cd dijit/themes/claro $ node compile.js @@ -401,14 +401,14 @@ This requires Node.js. If you don't have it, then 2. Edit .bash_profile etc. to add node to your path -.. code-block :: shell +.. code-block :: bash - export PATH=$PATH:/opt/less/bin + $ export PATH=$PATH:/opt/less/bin On a PC, do: -.. code-block :: shell +:: C:\> cd C:\myworkspace\dijit\themes\claro C:\> node compile.js diff --git a/dojox/image/SlideShow.rst b/dojox/image/SlideShow.rst index fed645741..b3687c4bb 100644 --- a/dojox/image/SlideShow.rst +++ b/dojox/image/SlideShow.rst @@ -93,7 +93,7 @@ parameter to "false". e.g. This causes a delay when the user attempts to view an image, since it must wait to be loaded. Enabling Autostart (autoplay) ----------------------- +----------------------------- The Slideshow widget does not automatically play by default. The autoStart parameter overrides this behavior: diff --git a/quickstart/arrays.rst b/quickstart/arrays.rst deleted file mode 100644 index b68ee6e1e..000000000 --- a/quickstart/arrays.rst +++ /dev/null @@ -1,3 +0,0 @@ -.. _quickstart/arrays: - -See :ref:`Arrays and Dojo ` \ No newline at end of file diff --git a/quickstart/browser-sniffing.rst b/quickstart/browser-sniffing.rst deleted file mode 100644 index 4e0504832..000000000 --- a/quickstart/browser-sniffing.rst +++ /dev/null @@ -1,3 +0,0 @@ -.. _quickstart/browser-sniffing: - -Moved to :ref:`dojo/sniff `. \ No newline at end of file diff --git a/quickstart/module-returns.rst b/quickstart/module-returns.rst deleted file mode 100644 index 190210c91..000000000 --- a/quickstart/module-returns.rst +++ /dev/null @@ -1,6 +0,0 @@ -.. _quickstart/module-returns: - -AMD Module Returns -================== - -Data moved to :ref:`2.0 migration guide `. \ No newline at end of file diff --git a/releasenotes/1.8.rst b/releasenotes/1.8.rst index b0af23cfa..ac9f2fda6 100644 --- a/releasenotes/1.8.rst +++ b/releasenotes/1.8.rst @@ -802,10 +802,10 @@ webkit-mobile devices. To create this special build: -.. code-block :: shell +.. code-block :: bash - cd util/buildscripts/ - ./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile + $ cd util/buildscripts/ + $ ./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile diff --git a/releasenotes/migration-17.rst b/releasenotes/migration-17.rst index c17282318..93b2c65f5 100644 --- a/releasenotes/migration-17.rst +++ b/releasenotes/migration-17.rst @@ -66,7 +66,7 @@ Previously, one would ``dojo.require()`` modules into a page. Take this basic ex alert("wait! DOM might not be ready yet?!") }); -The ``require()`` call follows the `requirejs <>`_ API. It does lots of amazing things. That is beyond the scope of this document, currently. +The ``require()`` call follows the `requirejs `_ API. It does lots of amazing things. That is beyond the scope of this document, currently. Take notice of the difference in the two examples: @@ -85,7 +85,7 @@ The ``require()`` callback function is important. In the former example, we ``al alert("okay, NOW the modules I wanted AND DOM are ready! phew."); }) -So to summarize: instead of calling dojo.require() N times, call require() once, passing an array of module names you want. If you need DOMReady, use ``"dojo/domReady!"``. Note the ``!`` following the module name. That puts the ``dojo/domReady`` module into "plugin" mode. (more on `loader plugins`_ later) +So to summarize: instead of calling dojo.require() N times, call require() once, passing an array of module names you want. If you need DOMReady, use ``"dojo/domReady!"``. Note the ``!`` following the module name. That puts the ``dojo/domReady`` module into "plugin" mode. The special ``Thinger`` and ``cookie`` variables created for our ``require()`` callback are whatever the return values from ``dojo/cookie.js`` and ``my/Thinger.js`` were, respectively. We will discuss the return value of ``my/Thinger`` while we deprecate dojo.provide_ in the next section.