Automated merge with file:///cygdrive/d/srv/hg/tips
authorOleksandr Gavenko <gavenkoa@gmail.com>
Tue, 04 Jan 2011 14:06:45 +0200
changeset 773 76d3542698b2
parent 771 4c821e214e3a (diff)
parent 772 a6e40f96631e (current diff)
child 775 a6af37960954
Automated merge with file:///cygdrive/d/srv/hg/tips
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/atom.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -0,0 +1,18 @@
+-*- mode: outline; coding: utf-8; fill-column: 80 -*-
+
+* About Atom.
+
+  http://www.ibm.com/developerworks/xml/library/x-atom10.html
+                An overview of the Atom 1.0 Syndication Format
+
+* About Atom Publishing Protocol.
+
+  http://www.ibm.com/developerworks/library/x-atompp1/
+                Getting to know the Atom Publishing Protocol, Part 1: Create
+                and edit Web resources with the Atom Publishing Protocol
+  http://www.ibm.com/developerworks/xml/library/x-atompp2/index.html
+                Getting to know the Atom Publishing Protocol, Part 2: Put the
+                Atom Publishing Protocol (APP) to work
+  http://www.ibm.com/developerworks/xml/library/x-atompp3/index.html
+                Getting to know the Atom Publishing Protocol, Part 3:
+                Introducing the Apache Abdera project
--- a/blog.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/blog.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -2,14 +2,16 @@
 
 * Blogspot.
 
-http://code.google.com/apis/blogger/
+  http://code.google.com/apis/blogger/
                 The Blogger Data API
-http://code.blogger.com/
+  http://code.blogger.com/
                 Developer Documentation (API/Gadget/Layouts)
 
-** Blogspot and Emacs.
+** Blogspot mobile version.
 
-See
+  http://BLOGNAME.blogspot.com/?m=1
+
+** Blogspot and Emacs.
 
   http://code.google.com/p/e-blog/
 
@@ -106,6 +108,26 @@
 aesthetics, web standards, and usability. WordPress is both free and priceless
 at the same time.
 
+** Movable Type.
+
+  http://www.movabletype.com/download/
+                Movable Type Download
+  http://www.movabletype.org/documentation/
+                Movable Type Documentation
+  http://www.sixapart.com/movabletype/docs/
+                Old Movable Type Documentation
+  http://www.movabletype.org/documentation/developer/
+                Movable Type Developer Guide
+  http://www.movabletype.org/documentation/developer/api/
+                Web Service APIs
+
+** LiveJournal.
+
+  http://www.livejournal.com/doc/server/ljp.csp.xml-rpc.protocol.html
+                XML-RPC Client/Server Protocol Reference
+  http://www.livejournal.com/developer/
+                Developer Information
+
 ** Byteflow.
 
 Byteflow is a blog engine written in Python using Django.
@@ -119,6 +141,7 @@
  * Blogspot.
  * Livejornal.
  * Wordpress.
+ * LiveInternet.ru
 
 ** Commercial blog services.
 
@@ -128,11 +151,78 @@
 
 * Blog API.
 
-** MetaWeblog
+** Blogger API (old Blogger API or version 1.0).
+
+Supported engines: Blogger.
+
+*** Spec.
+
+  http://www.blogger.com/developers/api/
+
+** MetaWeblog API.
+
+Based on XML-RPC.
+
+Supported engines: WordPress, LiveInternet.
+
+  http://codex.wordpress.org/XML-RPC_Support
+                XML-RPC Support
+  http://wiki.liveinternet.ru/ServisDnevnikovLiveInternet/InterfejjsyVzaimodejjstvija/MetaWeblogAPI?v=15qg
+                MetaWeblog API
+
+*** Spec.
+
+  http://www.xmlrpc.com/metaWeblogApi
+
+** MovableType API.
+
+Based on XML-RPC.
+
+Supported engines: WordPress, LiveInternet.
+
+  http://codex.wordpress.org/XML-RPC_Support
+                XML-RPC Support
+  http://mindsharestrategy.com/wp-xmlrpc-movabletype/
+                WordPress XML-RPC — MovableType API
+  http://wiki.liveinternet.ru/ServisDnevnikovLiveInternet/InterfejjsyVzaimodejjstvija/MovableTypeAPI
+                MovableType API
+*** Spec.
+
+  http://www.sixapart.com/developers/xmlrpc/movable_type_api/
+
+** Atom Publishing Protocol (AtomPub).
+
+Supported engines: Blogger (Blogger API v2.0), WordPress (since version 2.3).
+
+  http://codex.wordpress.org/AtomPub
 
 ** WordPress API.
 
-** XML-RPC.
+This is an extensions to the Movable Type API.
+
+Supported engines: WordPress only.
+
+*** Spec.
+
+  http://codex.wordpress.org/XML-RPC_wp
+
+* After the jump/Read More.
 
-** APP.
+It's a holdover from newspaper pagination lingo. A story begun on page one might
+be longer than the space available, so a "See page #" is added at the end of the
+first page and the article continues on another. The continuation is referred to
+as the "jump".
 
+Blogs usually allow you to separate a post into two parts, one an excerpt that
+gets posted to the main page and to RSS, and the other a continuation with the
+main text of the article. 'After the jump' usually refers to the part that you
+see after you click 'Read more...'. "Below the fold" means the same thing on
+some sites.
+
+  http://www.google.com/support/blogger/bin/answer.py?answer=154172
+                Creating 'After the jump' summaries
+  http://codex.wordpress.org/Customizing_the_Read_More
+                Customizing the Read More
+  http://www.livejournal.com/support/faqbrowse.bml?faqid=75
+                How do I hide part of my entry behind a link? What is an lj-cut?
+
--- a/feed.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/feed.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -10,9 +10,31 @@
                 The purpose of this page is to summarize, as clearly and simply as possible, the
                 differences between the RSS 2.0 and Atom 1.0 syndication languages.
 
+* Feed validator.
+
+  http://www.atomenabled.org/feedvalidator/
+                for Atom and RSS
+
 * Emacs feed reader.
 
 ** newsticker.el
 
   http://www.nongnu.org/newsticker/
                 home page
+
+* Feed readers.
+
+** Thunderbird.
+
+** Google Reader.
+
+* Blog posting software.
+
+** ScribeFire.
+
+ScribeFire is an extension for the Mozilla Firefox Web browser, Google Chrome
+Web browser, and Apple Safari Web browser that allows you to easily post to all
+of your blogs.
+
+  http://www.scribefire.com/
+                home page
--- a/hg.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/hg.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -55,6 +55,29 @@
   [defaults]
   log = -f
 
+* Remove/rename files history from repo.
+
+  $ cat >filemap.txt <<EOF
+exclude path/to/file-or-dir
+rename path/to/source path/to/destination
+...
+EOF
+  $ hg convert --filemap filemap.txt $repo_orig $repo_new
+  $ hg -R $repo_new up
+
+* Join history of two repos.
+
+  $ cat >filemap1.txt <<EOF
+rename . dir1
+EOF
+  $ cat >filemap2.txt <<EOF
+rename . dir2
+EOF
+  $ hg convert --filemap filemap1.txt $repo1 $repo_new
+  $ hg convert --filemap filemap2.txt $repo2 $repo_new
+  $ hg -R $repo_new merge
+  $ hg -R $repo_new ci -m "Join $repo1 and $repo2."
+
 * Publishing repo.
 
 With static HTTP hosting you can copy via rsync, ftp, scp, etc., so long as all the files beneath
--- a/licence.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/licence.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -24,7 +24,10 @@
 
 ** GPL.
 
-GPL (GNU genneral public licence)
+GPL (GNU genneral public licence).
+
+  http://www.gnu.org/licenses/gpl-faq.html#ReportingViolation
+                Reporting Violation
 
 ** LGPL.
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -0,0 +1,24 @@
+-*- mode: outline; coding: utf-8 -*-
+
+* GSM.
+
+* GPRS.
+
+56-114 kbps.
+
+  http://en.wikipedia.org/wiki/General_Packet_Radio_Service
+
+* EDGE.
+
+236.8 kbp (with end-to-end latency of less than 150 ms).
+
+  http://en.wikipedia.org/wiki/Enhanced_Data_Rates_for_GSM_Evolution
+
+* CDMA 2000 1xEV-DO Rev.0/Rev.A
+
+* 3G.
+
+* UMTS.
+
+TODO UMTS/HSDPA/HSUPA/HSPA (WCDMA).
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/partition.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -0,0 +1,22 @@
+-*- mode: outline; coding: utf-8; fill-column: 80 -*-
+
+* Backup mbr.
+
+  $ dd if=/dev/hda of=boot.mbr bs=512 count=1
+
+* Restore backuped mbr:
+
+  $ sudo of=boot.mbr if=/dev/hda bs=512 count=1
+
+* Backup PC partition table.
+
+  $ sfdisk -d /dev/sda >partition.tbl
+
+* Restore PC partition table.
+
+  $ sfdisk /dev/sdb <partition.tbl
+
+* Move PC partition table from on dist to another.
+
+  $ sfdisk -d /dev/sda | sfdisk /dev/sdb
+
--- a/python.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/python.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -2,8 +2,6 @@
 
 * Licence and history of Python.
 
-See
-
   http://docs.python.org/dev/license.htm
 
 * Byte compile .py and check for errors.
--- a/rs232.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/rs232.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -1,9 +1,24 @@
 -*- mode: outline -*-
 
+* Pinout.
+
+Rx/Tx
+RTS/CTS/DTR/DSR
+
+* Level signals converts.
+
+** MAX 232.
+
+From an RS-232 serial port to signals suitable for use in TTL circuit.
+
+  http://en.wikipedia.org/wiki/MAX232
+
 * USB to COM chip.
 
 ** PL-2303.
 
+  http://www.prolific.com.tw/eng/products.asp?id=59
+                about/overview
   http://www.prolific.com.tw/eng/downloads.asp?ID=23
                 datasheet download page
   http://www.prolific.com.tw/eng/downloads.asp?id=31
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/search.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -0,0 +1,8 @@
+-*- mode: outline; coding: utf-8 -*-
+
+* Search engines.
+
+  http://en.wikipedia.org/wiki/Lucene
+  http://en.wikipedia.org/wiki/Xapian
+  http://en.wikipedia.org/wiki/Sphinx_%28search_engine%29
+
--- a/uri.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/uri.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -4,6 +4,8 @@
 
   http://www.iana.org/assignments/uri-schemes.html
                 List of registered by IANA URI schemes
+  http://www.iana.org/assignments/urn-namespaces/urn-namespaces.xml
+                Uniform Resource Names
   http://www.rfc-editor.org/rfc/rfc1738.txt
                 Uniform Resource Locators (URL)
   http://en.wikipedia.org/wiki/URI_scheme
--- a/web-search.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/web-search.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -97,6 +97,12 @@
 Note: Putting "inurl:" in front of every word in your query is equivalent to putting "allinurl:" at
 the front of your query.
 
+** Link anchor search.
+
+Searches for text in a page's link anchors. A link anchor is the descriptive text of a link.
+
+  inanchor:"WORD1 WORD2"
+
 ** Text Only Search.
 
 Starting a query with the term "allintext:" restricts the results to those with all of the query
@@ -154,3 +160,164 @@
 
   define:WORD
 
+* Yahoo search query syntax.
+
+  http://help.yahoo.com/l/uk/yahoo/search/basics/index.html
+                Yahoo! Search Help Topics
+  http://help.yahoo.com/l/uk/yahoo/search/basics/basics-04.html
+                Search Tips
+  http://help.yahoo.com/l/uk/yahoo/search/basics/basics-08.html
+                What is Advanced Search?
+  http://help.yahoo.com/l/uk/yahoo/search/basics/basics-19.html
+                How do I search for a specific URL, sub-page, or find sites that link to mine?
+
+** All of these words.
+
+Includes all of the words you typed in the search box. This is similar to inserting "AND" between
+words or the symbol "+" before a word.
+
+** At least one of these words.
+
+Searches for results that match either one or more of the words. This is similar to inserting "OR"
+between the words.
+
+** Exact phrase.
+
+Searches for the words in exactly the order you enter them. This is similar to putting quotes (" ")
+around a set of words.
+
+** None of these words.
+
+Excludes words from your search. This is similar to inserting "NOT" between the words or the symbol
+"-" before a word.
+
+** site:.
+
+This allows one to find all documents within a particular domain and all its subdomains.
+
+To exclude DOMAIN from search:
+
+  -site:DOMAIN
+
+** hostname:.
+
+This allows one to find all documents from a particular host only.
+
+** link:.
+
+This allows one to find documents that link to a particular URL.
+
+** url:.
+
+This allows one to find a specific document in our index.
+
+** inurl:.
+
+This allows one to find a specific keyword as part of indexed URLs.
+
+** intitle:.
+
+This allows one to find a specific keyword as part of the indexed titles.
+
+** Back links.
+
+  linkdomain:DOMAIN
+
+* Bing search query syntax.
+
+  http://onlinehelp.microsoft.com/en-WW/bing/ff808535.aspx
+                Bing Help
+  http://onlinehelp.microsoft.com/en-us/bing/ff808438.aspx
+                Advanced search options
+  http://onlinehelp.microsoft.com/en-us/bing/ff524480.aspx
+                Search effectively
+  http://onlinehelp.microsoft.com/en-us/bing/ff808421.aspx
+                Advanced search keywords
+
+** +.
+
+Finds webpages that contain all the terms that are preceded by the + symbol. Also allows you to
+include terms that are usually ignored.
+
+** " ".
+
+Finds the exact words in a phrase.
+
+** ().
+
+Finds or excludes webpages that contain a group of words.
+
+** AND or &.
+
+Finds webpages that contain all the terms or phrases.
+
+** NOT or -.
+
+Excludes webpages that contain a term or phrase.
+
+** OR or |.
+
+Finds webpages that contain either of the terms or phrases.
+
+** contains:.
+
+Keeps results focused on sites that have links to the file types that you specify.
+
+  contains:wma
+
+** filetype:.
+
+Returns only webpages created in the file type that you specify.
+
+  filetype:pdf
+
+** inanchor: or inbody: or intitle:.
+
+
+These keywords return webpages that contain the specified term in the metadata, such as the anchor,
+body, or title of the site, respectively. Specify only one term per keyword. You can string multiple
+keyword entries as needed.
+
+** ip:.
+
+Finds sites that are hosted by a specific IP address. The IP address must be a dotted quad address.
+Type the ip: keyword, followed by the IP address of the website.
+
+** language:.
+
+Returns webpages for a specific language. Specify the language code directly after the language:
+keyword. You can also access this function using the Search Builder Language function. For more
+information about using Search Builder, see Use advanced search.
+
+** loc: or location:.
+
+Returns webpages from a specific country or region. Specify the country or region code directly
+after the loc: keyword. To focus on two or more languages, use a logical OR to group the languages.
+
+  WORD1 WORD2 (loc:US OR loc:GB)
+
+** prefer:.
+
+Adds emphasis to a search term or another operator to help focus the search results.
+
+** site:.
+
+Returns webpages that belong to the specified site. To focus on two or more domains, use a logical
+OR to group the domains. You can use site: to search for web domains, top level domains, and
+directories that are not more than two levels deep. You can also search for webpages that contain a
+specific search word on a site.
+
+** feed:.
+
+Finds RSS or Atom feeds on a website for the terms you search for.
+
+** hasfeed:.
+
+Finds webpages that contain an RSS or Atom feed on a website for the terms you search for.
+
+  site:www.nytimes.com hasfeed:football.
+
+** url:.
+
+Checks whether the listed domain or web address is in the Bing index.
+
--- a/web-site.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/web-site.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -40,3 +40,19 @@
   http://googlewebmastercentral.blogspot.com/2008/06/improving-on-robots-exclusion-protocol.html
                 Improving on Robots Exclusion Protocol
 
+* Web document structure useage.
+
+  http://dev.opera.com/articles/view/mama/
+                Metadata Analysis and Mining Application
+
+* Validation.
+
+  http://validator.w3.org/
+
+* Add search to your site.
+
+  http://www.google.com/support/customsearch/
+                Custom Search Help
+  http://help.yahoo.com/l/uk/yahoo/search/basics/basics-13.html
+                Can I add a Yahoo! Search box to my site?
+
--- a/windows-devel.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/windows-devel.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -92,6 +92,10 @@
 
 * Cabinet file (.cab).
 
+Extract content from .cab file:
+
+  cmd# expand my.cab
+
   http://support.microsoft.com/kb/198038
                 INFO: Useful Tools for Package and Deployment Issues
   http://msdn.microsoft.com/en-us/library/aa367841%28VS.85%29.aspx
--- a/windows.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/windows.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -17,7 +17,7 @@
 
 * Windows update.
 
-To find updates and drivers visit ( Windows not checked):
+To find updates and drivers visit (подлинность Windows not checked):
 
   http://catalog.update.microsoft.com/
 
--- a/xml.rst	Mon Jan 03 12:09:12 2011 +0200
+++ b/xml.rst	Tue Jan 04 14:06:45 2011 +0200
@@ -39,3 +39,10 @@
 * Microformats.
 
   http://microformats.org/about
+
+* XML encoding.
+
+  http://www.ietf.org/rfc/rfc3023.txt
+                XML Media Types
+  http://www.xml.com/pub/a/2004/07/21/dive.html
+                XML on the Web Has Failed